September 2008 - Wine-commits

Jacek Caban : jscript: Added String.replace implementation.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: e0413ddfe598278df78519c5a79bd7689c045fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0413ddfe598278df78519c5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 00:53:29 2008 +0200 jscript: Added String.replace implementation. --- dlls/jscript/jscript.h | 2 + dlls/jscript/regexp.c | 18 +++ dlls/jscript/string.c | 258 +++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 23 ++++ dlls/jscript/tests/regexp.js | 73 ++++++++++++- 5 files changed, 369 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0413ddfe598278df7851…

1 0

Jacek Caban : jscript: Split regexp_match function.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: b4796499e7bf6da2489eaf1c97c26a037053c494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4796499e7bf6da2489eaf1c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 00:52:56 2008 +0200 jscript: Split regexp_match function. --- dlls/jscript/regexp.c | 119 +++++++++++++++++++++++++++++++----------------- 1 files changed, 77 insertions(+), 42 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index e811e48..38164f8 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3297,66 +3297,101 @@ out: return re; } +static HRESULT do_regexp_match_next(RegExpInstance *regexp, const WCHAR *str, DWORD len, + const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) +{ + REMatchState *x, *result; + REGlobalData gData; + DWORD matchlen; + + gData.cpbegin = *cp; + gData.cpend = str + len; + gData.start = *cp-str; + gData.skipped = 0; + gData.pool = &regexp->dispex.ctx->tmp_heap; + + x = InitMatch(NULL, &gData, regexp->jsregexp, gData.cpend - gData.cpbegin); + if(!x) { + WARN("InitMatch failed\n"); + return E_FAIL; + } + + x->cp = *cp; + result = MatchRegExp(&gData, x); + if(!gData.ok) { + WARN("MatchRegExp failed\n"); + return E_FAIL; + } + + if(!result) + return S_FALSE; + + if(parens) { + DWORD i; + + if(regexp->jsregexp->parenCount > *parens_size) { + match_result_t *new_parens; + + if(*parens) + new_parens = heap_realloc(*parens, sizeof(match_result_t)*regexp->jsregexp->parenCount); + else + new_parens = heap_alloc(sizeof(match_result_t)*regexp->jsregexp->parenCount); + if(!new_parens) + return E_OUTOFMEMORY; + + *parens = new_parens; + } + + *parens_cnt = regexp->jsregexp->parenCount; + + for(i=0; i < regexp->jsregexp->parenCount; i++) { + (*parens)[i].str = *cp + result->parens[i].index; + (*parens)[i].len = result->parens[i].length; + } + } + + matchlen = (result->cp-*cp) - gData.skipped; + *cp = result->cp; + ret->str = result->cp-matchlen; + ret->len = matchlen; + + return S_OK; +} + HRESULT regexp_match(DispatchEx *dispex, const WCHAR *str, DWORD len, BOOL gflag, match_result_t **match_result, DWORD *result_cnt) { RegExpInstance *This = (RegExpInstance*)dispex; - match_result_t *ret = NULL; + match_result_t *ret = NULL, cres; const WCHAR *cp = str; - REGlobalData gData; - REMatchState *x, *result; - DWORD matchlen; DWORD i=0, ret_size = 0; jsheap_t *mark; - size_t length; - HRESULT hres = E_FAIL; - - length = len; + HRESULT hres; mark = jsheap_mark(&This->dispex.ctx->tmp_heap); - gData.pool = &This->dispex.ctx->tmp_heap; while(1) { - gData.cpbegin = cp; - gData.cpend = str + len; - gData.start = cp-str; - gData.skipped = 0; - - x = InitMatch(NULL, &gData, This->jsregexp, length); - if(!x) { - WARN("InitMatch failed\n"); - break; - } - - x->cp = cp; - result = MatchRegExp(&gData, x); - if(!gData.ok) { - WARN("MatchRegExp failed\n"); - break; - } - - if(!result) { + hres = do_regexp_match_next(This, str, len, &cp, NULL, NULL, NULL, &cres); + if(hres == S_FALSE) { hres = S_OK; break; } - matchlen = (result->cp-cp) - gData.skipped; + if(FAILED(hres)) + return hres; - if(ret) - ret = heap_realloc(ret, (ret_size <<= 1) * sizeof(match_result_t)); - else if(ret_size == i) - ret = heap_alloc((ret_size=4) * sizeof(match_result_t)); - if(!ret) { - hres = E_OUTOFMEMORY; - break; + if(ret_size == i) { + if(ret) + ret = heap_realloc(ret, (ret_size <<= 1) * sizeof(match_result_t)); + else + ret = heap_alloc((ret_size=4) * sizeof(match_result_t)); + if(!ret) { + hres = E_OUTOFMEMORY; + break; + } } - ret[i].str = result->cp-matchlen; - ret[i].len = matchlen; - - length -= result->cp-cp; - cp = result->cp; - i++; + ret[i++] = cres; if(!gflag && !(This->jsregexp->flags & JSREG_GLOB)) { hres = S_OK;

1 0

Christian Costa : d3dxof: Implement IDirectXFileDataReference.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 8597d42cf5f3fe194bd88ccb7ff922e547c44e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8597d42cf5f3fe194bd88ccb7… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Sep 24 22:38:29 2008 +0200 d3dxof: Implement IDirectXFileDataReference. --- dlls/d3dxof/d3dxof.c | 84 ++++++++++++++++++++++++++++++++++++------ dlls/d3dxof/d3dxof_private.h | 4 ++ include/dxfile.h | 2 +- 3 files changed, 77 insertions(+), 13 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 706662d..a4801f5 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1403,21 +1403,37 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface { HRESULT hr; IDirectXFileDataImpl *This = (IDirectXFileDataImpl *)iface; - IDirectXFileDataImpl *object; TRACE("(%p/%p)->(%p)\n", This, iface, ppChildObj); if (This->cur_enum_object >= This->pobj->nb_childs) return DXFILEERR_NOMOREOBJECTS; - hr = IDirectXFileDataImpl_Create(&object); - if (hr != S_OK) - return DXFILEERR_BADVALUE; + if (This->pobj->childs[This->cur_enum_object]->ptarget) + { + IDirectXFileDataReferenceImpl *object; - object->pobj = This->pobj->childs[This->cur_enum_object++]; - object->cur_enum_object = 0; + hr = IDirectXFileDataReferenceImpl_Create(&object); + if (hr != S_OK) + return DXFILEERR_BADVALUE; + + object->ptarget = This->pobj->childs[This->cur_enum_object++]->ptarget; + + *ppChildObj = (LPDIRECTXFILEOBJECT)object; + } + else + { + IDirectXFileDataImpl *object; + + hr = IDirectXFileDataImpl_Create(&object); + if (hr != S_OK) + return DXFILEERR_BADVALUE; - *ppChildObj = (LPDIRECTXFILEOBJECT)object; + object->pobj = This->pobj->childs[This->cur_enum_object++]; + object->cur_enum_object = 0; + + *ppChildObj = (LPDIRECTXFILEOBJECT)object; + } return DXFILE_OK; } @@ -1532,7 +1548,12 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetName(IDirectXFileDataRefe { IDirectXFileDataReferenceImpl *This = (IDirectXFileDataReferenceImpl *)iface; - FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pstrNameBuf, pdwBufLen); + TRACE("(%p/%p)->(%p,%p)\n", This, iface, pstrNameBuf, pdwBufLen); + + if (!pstrNameBuf) + return DXFILEERR_BADVALUE; + + strcpy(pstrNameBuf, This->ptarget->name); return DXFILEERR_BADVALUE; } @@ -1541,19 +1562,38 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetId(IDirectXFileDataRefere { IDirectXFileDataReferenceImpl *This = (IDirectXFileDataReferenceImpl *)iface; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pGuid); + TRACE("(%p/%p)->(%p)\n", This, iface, pGuid); - return DXFILEERR_BADVALUE; + if (!pGuid) + return DXFILEERR_BADVALUE; + + memcpy(pGuid, &This->ptarget->class_id, 16); + + return DXFILE_OK; } /*** IDirectXFileDataReference ***/ static HRESULT WINAPI IDirectXFileDataReferenceImpl_Resolve(IDirectXFileDataReference* iface, LPDIRECTXFILEDATA* ppDataObj) { IDirectXFileDataReferenceImpl *This = (IDirectXFileDataReferenceImpl *)iface; + IDirectXFileDataImpl *object; + HRESULT hr; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppDataObj); + TRACE("(%p/%p)->(%p)\n", This, iface, ppDataObj); - return DXFILEERR_BADVALUE; + if (!ppDataObj) + return DXFILEERR_BADVALUE; + + hr = IDirectXFileDataImpl_Create(&object); + if (hr != S_OK) + return DXFILEERR_BADVALUE; + + object->pobj = This->ptarget; + object->cur_enum_object = 0; + + *ppDataObj = (LPDIRECTXFILEDATA)object; + + return DXFILE_OK; } static const IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl = @@ -1784,11 +1824,26 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) { if (check_TOKEN(buf) == TOKEN_OBRACE) { + int i; get_TOKEN(buf); if (get_TOKEN(buf) != TOKEN_NAME) return FALSE; if (get_TOKEN(buf) != TOKEN_CBRACE) return FALSE; + TRACE("Found optional reference %s\n", (char*)buf->value); + for (i = 0; i < buf->nb_pxo_globals; i++) + { + if (!strcmp(buf->pxo_globals[i*MAX_SUBOBJECTS].name, (char*)buf->value)) + break; + } + if (i == buf->nb_pxo_globals) + { + ERR("Reference to unknown object %s\n", (char*)buf->value); + return FALSE; + } + buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->cur_subobject++]; + buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &buf->pxo_globals[i*MAX_SUBOBJECTS]; + buf->pxo->nb_childs++; } else if (check_TOKEN(buf) == TOKEN_NAME) { @@ -1819,6 +1874,7 @@ static BOOL parse_object(parse_buffer * buf) int i; buf->pxo->pdata = buf->cur_pdata; + buf->pxo->ptarget = NULL; if (get_TOKEN(buf) != TOKEN_NAME) return FALSE; @@ -1892,6 +1948,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE if (!SUCCEEDED(hr)) return hr; + This->buf.pxo_globals = &This->xobjects[0][0]; + This->buf.nb_pxo_globals = This->nb_xobjects; This->buf.pxo_tab = &This->xobjects[This->nb_xobjects][0]; This->buf.cur_subobject = 0; This->buf.pxo = &This->buf.pxo_tab[This->buf.cur_subobject++]; @@ -1917,6 +1975,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE *ppDataObj = (LPDIRECTXFILEDATA)object; + This->nb_xobjects++; + return DXFILE_OK; } diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 14542f2..99bec1c 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -67,6 +67,7 @@ typedef struct { } xobject_member; struct _xobject { + struct _xobject* ptarget; char name[MAX_NAME_LEN]; GUID class_id; GUID type; @@ -102,6 +103,7 @@ typedef struct { typedef struct { IDirectXFileDataReference lpVtbl; LONG ref; + xobject* ptarget; } IDirectXFileDataReferenceImpl; typedef struct { @@ -120,6 +122,8 @@ typedef struct { ULONG cur_subobject; LPBYTE cur_pdata; BYTE value[100]; + xobject* pxo_globals; + ULONG nb_pxo_globals; xobject* pxo_tab; IDirectXFileImpl* pdxf; xobject* pxo; diff --git a/include/dxfile.h b/include/dxfile.h index b0adceb..9eab71a 100644 --- a/include/dxfile.h +++ b/include/dxfile.h @@ -214,7 +214,7 @@ DECLARE_INTERFACE_(IDirectXFileDataReference,IDirectXFileObject) #define IDirectXFileDataReference_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) #define IDirectXFileDataReference_GetId(p,a) (p)->lpVtbl->GetId(p,a) /*** IDirectXFileDataReference methods ***/ -#define IDirectXFileDataReference_Resolve(p,a) (p)->lpVtbl->GetData(p,a) +#define IDirectXFileDataReference_Resolve(p,a) (p)->lpVtbl->Resolve(p,a) #endif #define INTERFACE IDirectXFileBinary

1 0

Jacek Caban : jscript: Added VT_R8 to string conversion implementation.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 53040deefd78575dfa1ce2bdc989038ce6b7a07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=53040deefd78575dfa1ce2bdc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 00:50:49 2008 +0200 jscript: Added VT_R8 to string conversion implementation. --- dlls/jscript/jsutils.c | 12 ++++++++++++ dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index cd7fa57..422076e 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -441,6 +441,18 @@ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) case VT_I4: *str = int_to_bstr(V_I4(v)); break; + case VT_R8: { + VARIANT strv; + HRESULT hres; + + V_VT(&strv) = VT_EMPTY; + hres = VariantChangeType(&strv, v, 0, VT_BSTR); + if(FAILED(hres)) + return hres; + + *str = V_BSTR(&strv); + return S_OK; + } case VT_BSTR: *str = SysAllocString(V_BSTR(v)); break; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index dbe714d..63c8bc0 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -366,6 +366,8 @@ ok("" + null === "null", "\"\" + null !== \"null\""); ok("" + undefined === "undefined", "\"\" + undefined !== \"undefined\""); ok("" + true === "true", "\"\" + true !== \"true\""); ok("" + false === "false", "\"\" + false !== \"false\""); +ok("" + 0.5 === "0.5", "'' + 0.5 = " + 0.5); +ok("" + (-0.5432) === "-0.5432", "'' + (-0.5432) = " + (-0.5432)); ok(1 < 3.4, "1 < 3.4 failed"); ok(!(3.4 < 1), "3.4 < 1");

1 0

Jacek Caban : jscript: Added Number default value implementation.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 5b3630ec7b75b329e255d29ce50a0a19b93ace1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3630ec7b75b329e255d29ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 00:51:21 2008 +0200 jscript: Added Number default value implementation. --- dlls/jscript/number.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 4ace40b..974d309 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -133,8 +133,19 @@ static HRESULT Number_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, D static HRESULT Number_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + NumberInstance *number = (NumberInstance*)dispex; + + switch(flags) { + case DISPATCH_PROPERTYGET: + *retv = number->num; + break; + + default: + FIXME("flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static const builtin_prop_t Number_props[] = {

1 0

Jacek Caban : jscript: Added object to number conversion implementation.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 136f7933c65bd5ef87de12083cf4a631ed07e58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=136f7933c65bd5ef87de12083… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 00:52:10 2008 +0200 jscript: Added object to number conversion implementation. --- dlls/jscript/jsutils.c | 12 ++++++++++++ dlls/jscript/tests/lang.js | 5 +++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 422076e..32b877b 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -335,6 +335,18 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) break; case VT_BSTR: return str_to_number(V_BSTR(v), ret); + case VT_DISPATCH: { + VARIANT prim; + HRESULT hres; + + hres = to_primitive(ctx, v, ei, &prim); + if(FAILED(hres)) + return hres; + + hres = to_number(ctx, &prim, ei, ret); + VariantClear(&prim); + return hres; + } case VT_BOOL: V_VT(ret) = VT_I4; V_I4(ret) = V_BOOL(v) ? 1 : 0; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 63c8bc0..9bbdafe 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -359,6 +359,11 @@ ok(+"-3" === -3, "+'-3' !== -3"); ok(+"0xff" === 255, "+'0xff' !== 255"); ok(+"3e3" === 3000, "+'3e3' !== 3000"); +tmp = new Number(1); +ok(+tmp === 1, "ToNumber(new Number(1)) = " + (+tmp)); +tmp = new String("1"); +ok(+tmp === 1, "ToNumber(new String('1')) = " + (+tmp)); + ok("" + 0 === "0", "\"\" + 0 !== \"0\""); ok("" + 123 === "123", "\"\" + 123 !== \"123\""); ok("" + (-5) === "-5", "\"\" + (-5) !== \"-5\"");

1 0

Alexandre Julliard : user32/tests: Fix the listbox tests on Win9x and NT4.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: e0e91cf7f42245abebb23d11b33861cc399b8922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e91cf7f42245abebb23d11b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 24 15:39:03 2008 +0200 user32/tests: Fix the listbox tests on Win9x and NT4. --- dlls/user32/tests/listbox.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index ff216aa..6d4050f 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -44,7 +44,7 @@ static const char * const strings[4] = { "Fourth added which is very long because at some time we only had a 256 byte character buffer and that was overflowing in one of those applications that had a common dialog file open box and tried to add a 300 characters long custom filter string which of course the code did not like and crashed. Just make sure this string is longer than 256 characters." }; -static const char BAD_EXTENSION[] = "*.txtbad"; +static const char BAD_EXTENSION[] = "*.badtxt"; static HWND create_listbox (DWORD add_style, HWND parent) @@ -458,18 +458,18 @@ static void test_itemfrompoint(void) HWND hList = CreateWindow( "ListBox", "list test", WS_VISIBLE|WS_POPUP|LBS_NOINTEGRALHEIGHT, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); - LONG r, id; + ULONG r, id; RECT rc; - /* For an empty listbox win2k returns 0x1ffff, win98 returns 0x10000 */ + /* For an empty listbox win2k returns 0x1ffff, win98 returns 0x10000, nt4 returns 0xffffffff */ r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); - ok( r == 0x1ffff || r == 0x10000, "ret %x\n", r ); + ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 700, 30 )); - ok( r == 0x1ffff || r == 0x10000, "ret %x\n", r ); + ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 30, 300 )); - ok( r == 0x1ffff || r == 0x10000, "ret %x\n", r ); + ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); ok( id == 0, "item id wrong\n"); @@ -480,7 +480,8 @@ static void test_itemfrompoint(void) ok( r == 0x1, "ret %x\n", r ); r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 601 )); - ok( r == 0x10001, "ret %x\n", r ); + ok( r == 0x10001 || broken(r == 1), /* nt4 */ + "ret %x\n", r ); /* Resize control so that below assertions about sizes are valid */ r = SendMessage( hList, LB_GETITEMRECT, 0, (LPARAM)&rc); @@ -517,16 +518,20 @@ static void test_itemfrompoint(void) ok( r == 1, "ret %x\n", r); r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(1000, 10) ); - ok( r == 0x10001, "ret %x\n", r ); + ok( r == 0x10001 || broken(r == 1), /* nt4 */ + "ret %x\n", r ); r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, -10) ); - ok( r == 0x10001, "ret %x\n", r ); + ok( r == 0x10001 || broken(r == 1), /* nt4 */ + "ret %x\n", r ); r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, 100) ); - ok( r == 0x10005, "item %x\n", r ); + ok( r == 0x10005 || broken(r == 5), /* nt4 */ + "item %x\n", r ); r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, 200) ); - ok( r == 0x10005, "item %x\n", r ); + ok( r == 0x10005 || broken(r == 5), /* nt4 */ + "item %x\n", r ); DestroyWindow( hList ); } @@ -585,6 +590,11 @@ static void test_listbox_LB_DIR() strcpy(pathBuffer, "*"); SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, 0, (LPARAM)pathBuffer); + if (res == -1) /* "*" wildcard doesn't work on win9x */ + { + strcpy(pathBuffer, "*.*"); + res = SendMessage(hList, LB_DIR, 0, (LPARAM)pathBuffer); + } ok (res >= 0, "SendMessage(LB_DIR, 0, *) failed - 0x%08x\n", GetLastError()); /* There should be some content in the listbox */ @@ -640,6 +650,11 @@ static void test_listbox_LB_DIR() strcpy(pathBuffer, "*"); SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); + if (res == -1) /* "*" wildcard doesn't work on win9x */ + { + strcpy(pathBuffer, "*.*"); + res = SendMessage(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); + } ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY, *) failed - 0x%08x\n", GetLastError()); /* There should be some content in the listbox.

