August 2009 - Wine-commits - list.winehq.org

Andrew Nguyen : gdi32: Fix the type of a few return values.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 4569eb2e668ec18536772d37f6ca2a91244fc8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4569eb2e668ec18536772d37f… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Aug 6 03:17:58 2009 -0500 gdi32: Fix the type of a few return values. --- dlls/gdi32/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 022fc2c..204fc2b 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -168,7 +168,7 @@ static HDC WINAPI wglGetPbufferDCARB(void *pbuffer) TRACE("(%p)\n", pbuffer); - if (!dc) return FALSE; + if (!dc) return 0; /* The display driver has to do the rest of the work because * we need access to lowlevel datatypes which we can't access here @@ -338,7 +338,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR func) /* Retrieve the global hDC to get access to the driver. */ dc = OPENGL_GetDefaultDC(); - if (!dc) return FALSE; + if (!dc) return NULL; if (!dc->funcs->pwglGetProcAddress) FIXME(" :stub\n"); else ret = dc->funcs->pwglGetProcAddress(func);

1 0

Maarten Lankhorst : winecfg: Hide basic and normal acceleration options by default.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 58f67036baa57d40250126309b16bbb2c8e800be URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f67036baa57d40250126309… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Aug 5 15:16:55 2009 +0200 winecfg: Hide basic and normal acceleration options by default. There's not really a good reason for them to be visible. The only options that are effective are emulation, which pipes through waveout and >= basic, which pipes through the accelerated path. --- programs/winecfg/audio.c | 63 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 44 insertions(+), 19 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 3abacb2..9f8a0a2 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -56,13 +56,14 @@ typedef DWORD (WINAPI * MessagePtr)(UINT, UINT, DWORD, DWORD, DWORD); static struct DSOUNDACCEL { UINT displayID; + UINT visible; const char* settingStr; -} const DSound_HW_Accels[] = { - {IDS_ACCEL_FULL, "Full"}, - {IDS_ACCEL_STANDARD, "Standard"}, - {IDS_ACCEL_BASIC, "Basic"}, - {IDS_ACCEL_EMULATION, "Emulation"}, - {0, 0} +} DSound_HW_Accels[] = { + {IDS_ACCEL_FULL, 1, "Full"}, + {IDS_ACCEL_STANDARD, 0, "Standard"}, + {IDS_ACCEL_BASIC, 0, "Basic"}, + {IDS_ACCEL_EMULATION, 1, "Emulation"}, + {0, 0, 0} }; static const char* DSound_Rates[] = { @@ -606,7 +607,7 @@ static void selectDriver(HWND hDlg, const char * driver) static void initAudioDlg (HWND hDlg) { - int i; + int i, j, found; char* buf = NULL; WINE_TRACE("\n"); @@ -637,20 +638,31 @@ static void initAudioDlg (HWND hDlg) initAudioDeviceTree(hDlg); SendDlgItemMessage(hDlg, IDC_DSOUND_HW_ACCEL, CB_RESETCONTENT, 0, 0); + buf = get_reg_key(config_key, keypath("DirectSound"), "HardwareAcceleration", "Full"); + + j = found = 0; for (i = 0; 0 != DSound_HW_Accels[i].displayID; ++i) { WCHAR accelStr[64]; - LoadStringW (GetModuleHandle (NULL), DSound_HW_Accels[i].displayID, accelStr, - sizeof(accelStr)/sizeof(accelStr[0])); - SendDlgItemMessageW (hDlg, IDC_DSOUND_HW_ACCEL, CB_ADDSTRING, 0, (LPARAM)accelStr); - } - buf = get_reg_key(config_key, keypath("DirectSound"), "HardwareAcceleration", "Full"); - for (i = 0; NULL != DSound_HW_Accels[i].settingStr; ++i) { - if (strcmp(buf, DSound_HW_Accels[i].settingStr) == 0) { - SendDlgItemMessage(hDlg, IDC_DSOUND_HW_ACCEL, CB_SETCURSEL, i, 0); - break ; + int match; + + match = (strcmp(buf, DSound_HW_Accels[i].settingStr) == 0); + if (match) + { + DSound_HW_Accels[i].visible = 1; + found = 1; + } + + if (DSound_HW_Accels[i].visible) + { + LoadStringW (GetModuleHandle (NULL), DSound_HW_Accels[i].displayID, + accelStr, sizeof(accelStr)/sizeof(accelStr[0])); + SendDlgItemMessageW (hDlg, IDC_DSOUND_HW_ACCEL, CB_ADDSTRING, 0, (LPARAM)accelStr); + if (match) + SendDlgItemMessage(hDlg, IDC_DSOUND_HW_ACCEL, CB_SETCURSEL, j, 0); + j++; } } - if (NULL == DSound_HW_Accels[i].settingStr) { + if (!found) { WINE_ERR("Invalid Direct Sound HW Accel read from registry (%s)\n", buf); } HeapFree(GetProcessHeap(), 0, buf); @@ -700,10 +712,23 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_DSOUND_HW_ACCEL: if (HIWORD(wParam) == CBN_SELCHANGE) { int selected_dsound_accel; + int i, j = 0; + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); selected_dsound_accel = SendDlgItemMessage(hDlg, IDC_DSOUND_HW_ACCEL, CB_GETCURSEL, 0, 0); - set_reg_key(config_key, keypath("DirectSound"), "HardwareAcceleration", - DSound_HW_Accels[selected_dsound_accel].settingStr); + for (i = 0; DSound_HW_Accels[i].settingStr; ++i) + { + if (DSound_HW_Accels[i].visible) + { + if (j == selected_dsound_accel) + { + set_reg_key(config_key, keypath("DirectSound"), "HardwareAcceleration", + DSound_HW_Accels[i].settingStr); + break; + } + j++; + } + } } break; case IDC_DSOUND_RATES:

