wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Andrew Eikum : shell32: Fix an off-by-one error that causes an infinite loop.
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: 2f05b5a6d981d54f272d193ea0bcd3a72144c88d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f05b5a6d981d54f272d193ea… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Nov 17 11:56:13 2010 -0600 shell32: Fix an off-by-one error that causes an infinite loop. --- dlls/shell32/shfldr_unixfs.c | 14 +++++++++-- dlls/shell32/tests/shlfolder.c | 47 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 14bf900..628ab87 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -390,15 +390,23 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) /* Append the part relative to the drive symbolic link target. */ lstrcpyW(dospath, pszDosPath); dospath_end = dospath + lstrlenW(dospath); + /* search for the most valid UNIX path possible, then append missing + * path parts */ while(!(pszUnixPath = wine_get_unix_file_name(dospath))){ - if(has_failed) + if(has_failed){ *dospath_end = '/'; - else + --dospath_end; + }else has_failed = 1; - while(*dospath_end != '\\' && *dospath_end != '/') + while(*dospath_end != '\\' && *dospath_end != '/'){ --dospath_end; + if(dospath_end < dospath) + break; + } *dospath_end = '\0'; } + if(dospath_end < dospath) + return FALSE; strcat(szPath, pszUnixPath + cDriveSymlinkLen); HeapFree(GetProcessHeap(), 0, pszUnixPath); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 31ef752..ad52a72 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4062,6 +4062,7 @@ static void test_ParseDisplayNamePBC(void) {'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d',' ','D','a','t','a',0}; WCHAR adirW[] = {'C',':','\\','f','s','b','d','d','i','r',0}; WCHAR afileW[] = {'C',':','\\','f','s','b','d','d','i','r','\\','f','i','l','e','.','t','x','t',0}; + WCHAR afile2W[] = {'C',':','\\','f','s','b','d','d','i','r','\\','s','\\','f','i','l','e','.','t','x','t',0}; const HRESULT exp_err = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); IShellFolder *psf; @@ -4091,6 +4092,9 @@ static void test_ParseDisplayNamePBC(void) hres = IShellFolder_ParseDisplayName(psf, NULL, NULL, afileW, NULL, &pidl, NULL); ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + hres = IShellFolder_ParseDisplayName(psf, NULL, NULL, afile2W, NULL, &pidl, NULL); + ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed with wrong error: 0x%08x\n", hres); /* fails on unknown dir with IBindCtx with no IFileSystemBindData */ hres = CreateBindCtx(0, &pbc); @@ -4102,6 +4106,9 @@ static void test_ParseDisplayNamePBC(void) hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); + ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed with wrong error: 0x%08x\n", hres); /* unknown dir with IBindCtx with IFileSystemBindData */ hres = IBindCtx_RegisterObjectParam(pbc, wFileSystemBindData, (IUnknown*)&fsbd); @@ -4126,6 +4133,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afile2W); + ILFree(pidl); + } + /* set FIND_DATA struct to NULLs */ pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_nul; @@ -4145,6 +4160,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afile2W); + ILFree(pidl); + } + /* set FIND_DATA struct to junk */ pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_junk; @@ -4164,6 +4187,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afile2W); + ILFree(pidl); + } + /* set FIND_DATA struct to invalid data */ pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_invalid; @@ -4183,6 +4214,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afile2W); + ILFree(pidl); + } + /* set FIND_DATA struct to valid data */ pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_valid; @@ -4202,6 +4241,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afile2W); + ILFree(pidl); + } + IBindCtx_Release(pbc); IShellFolder_Release(psf); }

1 0