1 0

Alexandre Julliard : user32/tests: Fix some input test failures.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: 6345c938b22b249c772f93ded986bff9185d21a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6345c938b22b249c772f93ded… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 24 15:37:38 2008 +0200 user32/tests: Fix some input test failures. --- dlls/user32/tests/input.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 2a26447..aac6d61 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -371,6 +371,7 @@ static void empty_message_queue(void) { struct transition_s { WORD wVk; BYTE before_state; + BYTE optional; }; typedef enum { @@ -448,11 +449,12 @@ struct sendinput_test_s { /* test L-SHIFT & R-SHIFT: */ /* RSHIFT == LSHIFT */ {VK_RSHIFT, 0, 0, - {{VK_SHIFT, 0x00}, {VK_LSHIFT, 0x00}, {0}}, + /* recent windows versions (>= w2k3) correctly report an RSHIFT transition */ + {{VK_SHIFT, 0x00}, {VK_LSHIFT, 0x00, TRUE}, {VK_RSHIFT, 0x00, TRUE}, {0}}, {{WM_KEYDOWN, hook|wparam, VK_RSHIFT}, {WM_KEYDOWN}, {0}}}, {VK_RSHIFT, KEYEVENTF_KEYUP, 0, - {{VK_SHIFT, 0x80}, {VK_LSHIFT, 0x80}, {0}}, + {{VK_SHIFT, 0x80}, {VK_LSHIFT, 0x80, TRUE}, {VK_RSHIFT, 0x80, TRUE}, {0}}, {{WM_KEYUP, hook, hook|wparam, VK_RSHIFT}, {WM_KEYUP}, {0}}}, @@ -643,7 +645,7 @@ static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, struct sendinput_tes ~t->before_state&0x80); } } else { - ok(matched, "%02d: %02x from %02x -> %02x " + ok(matched || t->optional, "%02d: %02x from %02x -> %02x " "instead of %02x -> %02x\n", id, t->wVk, ks1[t->wVk]&0x80, ks2[t->wVk]&0x80, t->before_state, ~t->before_state&0x80); @@ -1008,19 +1010,19 @@ static void test_GetMouseMovePointsEx(void) SetLastError(MYERROR); retval = pGetMouseMovePointsEx(0, &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); - ok(ERROR_INVALID_PARAMETER == GetLastError(), + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); SetLastError(MYERROR); retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT)-1, &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); - ok(ERROR_INVALID_PARAMETER == GetLastError(), + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); SetLastError(MYERROR); retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT)+1, &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); - ok(ERROR_INVALID_PARAMETER == GetLastError(), + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); /* test second and third parameter @@ -1028,7 +1030,7 @@ static void test_GetMouseMovePointsEx(void) SetLastError(MYERROR); retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), NULL, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); - ok(ERROR_NOACCESS == GetLastError(), + ok(GetLastError() == ERROR_NOACCESS || GetLastError() == MYERROR, "expected error ERROR_NOACCESS, got %u\n", GetLastError()); SetLastError(MYERROR); @@ -1059,7 +1061,7 @@ static void test_GetMouseMovePointsEx(void) count = -1; retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); ok(retval == count, "expected GetMouseMovePointsEx to fail, got %d\n", retval); - ok(ERROR_INVALID_PARAMETER == GetLastError(), + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); SetLastError(MYERROR); @@ -1083,7 +1085,7 @@ static void test_GetMouseMovePointsEx(void) SetLastError(MYERROR); retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM+1, GMMP_USE_DISPLAY_POINTS); ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); - ok(ERROR_INVALID_PARAMETER == GetLastError(), + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); /* it was not possible to force an error with the fifth parameter on win2k */ @@ -1092,25 +1094,25 @@ static void test_GetMouseMovePointsEx(void) SetLastError(MYERROR); retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT)-1, NULL, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); - ok(ERROR_INVALID_PARAMETER == GetLastError(), + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); SetLastError(MYERROR); retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT)-1, &in, NULL, BUFLIM, GMMP_USE_DISPLAY_POINTS); ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); - ok(ERROR_INVALID_PARAMETER == GetLastError(), + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); SetLastError(MYERROR); retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), NULL, out, BUFLIM+1, GMMP_USE_DISPLAY_POINTS); ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); - ok(ERROR_INVALID_PARAMETER == GetLastError(), + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); SetLastError(MYERROR); retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, NULL, BUFLIM+1, GMMP_USE_DISPLAY_POINTS); ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); - ok(ERROR_INVALID_PARAMETER == GetLastError(), + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); #undef BUFLIM