1 0

Ken Sharp : gdiplus: Add GdipIsVisibleRectI stub.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: e072d36a87dd5afdcbf99b61299bb17e4406a466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e072d36a87dd5afdcbf99b612… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Thu Aug 6 08:45:39 2009 +0100 gdiplus: Add GdipIsVisibleRectI stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1727e30..8863c37 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -430,7 +430,7 @@ @ stdcall GdipIsVisiblePoint(ptr long long ptr) @ stdcall GdipIsVisiblePointI(ptr long long ptr) @ stub GdipIsVisibleRect -@ stub GdipIsVisibleRectI +@ stdcall GdipIsVisibleRectI(ptr long long long long ptr) @ stub GdipIsVisibleRegionPoint @ stdcall GdipIsVisibleRegionPointI(ptr long long ptr ptr) @ stub GdipIsVisibleRegionRect diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 642a22f..10799c7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4107,3 +4107,12 @@ GpStatus WINGDIPAPI GdipRecordMetafileI(HDC hdc, EmfType type, GDIPCONST GpRect FIXME("(%p %d %p %d %p %p): stub\n", hdc, type, frameRect, frameUnit, desc, metafile); return NotImplemented; } + +/***************************************************************************** + * GdipIsVisibleRectI [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT width, INT height, BOOL *result) +{ + FIXME("(%p %d %d %d %d %p): stub\n", graphics, x, y, width, height, result); + return NotImplemented; +}

1 0

Maarten Lankhorst : winecfg: Remove 'emulation' driver option.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 4e046a6759b059b3c424480bea052af01cc85ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e046a6759b059b3c424480be… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Aug 5 13:21:20 2009 +0200 winecfg: Remove 'emulation' driver option. --- programs/winecfg/Bg.rc | 19 +++++++++---------- programs/winecfg/Cs.rc | 19 +++++++++---------- programs/winecfg/Da.rc | 19 +++++++++---------- programs/winecfg/De.rc | 19 +++++++++---------- programs/winecfg/En.rc | 19 +++++++++---------- programs/winecfg/Es.rc | 19 +++++++++---------- programs/winecfg/Fi.rc | 19 +++++++++---------- programs/winecfg/Fr.rc | 19 +++++++++---------- programs/winecfg/Hu.rc | 19 +++++++++---------- programs/winecfg/It.rc | 19 +++++++++---------- programs/winecfg/Ja.rc | 19 +++++++++---------- programs/winecfg/Ko.rc | 19 +++++++++---------- programs/winecfg/Lt.rc | 19 +++++++++---------- programs/winecfg/Nl.rc | 19 +++++++++---------- programs/winecfg/No.rc | 19 +++++++++---------- programs/winecfg/Pl.rc | 19 +++++++++---------- programs/winecfg/Pt.rc | 19 +++++++++---------- programs/winecfg/Ro.rc | 19 +++++++++---------- programs/winecfg/Ru.rc | 19 +++++++++---------- programs/winecfg/Si.rc | 19 +++++++++---------- programs/winecfg/Sv.rc | 19 +++++++++---------- programs/winecfg/Tr.rc | 19 +++++++++---------- programs/winecfg/Zh.rc | 38 ++++++++++++++++++-------------------- programs/winecfg/audio.c | 15 --------------- programs/winecfg/resource.h | 1 - 25 files changed, 216 insertions(+), 256 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e046a6759b059b3c4244…

1 0

Maarten Lankhorst : msgsm32.acm: Also check for gsm/gsm.h.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: c186d8a337cf224afbd8e97bfedc61ff00d9b17d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c186d8a337cf224afbd8e97bf… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Aug 5 11:35:50 2009 +0200 msgsm32.acm: Also check for gsm/gsm.h. Some systems don't have a gsm.h, so try including gsm/gsm.h first --- configure | 6 ++++-- configure.ac | 5 +++-- dlls/msgsm32.acm/msgsm32.c | 4 +++- include/config.h.in | 3 +++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/configure b/configure index d467088..5402e55 100755 --- a/configure +++ b/configure @@ -2145,7 +2145,7 @@ fi # Check whether --with-libgsm was given. if test "${with_libgsm+set}" = set; then - withval=$with_libgsm; if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; fi + withval=$with_libgsm; if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi fi @@ -5750,6 +5750,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -5774,6 +5775,7 @@ for ac_header in \ getopt.h \ grp.h \ gsm.h \ + gsm/gsm.h \ ieeefp.h \ inet/mib2.h \ io.h \ @@ -16654,7 +16656,7 @@ esac fi -if test "$ac_cv_header_gsm_h" = "yes" +if test "$ac_cv_header_gsm_h" = "yes" -o "$ac_cv_header_gsm_gsm_h" = "yes" then { $as_echo "$as_me:$LINENO: checking for -lgsm" >&5 $as_echo_n "checking for -lgsm... " >&6; } diff --git a/configure.ac b/configure.ac index d8d0679..59b771c 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,7 @@ AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU librar [if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi]) AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)])) AC_ARG_WITH(libgsm, AS_HELP_STRING([--without-libgsm],[do not use libgsm (GSM 06.10 codec support)]), - [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; fi]) + [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi]) AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) AC_ARG_WITH(jack, AS_HELP_STRING([--without-jack],[do not use the Jack sound support]), [if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi]) @@ -289,6 +289,7 @@ AC_CHECK_HEADERS(\ getopt.h \ grp.h \ gsm.h \ + gsm/gsm.h \ ieeefp.h \ inet/mib2.h \ io.h \ @@ -1342,7 +1343,7 @@ WINE_WARNING_WITH(openssl,[test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_s [OpenSSL ${notice_platform}development files not found, SSL won't be supported.]) dnl **** Check for gsm codec **** -if test "$ac_cv_header_gsm_h" = "yes" +if test "$ac_cv_header_gsm_h" = "yes" -o "$ac_cv_header_gsm_gsm_h" = "yes" then WINE_CHECK_SONAME(gsm,gsm_create) fi diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 6ad28fb..ad86bc1 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -27,7 +27,9 @@ #include <stdarg.h> #include <string.h> -#ifdef HAVE_GSM_H +#ifdef HAVE_GSM_GSM_H +#include <gsm/gsm.h> +#elif defined(HAVE_GSM_H) #include <gsm.h> #endif diff --git a/include/config.h.in b/include/config.h.in index 34de7d9..7648aae 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -234,6 +234,9 @@ /* Define to 1 if you have the <grp.h> header file. */ #undef HAVE_GRP_H +/* Define to 1 if you have the <gsm/gsm.h> header file. */ +#undef HAVE_GSM_GSM_H + /* Define to 1 if you have the <gsm.h> header file. */ #undef HAVE_GSM_H