Andreas Pflug : oledb32: Added conversions for R8, BOOL, DATE, DBTIMESTAMP.
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: afa90e325ec56733fd1c2079bc512136b6afeb01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa90e325ec56733fd1c2079b… Author: Andreas Pflug <pflug(a)pse-consulting.de> Date: Wed Nov 17 13:06:16 2010 +0100 oledb32: Added conversions for R8,BOOL,DATE,DBTIMESTAMP. --- dlls/oledb32/convert.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 9 ++++ 2 files changed, 129 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f6f72d0..c98d0b2 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -120,13 +120,19 @@ static int get_length(DBTYPE type) case DBTYPE_I2: case DBTYPE_UI2: return 2; + case DBTYPE_BOOL: + return sizeof(VARIANT_BOOL); case DBTYPE_I4: case DBTYPE_UI4: case DBTYPE_R4: return 4; case DBTYPE_I8: case DBTYPE_UI8: + case DBTYPE_R8: + case DBTYPE_DATE: return 8; + case DBTYPE_DBTIMESTAMP: + return sizeof(DBTIMESTAMP); case DBTYPE_CY: return sizeof(CY); case DBTYPE_BSTR: @@ -299,6 +305,120 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; } + case DBTYPE_R8: + { + DOUBLE *d=dst; + switch (src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I1: hr = VarR8FromI1(*(signed char*)src, d); break; + case DBTYPE_I2: hr = VarR8FromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarR8FromI4(*(signed int*)src, d); break; + case DBTYPE_I8: hr = VarR8FromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI1: hr = VarR8FromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarR8FromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarR8FromUI4(*(DWORD*)src, d); break; + case DBTYPE_UI8: hr = VarR8FromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_R4: hr = VarR8FromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: *d = *(DOUBLE*)src; hr = S_OK; break; + case DBTYPE_CY: hr = VarR8FromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarR8FromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarR8FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarR8FromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarR8FromDec((DECIMAL*)src, d); break; + default: FIXME("Unimplemented conversion %04x -> R8\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_BOOL: + { + VARIANT_BOOL *d=dst; + switch (src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I1: hr = VarBoolFromI1(*(signed char*)src, d); break; + case DBTYPE_I2: hr = VarBoolFromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarBoolFromI4(*(signed int*)src, d); break; + case DBTYPE_I8: hr = VarBoolFromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI1: hr = VarBoolFromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarBoolFromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarBoolFromUI4(*(DWORD*)src, d); break; + case DBTYPE_UI8: hr = VarBoolFromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_R4: hr = VarBoolFromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarBoolFromR8(*(DOUBLE*)src, d); break; + case DBTYPE_CY: hr = VarBoolFromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarBoolFromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarBoolFromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: *d = *(VARIANT_BOOL*)src; hr = S_OK; break; + case DBTYPE_DECIMAL: hr = VarBoolFromDec((DECIMAL*)src, d); break; + default: FIXME("Unimplemented conversion %04x -> BOOL\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_DATE: + { + DATE *d=dst; + switch (src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I1: hr = VarDateFromI1(*(signed char*)src, d); break; + case DBTYPE_I2: hr = VarDateFromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarDateFromI4(*(signed int*)src, d); break; + case DBTYPE_I8: hr = VarDateFromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI1: hr = VarDateFromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarDateFromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarDateFromUI4(*(DWORD*)src, d); break; + case DBTYPE_UI8: hr = VarDateFromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_R4: hr = VarDateFromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarDateFromR8(*(DOUBLE*)src, d); break; + case DBTYPE_CY: hr = VarDateFromCy(*(CY*)src, d); break; + case DBTYPE_DATE: *d = *(DATE*)src; hr = S_OK; break; + case DBTYPE_BSTR: hr = VarDateFromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarDateFromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarDateFromDec((DECIMAL*)src, d); break; + case DBTYPE_DBTIMESTAMP: + { + SYSTEMTIME st; + DBTIMESTAMP *ts=(DBTIMESTAMP*)src; + + st.wYear = ts->year; + st.wMonth = ts->month; + st.wDay = ts->day; + st.wHour = ts->hour; + st.wMinute = ts->minute; + st.wSecond = ts->second; + st.wMilliseconds = ts->fraction/1000000; + hr = (SystemTimeToVariantTime(&st, d) ? S_OK : E_FAIL); + break; + } + default: FIXME("Unimplemented conversion %04x -> DATE\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_DBTIMESTAMP: + { + DBTIMESTAMP *d=dst; + switch (src_type) + { + case DBTYPE_EMPTY: memset(d, 0, sizeof(DBTIMESTAMP)); hr = S_OK; break; + case DBTYPE_DBTIMESTAMP: memcpy(d, src, sizeof(DBTIMESTAMP)); hr = S_OK; break; + case DBTYPE_DATE: + { + SYSTEMTIME st; + hr = (VariantTimeToSystemTime(*(double*)src, &st) ? S_OK : E_FAIL); + d->year = st.wYear; + d->month = st.wMonth; + d->day = st.wDay; + d->hour = st.wHour; + d->minute = st.wMinute; + d->second = st.wSecond; + d->fraction = st.wMilliseconds * 1000000; + break; + } + default: FIXME("Unimplemented conversion %04x -> DBTIMESTAMP\n", src_type); return E_NOTIMPL; + } + break; + } case DBTYPE_CY: { diff --git a/include/oledb.idl b/include/oledb.idl index 127df2b..4841165 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -40,6 +40,15 @@ typedef ULONG DBREFCOUNT; typedef ULONG DB_UPARAMS; typedef LONG DB_LPARAMS; typedef DWORD DBHASHVALUE; +typedef struct { + SHORT year; + USHORT month; + USHORT day; + USHORT hour; + USHORT minute; + USHORT second; + ULONG fraction; +} DBTIMESTAMP; #include "dbs.idl"

1 0

Alexandre Julliard : winspool/tests: Avoid sizeof in traces.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: d7a0284f87e66833133865401c80a8a6b989be97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a0284f87e66833133865401… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 15:08:18 2010 +0100 winspool/tests: Avoid sizeof in traces. --- dlls/winspool.drv/tests/info.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index a31cbc9..1c7e917 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2367,15 +2367,14 @@ static void test_GetPrinterData(void) len = lstrlenA(buffer) + sizeof(CHAR); /* NT4 and w2k require a buffer to save the UNICODE result also for the ANSI function */ ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", - res, type, needed, buffer, len, len * sizeof(WCHAR)); + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + res, type, needed, buffer, len); needed = 0xdeadbeef; SetLastError(0xdeadbeef); res = GetPrinterDataA(hprn, defaultspooldirectory, NULL, NULL, 0, &needed); ok( (res == ERROR_MORE_DATA) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n", - res, needed, len, len * sizeof(WCHAR)); + "got %d, needed: %d (expected ERROR_MORE_DATA and %d)\n", res, needed, len); /* ToDo: test SPLREG_* */ @@ -2423,8 +2422,8 @@ static void test_GetPrinterDataEx(void) len = lstrlenA(buffer) + sizeof(CHAR); /* NT4 and w2k require a buffer to save the UNICODE result also for the ANSI function */ ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", - res, type, needed, buffer, len, len * sizeof(WCHAR)); + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + res, type, needed, buffer, len); memset(buffer, '#', sizeof(buffer)); buffer[MAX_PATH] = 0; @@ -2435,8 +2434,8 @@ static void test_GetPrinterDataEx(void) (LPBYTE) buffer, sizeof(buffer), &needed); len = lstrlenA(buffer) + sizeof(CHAR); ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", - res, type, needed, buffer, len, len * sizeof(WCHAR)); + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + res, type, needed, buffer, len); memset(buffer, '#', sizeof(buffer)); buffer[MAX_PATH] = 0; @@ -2448,8 +2447,8 @@ static void test_GetPrinterDataEx(void) &type, (LPBYTE) buffer, sizeof(buffer), &needed); len = lstrlenA(buffer) + sizeof(CHAR); ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", - res, type, needed, buffer, len, len * sizeof(WCHAR)); + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + res, type, needed, buffer, len); memset(buffer, '#', sizeof(buffer)); @@ -2461,8 +2460,8 @@ static void test_GetPrinterDataEx(void) (LPBYTE) buffer, sizeof(buffer), &needed); len = lstrlenA(buffer) + sizeof(CHAR); ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", - res, type, needed, buffer, len, len * sizeof(WCHAR)); + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + res, type, needed, buffer, len); needed = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -2471,16 +2470,14 @@ static void test_GetPrinterDataEx(void) res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed); ok( ((res == ERROR_MORE_DATA) || broken(res == 0xdeadbeef)) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n", - res, needed, len, len * sizeof(WCHAR)); + "got %d, needed: %d (expected ERROR_MORE_DATA and %d)\n", res, needed, len); needed = 0xdeadbeef; SetLastError(0xdeaddead); res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed); ok( ((res == ERROR_MORE_DATA) || broken(res == 0xdeaddead)) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n", - res, needed, len, len * sizeof(WCHAR)); + "got %d, needed: %d (expected ERROR_MORE_DATA and %d)\n", res, needed, len); SetLastError(0xdeadbeef); res = ClosePrinter(hprn);

