wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Piotr Caban : jscript: Added Date_setTime implementation.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: c0af3a57c2a80394539c3094368ab65ea5cf4653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0af3a57c2a80394539c30943… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jun 4 22:37:08 2009 +0200 jscript: Added Date_setTime implementation. --- dlls/jscript/date.c | 29 +++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 5f8974b..e17ad26 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -310,8 +310,33 @@ static HRESULT Date_getTimezoneOffset(DispatchEx *dispex, LCID lcid, WORD flags, static HRESULT Date_setTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + DateInstance *date; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + date = (DateInstance*)dispex; + date->time = time_clip(num_val(&v)); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } static HRESULT Date_setMiliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2b6e0b2..1f922b9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -941,6 +941,10 @@ ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); date = new Date(Infinity); ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); +ok(date.setTime(123) === 123, "date.setTime(123) !== 123"); +ok(date.setTime("123", NaN) === 123, "date.setTime(\"123\") !== 123"); +ok(isNaN(date.setTime(NaN)), "date.setTime(NaN) is not NaN"); + ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI); Math.PI = "test";

1 0

Piotr Caban : jscript: Fix DateConstr_value (with no argument) implementation.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: c144859b13e5f14abdc67cd332ee315eacb041ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c144859b13e5f14abdc67cd33… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jun 4 22:36:27 2009 +0200 jscript: Fix DateConstr_value (with no argument) implementation. --- dlls/jscript/date.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 53ff314..5f8974b 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -25,11 +25,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +/* 1601 to 1970 is 369 years plus 89 leap days */ +#define TIME_EPOCH ((ULONGLONG)(369 * 365 + 89) * 86400 * 1000) + typedef struct { DispatchEx dispex; /* ECMA-262 3rd Edition 15.9.1.1 */ DOUBLE time; + + LONG bias; } DateInstance; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; @@ -474,6 +479,9 @@ static HRESULT create_date(script_ctx_t *ctx, BOOL use_constr, DOUBLE time, Disp { DateInstance *date; HRESULT hres; + TIME_ZONE_INFORMATION tzi; + + GetTimeZoneInformation(&tzi); date = heap_alloc_zero(sizeof(DateInstance)); if(!date) @@ -489,6 +497,7 @@ static HRESULT create_date(script_ctx_t *ctx, BOOL use_constr, DOUBLE time, Disp } date->time = time; + date->bias = tzi.Bias; *ret = &date->dispex; return S_OK; @@ -508,12 +517,13 @@ static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP /* ECMA-262 3rd Edition 15.9.3.3 */ case 0: { FILETIME time; + LONGLONG lltime; GetSystemTimeAsFileTime(&time); + lltime = ((LONGLONG)time.dwHighDateTime<<32) + + time.dwLowDateTime; - hres = create_date(dispex->ctx, TRUE, - floor((DOUBLE)(time.dwLowDateTime/1e6) + (DOUBLE)time.dwHighDateTime*((DOUBLE)UINT_MAX+1.0)/1.e6), - &date); + hres = create_date(dispex->ctx, TRUE, lltime/10000-TIME_EPOCH, &date); if(FAILED(hres)) return hres; break;

1 0