1 0

Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: bc1f3f4c95dec2acb406f79055d4c03313a3002b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc1f3f4c95dec2acb406f7905… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Aug 6 08:40:28 2009 +0300 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index b2289db..de0037e 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -33,6 +33,7 @@ STRINGTABLE DISCARDABLE IDS_SEMICOLON "Tikėtasi „;“" IDS_LBRACKET "Tikėtasi „(“" IDS_RBRACKET "Tikėtasi „)“" + IDS_UNTERMINATED_STR "Nebaigta eilutės konstanta" IDS_NOT_FUNC "Tikėtasi funkcijos" IDS_NOT_DATE "„[objektas]“ nėra datos objektas" IDS_NOT_NUM "Tikėtasi skaičiaus"

1 0

Piotr Caban : jscript: Added JSGlobal_parseFloat implementation.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 3edf1ba22faf722051861c8d27d41a19bb40804c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3edf1ba22faf722051861c8d2… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 5 23:27:52 2009 +0200 jscript: Added JSGlobal_parseFloat implementation. --- dlls/jscript/global.c | 102 ++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 10 ++++ 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 7d59e19..ff3510f 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -20,6 +20,7 @@ #include "wine/port.h" #include <math.h> +#include <limits.h> #include "jscript.h" #include "engine.h" @@ -28,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +#define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff) + static const WCHAR NaNW[] = {'N','a','N',0}; static const WCHAR InfinityW[] = {'I','n','f','i','n','i','t','y',0}; static const WCHAR ArrayW[] = {'A','r','r','a','y',0}; @@ -474,8 +477,103 @@ static HRESULT JSGlobal_parseInt(DispatchEx *dispex, LCID lcid, WORD flags, DISP static HRESULT JSGlobal_parseFloat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + LONGLONG d = 0, hlp; + int exp = 0, length; + VARIANT *arg; + WCHAR *str; + BSTR val_str = NULL; + BOOL ret_nan = TRUE, positive = TRUE; + HRESULT hres; + + if(!arg_cnt(dp)) { + if(retv) + num_set_nan(retv); + return S_OK; + } + + arg = get_arg(dp, 0); + hres = to_string(dispex->ctx, arg, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); + + while(isspaceW(*str)) str++; + + if(*str == '+') + str++; + else if(*str == '-') { + positive = FALSE; + str++; + } + + if(isdigitW(*str)) + ret_nan = FALSE; + + while(isdigitW(*str)) { + hlp = d*10 + *(str++) - '0'; + if(d>LONGLONG_MAX/10 || hlp<0) { + exp++; + break; + } + else + d = hlp; + } + while(isdigitW(*str)) { + exp++; + str++; + } + + if(*str == '.') str++; + + if(isdigitW(*str)) + ret_nan = FALSE; + + while(isdigitW(*str)) { + hlp = d*10 + *(str++) - '0'; + if(d>LONGLONG_MAX/10 || hlp<0) + break; + + d = hlp; + exp--; + } + while(isdigitW(*str)) + str++; + + if(*str && !ret_nan && (*str=='e' || *str=='E')) { + int sign = 1, e = 0; + + str++; + if(*str == '+') + str++; + else if(*str == '-') { + sign = -1; + str++; + } + + while(isdigitW(*str)) { + if(e>INT_MAX/10 || (e = e*10 + *str++ - '0')<0) + e = INT_MAX; + } + e *= sign; + + if(exp<0 && e<0 && exp+e>0) exp = INT_MIN; + else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; + else exp += e; + } + + SysFreeString(val_str); + + if(ret_nan) { + if(retv) + num_set_nan(retv); + return S_OK; + } + + V_VT(retv) = VT_R8; + V_R8(retv) = (double)(positive?d:-d)*pow(10, exp); + return S_OK; } static HRESULT JSGlobal_unescape(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 66fea75..15b4b57 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -627,6 +627,16 @@ for(i=2; i<10; i++) { ok((0).toString(i) === "0", "(0).toString("+i+") = " + (0).toString(i)); } +ok(parseFloat('123') === 123, "parseFloat('123') = " + parseFloat('123')); +ok(parseFloat('-13.7') === -13.7, "parseFloat('-13.7') = " + parseFloat('-13.7')); +ok(parseFloat('-0.01e-2') === -0.01e-2, "parseFloat('-0.01e-2') = " + parseFloat('-0.01e-2')); +ok(parseFloat('-12e+5') === -12e+5, "parseFloat('-12e+5') = " + parseFloat('-12e+5')); +ok(parseFloat('1E5 not parsed') === 1E5, "parseFloat('1E5 not parsed') = " + parseFloat('1E5 not parsed')); +ok(isNaN(parseFloat('not a number')), "parseFloat('not a number') is not NaN"); +ok(parseFloat('+13.2e-3') === 13.2e-3, "parseFloat('+13.2e-3') = " + parseFloat('+13.2e-3')); +ok(parseFloat('.12') === 0.12, "parseFloat('.12') = " + parseFloat('.12')); +ok(parseFloat('1e') === 1, "parseFloat('1e') = " + parseFloat('1e')); + tmp = Math.min(1); ok(tmp === 1, "Math.min(1) = " + tmp);