1 0

Alexandre Julliard : user32/tests: Fix the winstation tests on NT4.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: 7e1bc58d764404e25e3aafedb27613bf8c2d0fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1bc58d764404e25e3aafedb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 24 14:51:05 2008 +0200 user32/tests: Fix the winstation tests on NT4. --- dlls/user32/tests/winstation.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 42f2644..efc122a 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -122,7 +122,9 @@ static void test_handles(void) flags = 0; ok( GetHandleInformation( w1, &flags ), "GetHandleInformation failed\n" ); - ok( !(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE), "handle %p PROTECT_FROM_CLOSE set\n", w1 ); + ok( !(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE) || + broken(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE), /* set on nt4 */ + "handle %p PROTECT_FROM_CLOSE set\n", w1 ); ok( DuplicateHandle( GetCurrentProcess(), w1, GetCurrentProcess(), (PHANDLE)&w2, 0, TRUE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed\n" ); @@ -201,7 +203,11 @@ static void test_handles(void) ok( GetLastError() == ERROR_BUSY, "bad last error %d\n", GetLastError() ); SetLastError( 0xdeadbeef ); - ok( !CloseHandle(d1), "closing thread desktop handle failed\n" ); + if (CloseHandle( d1 )) /* succeeds on nt4 */ + { + win_skip( "NT4 desktop handle management is completely different\n" ); + return; + } ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %d\n", GetLastError() ); ok( DuplicateHandle( GetCurrentProcess(), d1, GetCurrentProcess(), (PHANDLE)&d2, 0,

1 0

Francois Gouget : secur32: Fix compilation with GNU TLS 1.0.16.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: 975b582763dd80e999831461d2d5cbc517d0422a URL: http://source.winehq.org/git/wine.git/?a=commit;h=975b582763dd80e999831461d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 24 12:24:01 2008 +0200 secur32: Fix compilation with GNU TLS 1.0.16. --- dlls/secur32/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index aea407e..8207668 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -63,7 +63,7 @@ struct schan_handle struct schan_credentials { ULONG credential_use; - gnutls_certificate_credentials_t credentials; + gnutls_certificate_credentials credentials; }; static struct schan_handle *schan_handle_table;

1 0