Eric van Beurden : wininet: Rearrange invalid header checks.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: 59a217847cb6a173653f7923ba0aa711354b96a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a217847cb6a173653f7923b… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Thu Jun 4 10:52:59 2009 -0400 wininet: Rearrange invalid header checks. --- dlls/wininet/http.c | 43 +++++++++++++++++++------------------------ 1 files changed, 19 insertions(+), 24 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c6873ae..1bba8d9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4235,33 +4235,28 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) TRACE("got line %s, now interpreting\n", debugstr_a(bufferA)); if (!bufferA[0]) break; - if (!strchr(bufferA, ':')) - { - WARN("invalid header\n"); - continue; - } MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); - while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) - cchMaxRawHeaders *= 2; - temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); - if (temp == NULL) goto lend; - lpszRawHeaders = temp; - memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); - cchRawHeaders += (buflen-1); - memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf)); - cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1; - lpszRawHeaders[cchRawHeaders] = '\0'; - pFieldAndValue = HTTP_InterpretHttpHeader(buffer); - if (!pFieldAndValue) - break; - - HTTP_ProcessHeader(lpwhr, pFieldAndValue[0], pFieldAndValue[1], - HTTP_ADDREQ_FLAG_ADD ); - - HTTP_FreeTokens(pFieldAndValue); - } + if (pFieldAndValue) + { + while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) + cchMaxRawHeaders *= 2; + temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); + if (temp == NULL) goto lend; + lpszRawHeaders = temp; + memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); + cchRawHeaders += (buflen-1); + memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf)); + cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1; + lpszRawHeaders[cchRawHeaders] = '\0'; + + HTTP_ProcessHeader(lpwhr, pFieldAndValue[0], pFieldAndValue[1], + HTTP_ADDREQ_FLAG_ADD ); + + HTTP_FreeTokens(pFieldAndValue); + } + } else { cbreaks++;

1 0

Eric van Beurden : wininet: Check for bad allocation in HeapReAlloc.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: 5caf80942657bc1b067acfc3f9decc6970ef2fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5caf80942657bc1b067acfc3f… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Thu Jun 4 10:52:16 2009 -0400 wininet: Check for bad allocation in HeapReAlloc. --- dlls/wininet/http.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b11ce21..c6873ae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4160,6 +4160,7 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) LPWSTR status_code, status_text; DWORD cchMaxRawHeaders = 1024; LPWSTR lpszRawHeaders = HeapAlloc(GetProcessHeap(), 0, (cchMaxRawHeaders+1)*sizeof(WCHAR)); + LPWSTR temp; DWORD cchRawHeaders = 0; TRACE("-->\n"); @@ -4213,10 +4214,10 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) /* regenerate raw headers */ while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) - { cchMaxRawHeaders *= 2; - lpszRawHeaders = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); - } + temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); + if (temp == NULL) goto lend; + lpszRawHeaders = temp; memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); cchRawHeaders += (buflen-1); memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf)); @@ -4242,10 +4243,10 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) - { cchMaxRawHeaders *= 2; - lpszRawHeaders = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); - } + temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); + if (temp == NULL) goto lend; + lpszRawHeaders = temp; memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); cchRawHeaders += (buflen-1); memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf));

1 0