1 0

Piotr Caban : jscript: Make compare2_values working with NULL BSTR's.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 9d23f8a771a0a4b31784bfdfff6da948a490812a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d23f8a771a0a4b31784bfdff… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 5 23:27:31 2009 +0200 jscript: Make compare2_values working with NULL BSTR's. --- dlls/jscript/engine.c | 7 ++++++- dlls/jscript/tests/lang.js | 2 ++ dlls/jscript/tests/run.c | 12 ++++++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ff5e6a8..f120cc6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -304,7 +304,12 @@ static HRESULT equal2_values(VARIANT *lval, VARIANT *rval, BOOL *ret) *ret = V_R8(lval) == V_R8(rval); break; case VT_BSTR: - *ret = !strcmpW(V_BSTR(lval), V_BSTR(rval)); + if(!V_BSTR(lval)) + *ret = SysStringLen(V_BSTR(rval))?FALSE:TRUE; + else if(!V_BSTR(rval)) + *ret = SysStringLen(V_BSTR(lval))?FALSE:TRUE; + else + *ret = !strcmpW(V_BSTR(lval), V_BSTR(rval)); break; case VT_DISPATCH: return disp_cmp(V_DISPATCH(lval), V_DISPATCH(rval), ret); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index a9e0459..8150d65 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -896,4 +896,6 @@ ok(""+str === "test", "''+str = " + str); ok((function (){return 1;})() === 1, "(function (){return 1;})() = " + (function (){return 1;})()); +ok(createNullBSTR() === '', "createNullBSTR() !== ''"); + reportSuccess(); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index a1fe3b6..ffbbde3 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -73,6 +73,7 @@ DEFINE_EXPECT(GetItemInfo_testVal); #define DISPID_GLOBAL_OK 0x1004 #define DISPID_GLOBAL_GETVT 0x1005 #define DISPID_GLOBAL_TESTOBJ 0x1006 +#define DISPID_GLOBAL_NULL_BSTR 0x1007 static const WCHAR testW[] = {'t','e','s','t',0}; static const CHAR testA[] = "test"; @@ -283,6 +284,10 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTOBJ; return S_OK; } + if(!strcmp_wa(bstrName, "createNullBSTR")) { + *pid = DISPID_GLOBAL_NULL_BSTR; + return S_OK; + } if(strict_dispid_check) ok(0, "unexpected call %s\n", debugstr_w(bstrName)); @@ -429,6 +434,13 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(pvarRes) = VT_DISPATCH; V_DISPATCH(pvarRes) = (IDispatch*)&testObj; return S_OK; + + case DISPID_GLOBAL_NULL_BSTR: + if(pvarRes) { + V_VT(pvarRes) = VT_BSTR; + V_BSTR(pvarRes) = NULL; + } + return S_OK; } ok(0, "unexpected call %x\n", id);

