October 2008 - Wine-commits

Tobias Jakobi : wined3d: Add GL_TEXTURE_BINDING_3D to wined3d_gl header.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 7aef1c71855837ca988d38ee3fb85683b6ceca60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aef1c71855837ca988d38ee3… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Sat Oct 18 16:08:49 2008 +0200 wined3d: Add GL_TEXTURE_BINDING_3D to wined3d_gl header. --- include/wine/wined3d_gl.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 3832a2a..25159b1 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -690,6 +690,7 @@ typedef void GLvoid; #define GL_UNSIGNED_INT_10_10_10_2 0x8036 #define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 #define GL_RESCALE_NORMAL 0x803A +#define GL_TEXTURE_BINDING_3D 0x806A #define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 #define GL_SINGLE_COLOR 0x81F9 #define GL_SEPARATE_SPECULAR_COLOR 0x81FA

1 0

Rafał Mużyło : configure: Avoid problem with recent autoconf.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 4736c9933f37d8a4974fdafe7c26f7d4f4ee8bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4736c9933f37d8a4974fdafe7… Author: Rafał Mużyło <galtgendo(a)o2.pl> Date: Mon Oct 20 21:43:21 2008 +0200 configure: Avoid problem with recent autoconf. --- aclocal.m4 | 5 ++++- configure | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 528c4d3..f3a5848 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -215,16 +215,19 @@ Use the --without-$1 option if you really want this.]) ;; esac])]) AC_DEFUN([WINE_PRINT_MESSAGES],[ac_save_IFS="$IFS" -IFS="|" if test "x$wine_notices != "x; then echo >&AS_MESSAGE_FD + IFS="|" for msg in $wine_notices; do + IFS="$ac_save_IFS" if test -n "$msg"; then AC_MSG_NOTICE([$msg]) fi done fi +IFS="|" for msg in $wine_warnings; do + IFS="$ac_save_IFS" if test -n "$msg"; then echo >&2 AC_MSG_WARN([$msg]) diff --git a/configure b/configure index dd5be9f..6c745f2 100755 --- a/configure +++ b/configure @@ -27744,17 +27744,20 @@ then fi ac_save_IFS="$IFS" -IFS="|" if test "x$wine_notices != "x; then echo >&6 + IFS="|" for msg in $wine_notices; do + IFS="$ac_save_IFS" if test -n "$msg"; then { echo "$as_me:$LINENO: $msg" >&5 echo "$as_me: $msg" >&6;} fi done fi +IFS="|" for msg in $wine_warnings; do + IFS="$ac_save_IFS" if test -n "$msg"; then echo >&2 { echo "$as_me:$LINENO: WARNING: $msg" >&5

1 0

Andrew Talbot : msi: Sign-compare warnings fix.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 1c9886d6e72392cd3853397dac48d1824c2af5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c9886d6e72392cd3853397da… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 20 22:06:20 2008 +0100 msi: Sign-compare warnings fix. --- dlls/msi/msi.c | 10 +++++----- dlls/msi/msiquery.c | 8 ++++---- dlls/msi/source.c | 8 ++++---- dlls/msi/suminfo.c | 3 +-- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index c233411..7940738 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -827,7 +827,7 @@ static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, { save = *pcchValueBuf; - if (lstrlenW(val) < *pcchValueBuf) + if (strlenW(val) < *pcchValueBuf) r = msi_strcpy_to_awstring(val, szValue, pcchValueBuf); else if (szValue->str.a || szValue->str.w) r = ERROR_MORE_DATA; @@ -973,7 +973,7 @@ static UINT msi_copy_outval(LPWSTR val, LPWSTR out, LPDWORD size) if (out) { - if (lstrlenW(val) >= *size) + if (strlenW(val) >= *size) { r = ERROR_MORE_DATA; if (*size > 0) @@ -1591,7 +1591,7 @@ LANGID WINAPI MsiLoadStringA( MSIHANDLE handle, UINT id, LPSTR lpBuffer, { LPWSTR bufW; LANGID r; - DWORD len; + INT len; bufW = msi_alloc(nBufferMax*sizeof(WCHAR)); r = MsiLoadStringW(handle, id, bufW, nBufferMax, lang); @@ -2135,7 +2135,7 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, HIWORD(ffi->dwFileVersionLS), LOWORD(ffi->dwFileVersionLS)); if (lpVersionBuf) lstrcpynW(lpVersionBuf, tmp, *pcchVersionBuf); - if (lstrlenW(tmp) >= *pcchVersionBuf) + if (strlenW(tmp) >= *pcchVersionBuf) ret = ERROR_MORE_DATA; *pcchVersionBuf = lstrlenW(tmp); @@ -2155,7 +2155,7 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, wsprintfW(tmp, szLangFormat, *lang); if (lpLangBuf) lstrcpynW(lpLangBuf, tmp, *pcchLangBuf); - if (lstrlenW(tmp) >= *pcchLangBuf) + if (strlenW(tmp) >= *pcchLangBuf) ret = ERROR_MORE_DATA; *pcchLangBuf = lstrlenW(tmp); diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 4435cd9..3e7a877 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -633,7 +633,7 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR szColumnNameBuffer, MSIQUERY *query = NULL; static const WCHAR szError[] = { 0 }; MSIDBERROR r = MSIDBERROR_NOERROR; - int len; + DWORD len; FIXME("%ld %p %p - returns empty error string\n", handle, szColumnNameBuffer, pcchBuf ); @@ -645,7 +645,7 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR szColumnNameBuffer, if( !query ) return MSIDBERROR_INVALIDARG; - len = lstrlenW( szError ); + len = strlenW( szError ); if( szColumnNameBuffer ) { if( *pcchBuf > len ) @@ -665,7 +665,7 @@ MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, LPSTR szColumnNameBuffer, static const CHAR szError[] = { 0 }; MSIQUERY *query = NULL; MSIDBERROR r = MSIDBERROR_NOERROR; - int len; + DWORD len; FIXME("%ld %p %p - returns empty error string\n", handle, szColumnNameBuffer, pcchBuf ); @@ -677,7 +677,7 @@ MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, LPSTR szColumnNameBuffer, if( !query ) return MSIDBERROR_INVALIDARG; - len = lstrlenA( szError ); + len = strlen( szError ); if( szColumnNameBuffer ) { if( *pcchBuf > len ) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 5a714b1..b074022 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -218,7 +218,7 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, DWORD numvals, size; LONG res; UINT r; - static int index = 0; + static DWORD index = 0; static const WCHAR fmt[] = {'#','%','d',0}; @@ -360,7 +360,7 @@ UINT WINAPI MsiSourceListEnumSourcesA(LPCSTR szProductCodeOrPatch, LPCSTR szUser LPWSTR source = NULL; DWORD len = 0; UINT r = ERROR_INVALID_PARAMETER; - static int index = 0; + static DWORD index = 0; TRACE("(%s, %s, %d, %d, %d, %p, %p)\n", debugstr_a(szProductCodeOrPatch), debugstr_a(szUserSid), dwContext, dwOptions, dwIndex, szSource, pcchSource); @@ -433,7 +433,7 @@ UINT WINAPI MsiSourceListEnumSourcesW(LPCWSTR szProductCodeOrPatch, LPCWSTR szUs HKEY subkey = NULL; LONG res; UINT r = ERROR_INVALID_PARAMETER; - static int index = 0; + static DWORD index = 0; static const WCHAR format[] = {'%','d',0}; @@ -654,7 +654,7 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, if (szValue) { - if (lstrlenW(ptr) < *pcchValue) + if (strlenW(ptr) < *pcchValue) lstrcpyW(szValue, ptr); else rc = ERROR_MORE_DATA; diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 5d73c57..148ba8a 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -169,8 +169,7 @@ static UINT propvar_changetype(PROPVARIANT *changed, PROPVARIANT *property, VART static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz ) { UINT type; - DWORD i; - int size; + DWORD i, size; PROPERTY_DATA *propdata; PROPVARIANT property, *ptr; PROPVARIANT changed;

1 0

Paul Vriens : shell32/tests: Use win_skip instead of trace.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 860ba029c3d80774ccd61b883abff89d8b9ed373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=860ba029c3d80774ccd61b883… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 23:06:03 2008 +0200 shell32/tests: Use win_skip instead of trace. --- dlls/shell32/tests/shlfileop.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 11cc612..6293b93 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1327,8 +1327,8 @@ static void test_sh_create_dir(void) if(!pSHCreateDirectoryExA) { - trace("skipping SHCreateDirectoryExA tests\n"); - return; + win_skip("skipping SHCreateDirectoryExA tests\n"); + return; } set_curr_dir_path(path, "testdir2\\test4.txt\0"); @@ -1351,8 +1351,8 @@ static void test_sh_path_prepare(void) if(!pSHPathPrepareForWriteA) { - trace("skipping SHPathPrepareForWriteA tests\n"); - return; + win_skip("skipping SHPathPrepareForWriteA tests\n"); + return; } /* directory exists, SHPPFW_NONE */

1 0

Paul Vriens : usp10/tests: Use win_skip instead of trace.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 80011be10063d5690f0774dc644051d4b09fb1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80011be10063d5690f0774dc6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 23:08:45 2008 +0200 usp10/tests: Use win_skip instead of trace. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index a791214..c63c6c8 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1352,7 +1352,7 @@ static void test_digit_substitution(void) if (!pEnumLanguageGroupLocalesA) { - trace("EnumLanguageGroupLocalesA not available on this platform\n"); + win_skip("EnumLanguageGroupLocalesA not available on this platform\n"); return; }

1 0

Paul Vriens : shell32/tests: Use win_skip instead of trace.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 3465cbc58d4bfad40c917791a1c3c6867e1f3e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3465cbc58d4bfad40c917791a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 23:05:51 2008 +0200 shell32/tests: Use win_skip instead of trace. --- dlls/shell32/tests/shelllink.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 76bc3d2..7657fe0 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -70,7 +70,7 @@ static LPITEMIDLIST path_to_pidl(const char* path) HMODULE hdll=GetModuleHandleA("shell32.dll"); pSHSimpleIDListFromPathAW=(void*)GetProcAddress(hdll, (char*)162); if (!pSHSimpleIDListFromPathAW) - trace("SHSimpleIDListFromPathAW not found in shell32.dll\n"); + win_skip("SHSimpleIDListFromPathAW not found in shell32.dll\n"); } pidl=NULL;

1 0

Andrew Talbot : msi: Sign-compare warnings fix.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 40db5bdb16723cec7e607ca4d35d511ec745099c URL: http://source.winehq.org/git/wine.git/?a=commit;h=40db5bdb16723cec7e607ca4d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 20 22:06:16 2008 +0100 msi: Sign-compare warnings fix. --- dlls/msi/appsearch.c | 4 ++-- dlls/msi/automation.c | 2 +- dlls/msi/database.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/helpers.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 5f40ada..a9113c9 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -594,7 +594,7 @@ static void ACTION_ExpandAnyPath(MSIPACKAGE *package, WCHAR *src, WCHAR *dst, ptr = src; deformat_string(package, ptr, &deformatted); - if (!deformatted || lstrlenW(deformatted) > len - 1) + if (!deformatted || strlenW(deformatted) > len - 1) { msi_free(deformatted); return; @@ -755,7 +755,7 @@ static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, LPWSTR *appValue, * here. Add two because we might need to add a backslash if the dir name * isn't backslash-terminated. */ - buf = msi_alloc( (dirLen + max(fileLen, lstrlenW(starDotStarW)) + 2) * sizeof(WCHAR)); + buf = msi_alloc( (dirLen + max(fileLen, strlenW(starDotStarW)) + 2) * sizeof(WCHAR)); if (!buf) return ERROR_OUTOFMEMORY; diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 60224b6..11f0a09 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -336,7 +336,7 @@ static HRESULT WINAPI AutomationObject_GetIDsOfNames( hr = ITypeInfo_GetIDsOfNames(This->iTypeInfo, rgszNames, cNames, rgDispId); if (hr == DISP_E_UNKNOWNNAME) { - int idx; + UINT idx; for (idx=0; idx<cNames; idx++) { if (rgDispId[idx] == DISPID_UNKNOWN) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 8aa2c5f..4667006 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -557,7 +557,7 @@ static UINT msi_add_records_to_table(MSIDATABASE *db, LPWSTR *columns, LPWSTR *t int num_columns, int num_records) { UINT r; - DWORD i; + int i; MSIQUERY *view; MSIRECORD *rec; diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 2dcb868..8be1cc7 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1388,7 +1388,7 @@ msi_maskedit_set_text( struct msi_maskedit_info *info, LPCWSTR text ) p = text; for( i = 0; i < info->num_groups; i++ ) { - if( info->group[i].len < lstrlenW( p ) ) + if( info->group[i].len < strlenW( p ) ) { LPWSTR chunk = strdupW( p ); chunk[ info->group[i].len ] = 0; diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 9693719..d15d79a 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -436,7 +436,7 @@ UINT schedule_action(MSIPACKAGE *package, UINT script, LPCWSTR action) void msi_free_action_script(MSIPACKAGE *package, UINT script) { - int i; + UINT i; for (i = 0; i < package->script->ActionCount[script]; i++) msi_free(package->script->Actions[script][i]); @@ -1009,7 +1009,7 @@ UINT register_unique_action(MSIPACKAGE *package, LPCWSTR action) BOOL check_unique_action(const MSIPACKAGE *package, LPCWSTR action) { - INT i; + UINT i; if (!package->script) return FALSE;

1 0

Eric Pouech : msvcrt: Implemented vswprintf_s.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 6a77a36b242500966a6fdea1c087aafc01c492e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a77a36b242500966a6fdea1c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 18 13:59:47 2008 +0200 msvcrt: Implemented vswprintf_s. --- dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/wcs.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b11af56..658c775 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -760,6 +760,7 @@ @ cdecl vprintf(str ptr) MSVCRT_vprintf @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf +@ cdecl vswprintf_s(ptr long wstr ptr) MSVCRT_vswprintf_s @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 81528be..7eab20b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -657,6 +657,11 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist ) flags.Format = *p; r = 0; + if (flags.Format == '$') + { + FIXME("Positional parameters are not supported (%s)\n", wine_dbgstr_w(format)); + return -1; + } /* output a string */ if( flags.Format == 's' || flags.Format == 'S' ) r = pf_handle_string_format( out, va_arg(valist, const void*), -1, @@ -876,6 +881,15 @@ int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, v } /********************************************************************* + * vswprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_vswprintf_s( MSVCRT_wchar_t* str, MSVCRT_size_t num, const MSVCRT_wchar_t* format, va_list args ) +{ + /* FIXME: must handle positional arguments */ + return MSVCRT_vsnwprintf( str, num, format, args ); +} + +/********************************************************************* * wcscoll (MSVCRT.@) */ int CDECL MSVCRT_wcscoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 )

1 0

Paul Vriens : version/tests: Fix a copy-paste mistake.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 29360b632f1efbc88d9bb136ae2d10aa89a88266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29360b632f1efbc88d9bb136a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 23:11:33 2008 +0200 version/tests: Fix a copy-paste mistake. --- dlls/version/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index 9a6bcf4..56cc8a9 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -167,7 +167,7 @@ static void test_info_size(void) } } else - trace("skipping GetModuleFileNameA(NULL,..) failed\n"); + trace("skipping GetSystemDirectoryA(mypath,..) failed\n"); create_file("test.txt");

1 0

Paul Vriens : comctl32/tests: Use win_skip instead of trace.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: aad612534077866ac2f5f1b4b8d217c0a01b478d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad612534077866ac2f5f1b4b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 22:13:32 2008 +0200 comctl32/tests: Use win_skip instead of trace. --- dlls/comctl32/tests/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 03aaca1..0ed8c78 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -433,7 +433,7 @@ static BOOL DoTest3(void) if (!pImageList_DrawIndirect) { - trace("ImageList_DrawIndirect not available, skipping test\n"); + win_skip("ImageList_DrawIndirect not available, skipping test\n"); return TRUE; }

1 0