Jacek Caban : urlmon: Use a copy of PROTOCOLDATA in Switch/ Continue implementation.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: 80dd9b9c9e9d3ce6cd81585376aaad85d99cb401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80dd9b9c9e9d3ce6cd8158537… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 22:50:23 2009 +0200 urlmon: Use a copy of PROTOCOLDATA in Switch/Continue implementation. --- dlls/urlmon/bindprot.c | 22 ++++++++++++++++------ dlls/urlmon/tests/protocol.c | 8 ++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index f63824b..aef8c23 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -608,10 +608,14 @@ static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocol *iface, LPCWSTR sz static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + HRESULT hres; TRACE("(%p)->(%p)\n", This, pProtocolData); - return IInternetProtocol_Continue(This->protocol, pProtocolData); + hres = IInternetProtocol_Continue(This->protocol, pProtocolData); + + heap_free(pProtocolData); + return hres; } static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocol *iface, HRESULT hrReason, @@ -874,14 +878,14 @@ static ULONG WINAPI BPInternetProtocolSink_Release(IInternetProtocolSink *iface) typedef struct { task_header_t header; - PROTOCOLDATA data; + PROTOCOLDATA *data; } switch_task_t; static void switch_proc(BindProtocol *bind, task_header_t *t) { switch_task_t *task = (switch_task_t*)t; - IInternetProtocol_Continue(bind->protocol_handler, &task->data); + IInternetProtocol_Continue(bind->protocol_handler, task->data); heap_free(task); } @@ -890,12 +894,18 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface PROTOCOLDATA *pProtocolData) { BindProtocol *This = PROTSINK_THIS(iface); + PROTOCOLDATA *data; TRACE("(%p)->(%p)\n", This, pProtocolData); TRACE("flags %x state %x data %p cb %u\n", pProtocolData->grfFlags, pProtocolData->dwState, pProtocolData->pData, pProtocolData->cbData); + data = heap_alloc(sizeof(PROTOCOLDATA)); + if(!data) + return E_OUTOFMEMORY; + memcpy(data, pProtocolData, sizeof(PROTOCOLDATA)); + if(!do_direct_notif(This)) { switch_task_t *task; @@ -903,18 +913,18 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface if(!task) return E_OUTOFMEMORY; - task->data = *pProtocolData; + task->data = data; push_task(This, &task->header, switch_proc); return S_OK; } if(!This->protocol_sink) { - IInternetProtocol_Continue(This->protocol_handler, pProtocolData); + IInternetProtocol_Continue(This->protocol_handler, data); return S_OK; } - return IInternetProtocolSink_Switch(This->protocol_sink, pProtocolData); + return IInternetProtocolSink_Switch(This->protocol_sink, data); } static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR status_text) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index e8aa8f9..50820e8 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -436,6 +436,10 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL CHECK_EXPECT(Switch); ok(pProtocolData != NULL, "pProtocolData == NULL\n"); + if(binding_test) { + ok(pProtocolData != &protocoldata, "pProtocolData == &protocoldata\n"); + ok(!memcmp(pProtocolData, &protocoldata, sizeof(PROTOCOLDATA)), "*pProtocolData != protocoldata\n"); + } pdata = pProtocolData; @@ -1321,6 +1325,10 @@ static HRESULT WINAPI ProtocolEmul_Continue(IInternetProtocol *iface, ok(pProtocolData != NULL, "pProtocolData == NULL\n"); if(!pProtocolData || tested_protocol == BIND_TEST) return S_OK; + if(binding_test) { + ok(pProtocolData != &protocoldata, "pProtocolData == &protocoldata\n"); + ok(!memcmp(pProtocolData, &protocoldata, sizeof(PROTOCOLDATA)), "*pProtocolData != protocoldata\n"); + } switch(prot_state) { case 1: {

1 0

Jacek Caban : urlmon: Set INTERNET_OPTION_HTTP_DECODING option in http protocol handler.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: de36782c48c0b159b969d6b4b2a40b71f00603f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de36782c48c0b159b969d6b4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 22:49:56 2009 +0200 urlmon: Set INTERNET_OPTION_HTTP_DECODING option in http protocol handler. --- dlls/urlmon/http.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 272b338..928abba 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -85,7 +85,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ BYTE security_id[512]; DWORD len = 0; ULONG num = 0; - BOOL res; + BOOL res, b; HRESULT hres; static const WCHAR wszBindVerb[BINDVERB_CUSTOM][5] = @@ -209,6 +209,11 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ optional = (LPWSTR)This->base.bind_info.stgmedData.u.hGlobal; } + b = TRUE; + res = InternetSetOptionW(This->base.request, INTERNET_OPTION_HTTP_DECODING, &b, sizeof(b)); + if(!res) + WARN("InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %08x\n", GetLastError()); + res = HttpSendRequestW(This->base.request, This->full_header, lstrlenW(This->full_header), optional, optional ? This->base.bind_info.cbstgmedData : 0); if(!res && GetLastError() != ERROR_IO_PENDING) {

1 0

Paul Vriens : msctf: Fix a possible NULL dereference (Coverity).
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: e42d7f95910d5d5322919baf29be8cacfd46a5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e42d7f95910d5d5322919baf2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 5 09:20:27 2009 +0200 msctf: Fix a possible NULL dereference (Coverity). --- dlls/msctf/range.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index 8b1f482..dc9eae1 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -349,11 +349,13 @@ HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD l HRESULT TF_SELECTION_to_TS_SELECTION_ACP(const TF_SELECTION *tf, TS_SELECTION_ACP *tsAcp) { - Range *This = (Range *)tf->range; + Range *This; if (!tf || !tsAcp || !tf->range) return E_INVALIDARG; + This = (Range *)tf->range; + tsAcp->acpStart = This->anchorStart; tsAcp->acpEnd = This->anchorEnd; tsAcp->style.ase = tf->style.ase;

1 0

Paul Vriens : kernel32/tests: Fix a test failure on Win9x/WinMe.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: b3e4155a4189c042ee94a142020dd18221e320f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e4155a4189c042ee94a1420… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 5 09:10:09 2009 +0200 kernel32/tests: Fix a test failure on Win9x/WinMe. --- dlls/kernel32/tests/debugger.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 9b849b0..2f32478 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -280,15 +280,16 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) /* If, after attaching to the debuggee, the debugger exits without * detaching, then the debuggee gets a special exit code. */ - ok(exit_code == 0xffffffff || /* Win 9x */ - exit_code == 0x80 || /* NT4 */ - exit_code == STATUS_DEBUGGER_INACTIVE, /* Win >= XP */ + ok(exit_code == STATUS_DEBUGGER_INACTIVE || + broken(exit_code == 0xffffffff) || /* Win9x */ + broken(exit_code == WAIT_ABANDONED), /* NT4, W2K */ "wrong exit code : %08x\n", exit_code); } else - ok(exit_code == STATUS_ACCESS_VIOLATION || - exit_code == WAIT_ABANDONED, /* win2k3 */ - "exit code = %08x instead of STATUS_ACCESS_VIOLATION or WAIT_ABANDONED\n", exit_code); + ok(exit_code == STATUS_ACCESS_VIOLATION || + broken(exit_code == WAIT_ABANDONED) || /* NT4, W2K, W2K3 */ + broken(exit_code == 0xffffffff), /* Win9x, WinME */ + "wrong exit code : %08x\n", exit_code); CloseHandle(info.hProcess); /* ...before the debugger */ @@ -410,8 +411,12 @@ static void test_ExitCode(void) crash_and_debug(hkey, test_exe, "dbg,attach,event,code2"); if (pDebugSetProcessKillOnExit) crash_and_debug(hkey, test_exe, "dbg,attach,event,nokill"); + else + win_skip("DebugSetProcessKillOnExit is not available\n"); if (pDebugActiveProcessStop) crash_and_debug(hkey, test_exe, "dbg,attach,event,detach"); + else + win_skip("DebugActiveProcessStop is not available\n"); if (disposition == REG_CREATED_NEW_KEY) {

1 0

Paul Vriens : riched32/tests: Fix a test failure on NT4 and below.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: d449fcde40a7918d4ec8f157f8d1ed1d9c7e7c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d449fcde40a7918d4ec8f157f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 4 18:02:44 2009 +0200 riched32/tests: Fix a test failure on NT4 and below. --- dlls/riched32/tests/editor.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 079045c..269a425 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -955,7 +955,7 @@ static void test_autoscroll(void) hwnd = CreateWindowEx(0, RICHEDIT_CLASS10A, NULL, WS_POPUP|ES_MULTILINE|WS_VSCROLL|WS_HSCROLL, 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); - ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS10A, (int) GetLastError()); ret = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); ok(ret & ECO_AUTOVSCROLL, "ECO_AUTOVSCROLL isn't set.\n"); ok(!(ret & ECO_AUTOHSCROLL), "ECO_AUTOHSCROLL is set.\n"); @@ -964,10 +964,10 @@ static void test_autoscroll(void) ok(!(ret & ES_AUTOHSCROLL), "ES_AUTOHSCROLL is set.\n"); DestroyWindow(hwnd); - hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + hwnd = CreateWindowEx(0, RICHEDIT_CLASS10A, NULL, WS_POPUP|ES_MULTILINE, 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); - ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS10A, (int) GetLastError()); ret = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); ok(!(ret & ECO_AUTOVSCROLL), "ECO_AUTOVSCROLL is set.\n"); ok(!(ret & ECO_AUTOHSCROLL), "ECO_AUTOHSCROLL is set.\n");

1 0

Paul Vriens : shell32/tests: Fix test failure on NT4.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: b7aa196449da80786709ae6898743f7b865ea369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7aa196449da80786709ae689… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 4 16:38:00 2009 +0200 shell32/tests: Fix test failure on NT4. --- dlls/shell32/tests/shlexec.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3460e1f..216c6d0 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -677,6 +677,8 @@ static void test_filename(void) test=filename_tests; while (test->basename) { + BOOL quotedfile = FALSE; + sprintf(filename, test->basename, tmpdir); if (strchr(filename, '/')) { @@ -695,6 +697,8 @@ static void test_filename(void) else { char quoted[MAX_PATH + 2]; + + quotedfile = TRUE; sprintf(quoted, "\"%s\"", filename); rc=shell_execute(test->verb, quoted, NULL, NULL); } @@ -702,7 +706,9 @@ static void test_filename(void) rc=33; if ((test->todo & 0x1)==0) { - ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, + ok(rc==test->rc || + broken(quotedfile && rc == 2), /* NT4 */ + "%s failed: rc=%d err=%d\n", shell_call, rc, GetLastError()); } else todo_wine

1 0

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 June 2009