1 0

Piotr Caban : jscript: Added 'unterminated string' error.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: ec25138a4695fc788577561defa7224358d129fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec25138a4695fc788577561de… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 5 23:27:09 2009 +0200 jscript: Added 'unterminated string' error. --- dlls/jscript/engine.h | 1 + dlls/jscript/jscript_En.rc | 1 + dlls/jscript/lex.c | 9 ++++----- dlls/jscript/parser.y | 3 ++- dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index f1a78ec..8d53f00 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -56,6 +56,7 @@ typedef struct _parser_ctx_t { source_elements_t *source; BOOL nl; BOOL is_html; + BOOL lexer_error; HRESULT hres; jsheap_t heap; diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index b47e951..697c1ab 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -30,6 +30,7 @@ STRINGTABLE DISCARDABLE IDS_SEMICOLON "Expected ';'" IDS_LBRACKET "Expected '('" IDS_RBRACKET "Expected ')'" + IDS_UNTERMINATED_STR "Unterminated string constant" IDS_NOT_FUNC "Function expected" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_NUM "Number expected" diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 5b7e7a4..eb9b835 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -100,7 +100,8 @@ static const struct { static int lex_error(parser_ctx_t *ctx, HRESULT hres) { - ctx->hres = hres; + ctx->hres = JSCRIPT_ERROR|hres; + ctx->lexer_error = TRUE; return -1; } @@ -342,10 +343,8 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret, WCHAR endc ctx->ptr++; } - if(ctx->ptr == ctx->end) { - WARN("unexpected end of file\n"); - return lex_error(ctx, E_FAIL); - } + if(ctx->ptr == ctx->end) + return lex_error(ctx, IDS_UNTERMINATED_STR); len = ctx->ptr-ptr; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index a0ae471..29d805f 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1577,7 +1577,8 @@ static void program_parsed(parser_ctx_t *ctx, source_elements_t *source) pop_func(ctx); ctx->source = source; - ctx->hres = S_OK; + if(!ctx->lexer_error) + ctx->hres = S_OK; } void parser_release(parser_ctx_t *ctx) diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 0503961..f7e94b9 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -26,6 +26,7 @@ #define IDS_SEMICOLON 0x03EC #define IDS_LBRACKET 0x03ED #define IDS_RBRACKET 0x03EE +#define IDS_UNTERMINATED_STR 0x03F7 #define IDS_NOT_FUNC 0x138A #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 53b7f92..66fea75 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1333,5 +1333,6 @@ exception_test(function() {eval("for(i=0")}, "SyntaxError", -2146827284); exception_test(function() {eval("for(i=0;i<10")}, "SyntaxError", -2146827284); exception_test(function() {eval("while(")}, "SyntaxError", -2146827286); exception_test(function() {eval("if(")}, "SyntaxError", -2146827286); +exception_test(function() {eval("'unterminated")}, "SyntaxError", -2146827273); reportSuccess();