1 0

Alexandre Julliard : urlmon/tests: Avoid sizeof in traces.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: bbf0af4543530731bf2a7e6d3b6e99e3de425cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf0af4543530731bf2a7e6d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 15:08:08 2010 +0100 urlmon/tests: Avoid sizeof in traces. --- dlls/urlmon/tests/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index d27d4ed..580dfa3 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -9140,7 +9140,7 @@ static HRESULT WINAPI InternetProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa wine_dbgstr_w(combine_relativeW), wine_dbgstr_w(pwzRelativeUrl)); ok(dwCombineFlags == (URL_DONT_SIMPLIFY|URL_FILE_USE_PATHURL|URL_DONT_UNESCAPE_EXTRA_INFO), "Error: Expected 0, but got 0x%08x.\n", dwCombineFlags); - ok(cchResult == INTERNET_MAX_URL_LENGTH+1, "Error: Expected %d, but got %d.\n", INTERNET_MAX_URL_LENGTH+1, cchResult); + ok(cchResult == INTERNET_MAX_URL_LENGTH+1, "Error: Got %d.\n", cchResult); memcpy(pwzResult, combine_resultW, sizeof(combine_resultW)); *pcchResult = lstrlenW(combine_resultW);

1 0

Alexandre Julliard : msvcrt/tests: Avoid sizeof in traces.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 45a8b643cdd9eeaaad5da36f3c3b2c2dbcbe853d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a8b643cdd9eeaaad5da36f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 15:08:03 2010 +0100 msvcrt/tests: Avoid sizeof in traces. --- dlls/msvcrt/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 488c219..33fe128 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1237,7 +1237,7 @@ static void test_fopen_s( void ) file = fopen(name, "r"); ok(file != 0, "fopen failed\n"); len = fread(buff, 1, sizeof(name), file); - ok(len == sizeof(name), "File length supposed to be %d, not %d\n", sizeof(name), len); + ok(len == sizeof(name), "File length is %d\n", len); buff[sizeof(name)] = '\0'; ok(strcmp(name, buff) == 0, "File content mismatch! Got %s, expected %s\n", buff, name); @@ -1278,7 +1278,7 @@ static void test__wfopen_s( void ) file = fopen(name, "r"); ok(file != 0, "fopen failed\n"); len = fread(buff, 1, sizeof(name), file); - ok(len == sizeof(name), "File length supposed to be %d, not %d\n", sizeof(name), len); + ok(len == sizeof(name), "File length is %d\n", len); buff[sizeof(name)] = '\0'; ok(strcmp(name, buff) == 0, "File content mismatch! Got %s, expected %s\n", buff, name);