1 0

Juan Lang : secur32: Implement QueryContextAttributes for SECPKG_ATTR_REMOTE_CERT_CONTEXT.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 5ee34ea870cbe1bf828c0c5a30a646d5cd776b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ee34ea870cbe1bf828c0c5a3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 5 10:43:57 2009 -0700 secur32: Implement QueryContextAttributes for SECPKG_ATTR_REMOTE_CERT_CONTEXT. --- dlls/secur32/schannel.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index b9644e3..dc4f3b3 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -48,6 +48,7 @@ MAKE_FUNCPTR(gnutls_alert_get); MAKE_FUNCPTR(gnutls_alert_get_name); MAKE_FUNCPTR(gnutls_certificate_allocate_credentials); MAKE_FUNCPTR(gnutls_certificate_free_credentials); +MAKE_FUNCPTR(gnutls_certificate_get_peers); MAKE_FUNCPTR(gnutls_cipher_get); MAKE_FUNCPTR(gnutls_credentials_set); MAKE_FUNCPTR(gnutls_deinit); @@ -873,6 +874,27 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( stream_sizes->cbBlockSize = block_size; return SEC_E_OK; } + case SECPKG_ATTR_REMOTE_CERT_CONTEXT: + { + unsigned int list_size; + const gnutls_datum_t *datum = pgnutls_certificate_get_peers( + ctx->session, &list_size); + + datum = pgnutls_certificate_get_peers(ctx->session, &list_size); + if (datum) + { + PCCERT_CONTEXT *cert = buffer; + + *cert = CertCreateCertificateContext(X509_ASN_ENCODING, + datum->data, datum->size); + if (!*cert) + return GetLastError(); + else + return SEC_E_OK; + } + else + return SEC_E_INTERNAL_ERROR; + } default: FIXME("Unhandled attribute %#x\n", attribute); @@ -890,6 +912,8 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA( { case SECPKG_ATTR_STREAM_SIZES: return schan_QueryContextAttributesW(context_handle, attribute, buffer); + case SECPKG_ATTR_REMOTE_CERT_CONTEXT: + return schan_QueryContextAttributesW(context_handle, attribute, buffer); default: FIXME("Unhandled attribute %#x\n", attribute); @@ -1222,6 +1246,7 @@ void SECUR32_initSchannelSP(void) LOAD_FUNCPTR(gnutls_alert_get_name) LOAD_FUNCPTR(gnutls_certificate_allocate_credentials) LOAD_FUNCPTR(gnutls_certificate_free_credentials) + LOAD_FUNCPTR(gnutls_certificate_get_peers) LOAD_FUNCPTR(gnutls_cipher_get) LOAD_FUNCPTR(gnutls_credentials_set) LOAD_FUNCPTR(gnutls_deinit)

1 0