1 0

Alexandre Julliard : gameux: Avoid sizeof in traces.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 19b251885c2516de8b11840976880769ca8345f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b251885c2516de8b1184097… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 15:07:56 2010 +0100 gameux: Avoid sizeof in traces. --- dlls/gameux/gamestatistics.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index da2a3e5..97a8f13 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -629,7 +629,6 @@ static HRESULT GAMEUX_loadGameStatistics(struct GAMEUX_STATS *pStats, else if(hr == S_FALSE && openType == GAMESTATS_OPEN_OPENORCREATE) /* file does not exist */ { /* create new statitics, not yet connected with file */ - TRACE("size: %d\n", sizeof(pStats->categories)); ZeroMemory(pStats->categories, sizeof(pStats->categories)); *pOpenResult = GAMESTATS_OPEN_CREATED; hr = S_OK;

1 0

Alexandre Julliard : advapi32/tests: Avoid sizeof in traces.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 5fc51fd10e5b18e54d6e0bd6507eadf615019912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc51fd10e5b18e54d6e0bd65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 15:07:47 2010 +0100 advapi32/tests: Avoid sizeof in traces. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index edfecb9..4d8c8cf 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1311,7 +1311,7 @@ static void test_token_attr(void) ok(ret, "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); ok(Dacl->DefaultDacl == NULL, "expected NULL, got %p\n", Dacl->DefaultDacl); ok(Size2 == sizeof(TOKEN_DEFAULT_DACL) || broken(Size2 == 2*sizeof(TOKEN_DEFAULT_DACL)), /* WoW64 */ - "got %u expected %u (sizeof(TOKEN_DEFAULT_DACL))\n", Size2, sizeof(TOKEN_DEFAULT_DACL)); + "got %u expected sizeof(TOKEN_DEFAULT_DACL)\n", Size2); Dacl->DefaultDacl = acl; ret = SetTokenInformation(Token, TokenDefaultDacl, Dacl, Size);

1 0

Alexandre Julliard : libwine: Fix a pointer comparison warning.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 7a7b60098f0eb68d3546792a77859eaf110eb056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a7b60098f0eb68d3546792a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 15:07:30 2010 +0100 libwine: Fix a pointer comparison warning. --- libs/wine/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 6c2324d..df0a6b5 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -691,7 +691,7 @@ static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) * of the address space causes subsequent execs to fail, even on the * child side of a fork. Avoid the top 16MB. */ char * const limit = (char*)0xff000000; - if (base >= limit) return 0; + if ((char *)base >= limit) return 0; if (size > limit - (char*)base) size = limit - (char*)base; if (size < info->desired_size) return 0;

1 0

Alexandre Julliard : msxml3: Fix incorrect uses of va_list arguments.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: d70b3e592922a2f361bd558a4ee9fbd1e6aed4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d70b3e592922a2f361bd558a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 14:21:09 2010 +0100 msxml3: Fix incorrect uses of va_list arguments. --- dlls/msxml3/main.c | 42 ++++++++++++++++++++++++------------------ dlls/msxml3/msxml_private.h | 4 ++-- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 49ef6fa..1201d2b 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -61,29 +61,35 @@ void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, break; } - if (ap) + do { - do - { - heap_free(buf); - buf = heap_alloc(len); - needed = vsnprintf(buf, len, msg, ap); - if (needed == -1) - len *= 2; - else if (needed >= len) - len = needed + 1; - else - needed = 0; - } - while (needed); - - wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, buf); heap_free(buf); + buf = heap_alloc(len); + needed = vsnprintf(buf, len, msg, ap); + if (needed == -1) + len *= 2; + else if (needed >= len) + len = needed + 1; + else + needed = 0; } - else + while (needed); + + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", buf); + heap_free(buf); +} + +void wineXmlCallbackError(char const* caller, xmlErrorPtr err) +{ + enum __wine_debug_class dbcl; + + switch (err->level) { - wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, msg); + case XML_ERR_NONE: dbcl = __WINE_DBCL_TRACE; break; + case XML_ERR_WARNING: dbcl = __WINE_DBCL_WARN; break; + default: dbcl = __WINE_DBCL_ERR; break; } + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", err->message); } /* Support for loading xml files from a Wine Windows drive */ diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 9980fdd..f3faa8a 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -209,6 +209,7 @@ extern xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc); extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own ); extern void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap); +extern void wineXmlCallbackError(char const* caller, xmlErrorPtr err); #define LIBXML2_LOG_CALLBACK __WINE_PRINTF_ATTR(2,3) @@ -221,8 +222,7 @@ extern void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const #define LIBXML2_CALLBACK_ERR(caller, msg, ap) \ wineXmlCallbackLog(#caller, XML_ERR_ERROR, msg, ap) -#define LIBXML2_CALLBACK_SERROR(caller, err) \ - wineXmlCallbackLog(#caller, err->level, err->message, NULL) +#define LIBXML2_CALLBACK_SERROR(caller, err) wineXmlCallbackError(#caller, err) extern BOOL is_preserving_whitespace(xmlNodePtr node);

1 0

David Hedberg : shdocvw: Implement InPlaceActiveObject:: TranslateAccelerator.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 155877e4fffc6866fd39cf2270ca7285a2c32680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=155877e4fffc6866fd39cf227… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Nov 17 13:12:22 2010 +0100 shdocvw: Implement InPlaceActiveObject::TranslateAccelerator. --- dlls/shdocvw/oleobject.c | 20 +++++++- dlls/shdocvw/tests/webbrowser.c | 94 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 4a777d0..923107f 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -830,8 +830,24 @@ static HRESULT WINAPI InPlaceActiveObject_TranslateAccelerator(IOleInPlaceActive LPMSG lpmsg) { WebBrowser *This = impl_from_IOleInPlaceActiveObject(iface); - FIXME("(%p)->(%p)\n", This, lpmsg); - return E_NOTIMPL; + IOleInPlaceActiveObject *activeobj; + HRESULT hr = S_FALSE; + + TRACE("(%p)->(%p)\n", This, lpmsg); + + if(This->doc_host.document) { + if(SUCCEEDED(IUnknown_QueryInterface(This->doc_host.document, + &IID_IOleInPlaceActiveObject, + (void**)&activeobj))) { + hr = IOleInPlaceActiveObject_TranslateAccelerator(activeobj, lpmsg); + IOleInPlaceActiveObject_Release(activeobj); + } + } + + if(SUCCEEDED(hr)) + return hr; + else + return S_FALSE; } static HRESULT WINAPI InPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface, diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 6f84eee..8f0902f 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -337,6 +337,13 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID default: ok(0, "unexpected nCmdID %d of CGID_DocHostCmdPriv\n", nCmdID); } + }else if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) { + switch(nCmdID) { + case 6041: /* TODO */ + break; + default: + ok(0, "unexpected nCmdID %d of CGID_DocHostCommandHandler\n", nCmdID); + } }else { ok(0, "unexpected pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); } @@ -2598,8 +2605,48 @@ static void test_QueryInterface(IUnknown *unk) } +static void test_UIActivate(IUnknown *unk, BOOL activate) +{ + IOleDocumentView *docview; + IDispatch *disp; + HRESULT hres; + + disp = get_document(unk); + + hres = IDispatch_QueryInterface(disp, &IID_IOleDocumentView, (void**)&docview); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + if(activate) { + SET_EXPECT(RequestUIActivate); + SET_EXPECT(ShowUI); + SET_EXPECT(HideUI); + SET_EXPECT(OnFocus); + } + + hres = IOleDocumentView_UIActivate(docview, activate); + if(activate) + todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres); + else + ok(hres == S_OK, "Got 0x%08x\n", hres); + + if(activate) { + todo_wine { + CHECK_CALLED(RequestUIActivate); + CHECK_CALLED(ShowUI); + CHECK_CALLED(HideUI); + CHECK_CALLED(OnFocus); + } + } + + IOleDocumentView_Release(docview); + } + + IDispatch_Release(disp); +} + static void test_TranslateAccelerator(IUnknown *unk) { + IOleInPlaceActiveObject *pao; IOleObject *obj_doc; IDispatch *disp_doc; HRESULT hres; @@ -2613,6 +2660,51 @@ static void test_TranslateAccelerator(IUnknown *unk) test_Navigate2(unk); + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&pao); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + /* One accelerator that should be handled by mshtml */ + msg_a.message = WM_KEYDOWN; + msg_a.wParam = VK_F1; + hres = IOleInPlaceActiveObject_TranslateAccelerator(pao, &msg_a); + ok(hres == S_FALSE, "Got 0x%08x (%04x::%02lx)\n", hres, msg_a.message, msg_a.wParam); + + /* And one that should not */ + msg_a.message = WM_KEYDOWN; + msg_a.wParam = VK_F5; + hres = IOleInPlaceActiveObject_TranslateAccelerator(pao, &msg_a); + ok(hres == S_FALSE, "Got 0x%08x (%04x::%02lx)\n", hres, msg_a.message, msg_a.wParam); + + IOleInPlaceActiveObject_Release(pao); + } + + test_UIActivate(unk, TRUE); + + /* Test again after UIActivate */ + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&pao); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + /* One accelerator that should be handled by mshtml */ + msg_a.message = WM_KEYDOWN; + msg_a.wParam = VK_F1; + SET_EXPECT(DocHost_TranslateAccelerator); + SET_EXPECT(ControlSite_TranslateAccelerator); + hres = IOleInPlaceActiveObject_TranslateAccelerator(pao, &msg_a); + ok(hres == S_FALSE, "Got 0x%08x (%04x::%02lx)\n", hres, msg_a.message, msg_a.wParam); + todo_wine CHECK_CALLED(DocHost_TranslateAccelerator); + todo_wine CHECK_CALLED(ControlSite_TranslateAccelerator); + + /* And one that should not */ + msg_a.message = WM_KEYDOWN; + msg_a.wParam = VK_F5; + SET_EXPECT(DocHost_TranslateAccelerator); + hres = IOleInPlaceActiveObject_TranslateAccelerator(pao, &msg_a); + todo_wine ok(hres == S_OK, "Got 0x%08x (%04x::%02lx)\n", hres, msg_a.message, msg_a.wParam); + todo_wine CHECK_CALLED(DocHost_TranslateAccelerator); + + IOleInPlaceActiveObject_Release(pao); + } + disp_doc = get_document(unk); hres = IDispatch_QueryInterface(disp_doc, &IID_IOleObject, (void**)&obj_doc); ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2704,6 +2796,8 @@ static void test_TranslateAccelerator(IUnknown *unk) } IDispatch_Release(disp_doc); + + test_UIActivate(unk, FALSE); } static void test_WebBrowser(BOOL do_download)

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2010