December 2005 - Wine-Commits

Robert Shearman : oleaut32: Convert some tabs to spaces and some other formatting changes.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 6b9743801135cad60a4f754034d30a1d8e871550 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6b9743801135cad60a4f754… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:04:02 2005 +0100 oleaut32: Convert some tabs to spaces and some other formatting changes. --- dlls/oleaut32/typelib.c | 137 +++++++++++++++++++++++++---------------------- 1 files changed, 73 insertions(+), 64 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0e40e2b..1c56c46 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5326,41 +5326,44 @@ static HRESULT WINAPI ITypeInfo_fnInvoke switch (func_desc->funckind) { case FUNC_PUREVIRTUAL: case FUNC_VIRTUAL: { - DWORD res; - int numargs, numargs2, argspos, args2pos; - DWORD *args , *args2; + DWORD res; + int numargs, numargs2, argspos, args2pos; + DWORD *args , *args2; VARIANT *rgvarg = HeapAlloc(GetProcessHeap(), 0, sizeof(VARIANT) * func_desc->cParams); memcpy(rgvarg,pDispParams->rgvarg,sizeof(VARIANT)*pDispParams->cArgs); - hres = S_OK; - numargs = 1; /* sizeof(thisptr) */ - numargs2 = 0; - for (i = 0; i < func_desc->cParams; i++) { + hres = S_OK; + numargs = 1; /* sizeof(thisptr) */ + numargs2 = 0; + for (i = 0; i < func_desc->cParams; i++) + { TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc; - numargs += _argsize(tdesc->vt); - if (i>=pDispParams->cArgs) { /* arguments to return */ - if (tdesc->vt == VT_PTR) { - numargs2 += _argsize(tdesc->u.lptdesc->vt); - } else { - FIXME("The variant type here should have been VT_PTR, not vt %d\n", tdesc->vt); - numargs2 += _argsize(tdesc->vt); - } - } - } + numargs += _argsize(tdesc->vt); + if (i>=pDispParams->cArgs) { /* arguments to return */ + if (tdesc->vt == VT_PTR) { + numargs2 += _argsize(tdesc->u.lptdesc->vt); + } else { + FIXME("The variant type here should have been VT_PTR, not vt %d\n", tdesc->vt); + numargs2 += _argsize(tdesc->vt); + } + } + } - args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*numargs); - args2 = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD)*numargs2); + args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*numargs); + args2 = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD)*numargs2); - args[0] = (DWORD)pIUnk; - argspos = 1; args2pos = 0; - for (i = 0; i < func_desc->cParams; i++) { - ELEMDESC *elemdesc = &(func_desc->lprgelemdescParam[i]); - TYPEDESC *tdesc = &(elemdesc->tdesc); - USHORT paramFlags = elemdesc->u.paramdesc.wParamFlags; - int arglen = _argsize(tdesc->vt); + args[0] = (DWORD)pIUnk; + argspos = 1; args2pos = 0; + for (i = 0; i < func_desc->cParams; i++) + { + ELEMDESC *elemdesc = &(func_desc->lprgelemdescParam[i]); + TYPEDESC *tdesc = &(elemdesc->tdesc); + USHORT paramFlags = elemdesc->u.paramdesc.wParamFlags; + int arglen = _argsize(tdesc->vt); - if (i<pDispParams->cArgs) { + if (i<pDispParams->cArgs) + { VARIANT *arg = &rgvarg[pDispParams->cArgs-i-1]; if (paramFlags & PARAMFLAG_FOPT) { @@ -5381,7 +5384,9 @@ static HRESULT WINAPI ITypeInfo_fnInvoke hres = _copy_arg(iface, tdesc, &args[argspos], arg, tdesc->vt); if (FAILED(hres)) goto func_fail; argspos += arglen; - } else if (paramFlags & PARAMFLAG_FOPT) { + } + else if (paramFlags & PARAMFLAG_FOPT) + { VARIANT *arg = &rgvarg[i]; if (i < func_desc->cParams - func_desc->cParamsOpt) @@ -5395,36 +5400,38 @@ static HRESULT WINAPI ITypeInfo_fnInvoke hres = _copy_arg(iface, tdesc, &args[argspos], arg, tdesc->vt); if (FAILED(hres)) goto func_fail; argspos += arglen; - } else { - if (tdesc->vt == VT_PTR) - arglen = _argsize(tdesc->u.lptdesc->vt); - else - FIXME("set %d to pointer for get (type is %d)\n",i,tdesc->vt); - - /* Supply pointers for the rest, so propertyget works*/ - args[argspos] = (DWORD)&args2[args2pos]; - - /* If pointer to variant, pass reference it. */ - if ((tdesc->vt == VT_PTR) && - (tdesc->u.lptdesc->vt == VT_VARIANT) && - pVarResult + } + else + { + if (tdesc->vt == VT_PTR) + arglen = _argsize(tdesc->u.lptdesc->vt); + else + FIXME("set %d to pointer for get (type is %d)\n",i,tdesc->vt); + + /* Supply pointers for the rest, so propertyget works*/ + args[argspos] = (DWORD)&args2[args2pos]; + + /* If pointer to variant, pass reference it. */ + if ((tdesc->vt == VT_PTR) && + (tdesc->u.lptdesc->vt == VT_VARIANT) && + pVarResult ) args[argspos]= (DWORD)pVarResult; - argspos += 1; - args2pos += arglen; - } - } - if (func_desc->cParamsOpt < 0) - FIXME("Does not support optional parameters (%d)\n", func_desc->cParamsOpt); + argspos += 1; + args2pos += arglen; + } + } + if (func_desc->cParamsOpt < 0) + FIXME("Does not support optional parameters (%d)\n", func_desc->cParamsOpt); - res = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4], - func_desc->callconv, - numargs, - args - ); + res = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4], + func_desc->callconv, + numargs, + args + ); - if (pVarResult) { - for (i = 0; i < func_desc->cParams; i++) { + if (pVarResult) { + for (i = 0; i < func_desc->cParams; i++) { USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; if (wParamFlags & PARAMFLAG_FRETVAL) { ELEMDESC *elemdesc = &func_desc->lprgelemdescParam[i]; @@ -5455,19 +5462,21 @@ static HRESULT WINAPI ITypeInfo_fnInvoke IUnknown_Release(*V_UNKNOWNREF(&varresult)); } break; - } - } - } + } + } + } + + if ((func_desc->elemdescFunc.tdesc.vt == VT_HRESULT) && FAILED(res)) + { + WARN("invoked function failed with error 0x%08lx\n", res); + hres = DISP_E_EXCEPTION; + if (pExcepInfo) pExcepInfo->scode = res; + } - if ((func_desc->elemdescFunc.tdesc.vt == VT_HRESULT) && FAILED(res)) { - WARN("invoked function failed with error 0x%08lx\n", res); - hres = DISP_E_EXCEPTION; - if (pExcepInfo) pExcepInfo->scode = res; - } func_fail: HeapFree(GetProcessHeap(), 0, rgvarg); - HeapFree(GetProcessHeap(),0,args2); - HeapFree(GetProcessHeap(),0,args); + HeapFree(GetProcessHeap(),0,args2); + HeapFree(GetProcessHeap(),0,args); break; } case FUNC_DISPATCH: {

1 0

Robert Shearman : oleaut32: Initialize member IDs to MEMBERID_NIL inITypeInfo::GetIDsOfNames.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: fa49c971f1f705d3faa91ee23ce5101b319acc1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa49c971f1f705d3faa91ee… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:03:27 2005 +0100 oleaut32: Initialize member IDs to MEMBERID_NIL inITypeInfo::GetIDsOfNames. Better tracing. --- dlls/oleaut32/typelib.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 965342c..0e40e2b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3614,7 +3614,11 @@ static HRESULT WINAPI ITypeLib2_fnGetTyp TRACE("(%p)\n\tguid:\t%s)\n",This,debugstr_guid(guid)); - if (!pTypeInfo) return TYPE_E_ELEMENTNOTFOUND; + if (!pTypeInfo) + { + WARN("-- element not found\n"); + return TYPE_E_ELEMENTNOTFOUND; + } /* search linked list for guid */ while( !IsEqualIID(guid,&pTypeInfo->TypeAttr.guid) ) @@ -3624,7 +3628,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTyp if (!pTypeInfo) { /* end of list reached */ - TRACE("-- element not found\n"); + WARN("-- element not found\n"); return TYPE_E_ELEMENTNOTFOUND; } } @@ -4771,11 +4775,17 @@ static HRESULT WINAPI ITypeInfo_fnGetIDs TLBFuncDesc * pFDesc; TLBVarDesc * pVDesc; HRESULT ret=S_OK; + int i; TRACE("(%p) Name %s cNames %d\n", This, debugstr_w(*rgszNames), cNames); + + /* init out parameters in case of failure */ + for (i = 0; i < cNames; i++) + pMemId[i] = MEMBERID_NIL; + for(pFDesc=This->funclist; pFDesc; pFDesc=pFDesc->next) { - int i, j; + int j; if(!lstrcmpiW(*rgszNames, pFDesc->Name)) { if(cNames) *pMemId=pFDesc->funcdesc.memid; for(i=1; i < cNames; i++){ @@ -4787,6 +4797,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDs else ret=DISP_E_UNKNOWNNAME; }; + TRACE("-- 0x%08lx\n", ret); return ret; } }

1 0

Robert Shearman : ole: Improve typelib traces.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 088fc70ede7ee8ff2dc8990bbd6e86dfcaa9cb7d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=088fc70ede7ee8ff2dc8990… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:02:47 2005 +0100 ole: Improve typelib traces. Move the debug channel check from dump_TLBFuncDesc[One] to its callers for more flexibility in which channel controls the output. --- dlls/oleaut32/typelib.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 29585a3..965342c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1145,8 +1145,6 @@ static const char * typekind_desc[] = static void dump_TLBFuncDescOne(const TLBFuncDesc * pfd) { int i; - if (!TRACE_ON(typelib)) - return; MESSAGE("%s(%u)\n", debugstr_w(pfd->Name), pfd->funcdesc.cParams); for (i=0;i<pfd->funcdesc.cParams;i++) MESSAGE("\tparm%d: %s\n",i,debugstr_w(pfd->pParamDesc[i].Name)); @@ -1282,14 +1280,16 @@ static void dump_DispParms(const DISPPAR static void dump_TypeInfo(const ITypeInfoImpl * pty) { TRACE("%p ref=%lu\n", pty, pty->ref); + TRACE("%s %s\n", debugstr_w(pty->Name), debugstr_w(pty->DocString)); TRACE("attr:%s\n", debugstr_guid(&(pty->TypeAttr.guid))); TRACE("kind:%s\n", typekind_desc[pty->TypeAttr.typekind]); TRACE("fct:%u var:%u impl:%u\n", pty->TypeAttr.cFuncs, pty->TypeAttr.cVars, pty->TypeAttr.cImplTypes); + TRACE("wTypeFlags: 0x%04x\n", pty->TypeAttr.wTypeFlags); TRACE("parent tlb:%p index in TLB:%u\n",pty->pTypeLib, pty->index); - TRACE("%s %s\n", debugstr_w(pty->Name), debugstr_w(pty->DocString)); if (pty->TypeAttr.typekind == TKIND_MODULE) TRACE("dllname:%s\n", debugstr_w(pty->DllName)); - dump_TLBFuncDesc(pty->funclist); + if (TRACE_ON(ole)) + dump_TLBFuncDesc(pty->funclist); dump_TLBVarDesc(pty->varlist); dump_TLBImplType(pty->impltypelist); } @@ -2968,7 +2968,8 @@ static SLTG_TypeInfoTail *SLTG_ProcessIn if(pFunc->next == 0xffff) break; } pTI->TypeAttr.cFuncs = num; - dump_TLBFuncDesc(pTI->funclist); + if (TRACE_ON(typelib)) + dump_TLBFuncDesc(pTI->funclist); return (SLTG_TypeInfoTail*)(pFirstItem + pMemHeader->cbExtra); } @@ -5593,7 +5594,8 @@ static HRESULT WINAPI ITypeInfo_fnGetDll for(pFDesc=This->funclist; pFDesc; pFDesc=pFDesc->next) if(pFDesc->funcdesc.memid==memid){ dump_TypeInfo(This); - dump_TLBFuncDescOne(pFDesc); + if (TRACE_ON(ole)) + dump_TLBFuncDescOne(pFDesc); if (pBstrDllName) *pBstrDllName = SysAllocString(This->DllName);

1 0

Jesse Allen : msvcrt: More printf tests for I64 integer size support.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: c5dc38874ab16dc4707447f280fb43ec5841a9cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c5dc38874ab16dc4707447f… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Dec 26 13:01:49 2005 +0100 msvcrt: More printf tests for I64 integer size support. --- dlls/msvcrt/tests/printf.c | 150 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 144 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 28ddf49..f13ac2d 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -39,12 +39,153 @@ static void test_sprintf( void ) } ok( r==23, "return count wrong\n"); - todo_wine { format = "%I64d"; r = sprintf(buffer,format,((ULONGLONG)0xffffffff)*0xffffffff); ok(!strcmp(buffer,"-8589934591"),"Problem with long long\n"); ok( r==11, "return count wrong\n"); - } + + format = "%+8I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," +100") && r==8,"+8I64d failed: '%s'\n", buffer); + + format = "%+.8I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"+00000100") && r==9,"+.8I64d failed: '%s'\n", buffer); + + format = "%+10.8I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," +00000100") && r==10,"+10.8I64d failed: '%s'\n", buffer); + format = "%_1I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"_1I64d") && r==6,"_1I64d failed\n"); + + format = "%-1.5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-00100") && r==6,"-1.5I64d failed: '%s'\n", buffer); + + format = "%5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 100") && r==5,"5I64d failed: '%s'\n", buffer); + + format = "%5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," -100") && r==5,"5I64d failed: '%s'\n", buffer); + + format = "%-5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"100 ") && r==5,"-5I64d failed: '%s'\n", buffer); + + format = "%-5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-100 ") && r==5,"-5I64d failed: '%s'\n", buffer); + + format = "%-.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"00100") && r==5,"-.5I64d failed: '%s'\n", buffer); + + format = "%-.5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-00100") && r==6,"-.5I64d failed: '%s'\n", buffer); + + format = "%-8.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"00100 ") && r==8,"-8.5I64d failed: '%s'\n", buffer); + + format = "%-8.5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-00100 ") && r==8,"-8.5I64d failed: '%s'\n", buffer); + + format = "%05I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"00100") && r==5,"05I64d failed: '%s'\n", buffer); + + format = "%05I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-0100") && r==5,"05I64d failed: '%s'\n", buffer); + + format = "% I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 100") && r==4,"' I64d' failed: '%s'\n", buffer); + + format = "% I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-100") && r==4,"' I64d' failed: '%s'\n", buffer); + + format = "% 5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 100") && r==5,"' 5I64d' failed: '%s'\n", buffer); + + format = "% 5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," -100") && r==5,"' 5I64d' failed: '%s'\n", buffer); + + format = "% .5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 00100") && r==6,"' .5I64d' failed: '%s'\n", buffer); + + format = "% .5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-00100") && r==6,"' .5I64d' failed: '%s'\n", buffer); + + format = "% 8.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 00100") && r==8,"' 8.5I64d' failed: '%s'\n", buffer); + + format = "% 8.5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," -00100") && r==8,"' 8.5I64d' failed: '%s'\n", buffer); + + format = "%.0I64d"; + r = sprintf(buffer,format,(LONGLONG)0); + ok(r==0,".0I64d failed: '%s'\n", buffer); + + format = "%#+21.18I64x"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," 0x00ffffffffffffff9c") && r==21,"#+21.18I64x failed: '%s'\n", buffer); + + format = "%#.25I64o"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"0001777777777777777777634") && r==25,"#.25I64o failed: '%s'\n", buffer); + + format = "%#+24.20I64o"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," 01777777777777777777634") && r==24,"#+24.20I64o failed: '%s'\n", buffer); + + format = "%#+18.21I64X"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"0X00000FFFFFFFFFFFFFF9C") && r==23,"#+18.21I64X failed: '%s '\n", buffer); + + format = "%#+20.24I64o"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"001777777777777777777634") && r==24,"#+20.24I64o failed: '%s'\n", buffer); + + format = "%#+25.22I64u"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer," 0018446744073709551615") && r==25,"#+25.22I64u conversion failed: '%s'\n", buffer); + + format = "%#+25.22I64u"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer," 0018446744073709551615") && r==25,"#+25.22I64u failed: '%s'\n", buffer); + + format = "%#+30.25I64u"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer," 0000018446744073709551615") && r==30,"#+30.25I64u failed: '%s'\n", buffer); + + format = "%+#25.22I64d"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer," -0000000000000000000001") && r==25,"+#25.22I64d failed: '%s'\n", buffer); + + format = "%#-8.5I64o"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"00144 ") && r==8,"-8.5I64o failed: '%s'\n", buffer); + + format = "%#-+ 08.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"+00100 ") && r==8,"'#-+ 08.5I64d failed: '%s'\n", buffer); + + format = "%#-+ 08.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"+00100 ") && r==8,"#-+ 08.5I64d failed: '%s'\n", buffer); format = "%lld"; r = sprintf(buffer,format,((ULONGLONG)0xffffffff)*0xffffffff); @@ -336,10 +477,7 @@ static void test_swprintf( void ) ok(wcsstr(buffer,e008) != 0,"Sprintf different\n"); } swprintf(buffer,I64d,((ULONGLONG)0xffffffff)*0xffffffff); - todo_wine - { - ok(wcslen(buffer) == 11,"Problem with long long\n"); - } + ok(wcslen(buffer) == 11,"Problem with long long\n"); swprintf(buffer,S,string); ok(wcslen(buffer) == 6,"Problem with \"%%S\" interpretation\n"); }

1 0

Jesse Allen : msvcrt: pf_integer_conv for I64.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 419d493aacd808ebc0a1abfe8d760b5b4aed93d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=419d493aacd808ebc0a1abf… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Dec 26 13:01:38 2005 +0100 msvcrt: pf_integer_conv for I64. - Add pf_integer_conv and pf_is_integer_format. - Update pf_fill to handle printing the sign for signed integers. - Handle I64 integer sizes using pf_integer_conv and pf_output_format_A. --- dlls/msvcrt/wcs.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 503a998..db86437 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -285,6 +285,16 @@ static inline int pf_fill( pf_output *ou { int i, r = 0; + if( flags->Sign && !( flags->Format == 'd' || flags->Format == 'i' ) ) + flags->Sign = 0; + + if( left && flags->Sign ) + { + flags->FieldLength--; + if( flags->PadZero ) + r = pf_output_stringA( out, &flags->Sign, 1 ); + } + if( ( !left && flags->LeftAlign ) || ( left && !flags->LeftAlign )) { @@ -297,6 +307,9 @@ static inline int pf_fill( pf_output *ou } } + if( left && flags->Sign && !flags->PadZero ) + r = pf_output_stringA( out, &flags->Sign, 1 ); + return r; } @@ -344,6 +357,14 @@ static inline int pf_output_format_A( pf return r; } +static inline BOOL pf_is_integer_format( char fmt ) +{ + static const char float_fmts[] = "diouxX"; + if (!fmt) + return FALSE; + return strchr( float_fmts, fmt ) ? TRUE : FALSE; +} + static inline BOOL pf_is_double_format( char fmt ) { static const char float_fmts[] = "aeEfgG"; @@ -385,6 +406,70 @@ static void pf_rebuild_format_string( ch *p++ = 0; } +/* pf_integer_conv: prints x to buf, including alternate formats, + but not the sign */ +static void pf_integer_conv( char *buf, pf_flags *flags, LONGLONG x ) +{ + unsigned int base; + char *digits; + + int i, j, k; + char tmp[40]; + + base = 10; + if( flags->Format == 'o' ) + base = 8; + else if( flags->Format == 'x' || flags->Format == 'X' ) + base = 16; + + if( flags->Format == 'X' ) + digits = "0123456789ABCDEFX"; + else + digits = "0123456789abcdefx"; + + if( x < 0 && ( flags->Format == 'd' || flags->Format == 'i' ) ) + { + x = -x; + flags->Sign = '-'; + } + + /* Do conversion (backwards) */ + i = 0; + if( x == 0 && flags->Precision ) + tmp[i++] = '0'; + else + while( x != 0 ) + { + j = (ULONGLONG) x % base; + x = (ULONGLONG) x / base; + tmp[i++] = digits[j]; + } + k = flags->Precision - i; + while( k-- > 0 ) + tmp[i++] = '0'; + if( flags->Alternate ) + { + if( base == 16 ) + { + tmp[i++] = digits[16]; + tmp[i++] = '0'; + } + else if( base == 8 && tmp[i-1] != '0' ) + tmp[i++] = '0'; + } + + /* Reverse for buf */ + j = 0; + while( i-- > 0 ) + buf[j++] = tmp[i]; + buf[j] = '\0'; + + /* Adjust precision so pf_fill won't truncate the number later */ + flags->Precision = strlen( buf ); + + return; +} + /********************************************************************* * pf_vsnprintf (INTERNAL) * @@ -583,6 +668,21 @@ static int pf_vsnprintf( pf_output *out, *x = out->used; } + /* deal with 64-bit integers */ + else if( pf_is_integer_format( flags.Format ) && flags.IntegerDouble ) + { + char number[40], *x = number; + + if( flags.FieldLength >= sizeof number ) + x = HeapAlloc( GetProcessHeap(), 0, flags.FieldLength+1 ); + + pf_integer_conv( x, &flags, va_arg(valist, LONGLONG) ); + + r = pf_output_format_A( out, x, -1, &flags ); + if( x != number ) + HeapFree( GetProcessHeap(), 0, number ); + } + /* deal with integers and floats using libc's printf */ else if( pf_is_valid_format( flags.Format ) ) {

1 0

Jesse Allen : msvcrt: Do not treat %ll as an IntegerDouble in printf.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: ee058ed0781865ad035e5296f5d7c2d28a0ed6fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee058ed0781865ad035e529… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Dec 26 13:00:35 2005 +0100 msvcrt: Do not treat %ll as an IntegerDouble in printf. --- dlls/msvcrt/wcs.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5ef929b..503a998 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -489,10 +489,7 @@ static int pf_vsnprintf( pf_output *out, { if( *p == 'h' || *p == 'l' || *p == 'L' ) { - if( flags.IntegerLength == *p ) /* FIXME: this is wrong */ - flags.IntegerDouble++; - else - flags.IntegerLength = *p; + flags.IntegerLength = *p; p++; } else if( *p == 'I' )

1 0

Jesse Allen : msvcrt: Parse I, I32, and I64 integer size flags in printf.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 6c70942a057644e926367a68486bc96222f1d573 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c70942a057644e926367a6… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Dec 26 13:00:01 2005 +0100 msvcrt: Parse I, I32, and I64 integer size flags in printf. --- dlls/msvcrt/tests/printf.c | 15 +++++++++++++++ dlls/msvcrt/wcs.c | 14 ++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index d96c61e..28ddf49 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -56,6 +56,21 @@ static void test_sprintf( void ) ok(!strcmp(buffer, "I"), "Problem with \"I\" interpretation\n"); ok( r==1, "return count wrong\n"); + format = "%I0d"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"I0d"),"I0d failed\n"); + ok( r==3, "return count wrong\n"); + + format = "%I32d"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"1"),"I32d failed\n"); + ok( r==1, "return count wrong\n"); + + format = "%I64D"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer,"D"),"I64D failed: %s\n",buffer); + ok( r==1, "return count wrong\n"); + format = "% d"; r = sprintf(buffer,format,1); ok(!strcmp(buffer, " 1"),"Problem with sign place-holder: '%s'\n",buffer); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 83a713e..5ef929b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -495,6 +495,20 @@ static int pf_vsnprintf( pf_output *out, flags.IntegerLength = *p; p++; } + else if( *p == 'I' ) + { + if( *(p+1) == '6' && *(p+2) == '4' ) + { + flags.IntegerDouble++; + p += 3; + } + else if( *(p+1) == '3' && *(p+2) == '2' ) + p += 3; + else if( isdigit(*(p+1)) || *(p+1) == 0 ) + break; + else + p++; + } else if( *p == 'w' ) flags.WideString = *p++; else if( *p == 'F' )

1 0

Rolf Kalbermatter : urlmon: Implement BindAsyncMoniker function.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 81c446ef5def256073af8daa709dc8237bee4548 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=81c446ef5def256073af8da… Author: Rolf Kalbermatter <rolf.kalbermatter(a)citeng.com> Date: Mon Dec 26 12:59:42 2005 +0100 urlmon: Implement BindAsyncMoniker function. --- dlls/urlmon/umon.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 2 +- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index cbf70de..ebe5c07 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1350,6 +1350,42 @@ HRESULT WINAPI IsAsyncMoniker(IMoniker * } /*********************************************************************** + * BindAsyncMoniker (URLMON.@) + * + * Bind a bind status callback to an asynchronous URL Moniker. + * + * PARAMS + * pmk [I] Moniker object to bind status callback to + * grfOpt [I] Options, seems not used + * pbsc [I] Status callback to bind + * iidResult [I] Interface to return + * ppvResult [O] Resulting asynchronous moniker object + * + * RETURNS + * Success: S_OK. + * Failure: E_INVALIDARG, if any argument is invalid, or + * E_OUTOFMEMORY if memory allocation fails. + */ +HRESULT WINAPI BindAsyncMoniker(IMoniker *pmk, DWORD grfOpt, IBindStatusCallback *pbsc, REFIID iidResult, LPVOID *ppvResult) +{ + LPBC pbc = NULL; + HRESULT hr = E_INVALIDARG; + + if (pmk && ppvResult) + { + *ppvResult = NULL; + + hr = CreateAsyncBindCtx(0, pbsc, NULL, &pbc); + if (hr == NOERROR) + { + hr = IMoniker_BindToObject(pmk, pbc, NULL, iidResult, ppvResult); + IBindCtx_Release(pbc); + } + } + return hr; +} + +/*********************************************************************** * RegisterBindStatusCallback (URLMON.@) * * Register a bind status callback. diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 639675e..46e5f28 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -7,7 +7,7 @@ @ stub AsyncGetClassBits @ stub AsyncInstallDistributionUnit -@ stub BindAsyncMoniker +@ stdcall BindAsyncMoniker(ptr long ptr ptr ptr) @ stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) @ stub CoInstall @ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long)

1 0

Jacek Caban : urlmon: URL with two slashes is valid.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 7b4d59c5a0a41413c50d45ad97bcc974e6dd4b59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b4d59c5a0a41413c50d45a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 26 12:59:31 2005 +0100 urlmon: URL with two slashes is valid. --- dlls/urlmon/file.c | 6 ++++-- dlls/urlmon/tests/protocol.c | 14 +++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index b1b156c..fcdb772 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -145,8 +145,10 @@ static HRESULT WINAPI FileProtocol_Start IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); file_name = url+sizeof(wszFile)/sizeof(WCHAR); - if(file_name[0] == '/' && file_name[1] == '/' && file_name[2] == '/') - file_name += 3; + if(file_name[0] == '/' && file_name[1] == '/') + file_name += 2; + if(*file_name == '/') + file_name++; This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index da59fc6..c920aa4 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -452,7 +452,8 @@ static void test_file_protocol(void) { HANDLE file; static const WCHAR wszFile[] = {'f','i','l','e',':',0}; - static const WCHAR wszFile2[] = {'f','i','l','e',':','/','/','/',0}; + static const WCHAR wszFile2[] = {'f','i','l','e',':','/','/',0}; + static const WCHAR wszFile3[] = {'f','i','l','e',':','/','/','/',0}; static const char html_doc[] = "<HTML></HTML>"; file = CreateFileW(wszIndexHtml, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, @@ -488,7 +489,18 @@ static void test_file_protocol(void) { memcpy(buf+len, wszIndexHtml, sizeof(wszIndexHtml)); file_name = buf + sizeof(wszFile2)/sizeof(WCHAR)-1; + bindf = 0; + test_file_protocol_url(buf); + bindf = BINDF_FROMURLMON; + test_file_protocol_url(buf); + + memcpy(buf, wszFile3, sizeof(wszFile3)); + len = sizeof(wszFile3)/sizeof(WCHAR)-1; + len += GetCurrentDirectoryW(sizeof(buf)/sizeof(WCHAR)-len, buf+len); + buf[len++] = '\\'; + memcpy(buf+len, wszIndexHtml, sizeof(wszIndexHtml)); + file_name = buf + sizeof(wszFile3)/sizeof(WCHAR)-1; bindf = 0; test_file_protocol_url(buf); bindf = BINDF_FROMURLMON;

1 0

Alexander N. Sørnes : winecfg: Updated Norwegian Bokmål resources.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 0334ba93efcf2b814181e403e9451a515bb70dcf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0334ba93efcf2b814181e40… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 26 12:58:43 2005 +0100 winecfg: Updated Norwegian Bokmål resources. --- programs/winecfg/No.rc | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index d92dd09..91b0f75 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -63,27 +63,30 @@ BEGIN LTEXT "Fargedybde: ",IDC_STATIC,8,10,70,30 COMBOBOX IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,25,244,110 + GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,25,244,180 CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Aktiver dobbelt hurtigminne for skrivebordet",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 - + LTEXT "Hvis vinduer kontrolleres av din standardvindusbehandler, f�r de vanlige rammer, og respekterer det virtuelle skrivebordet ditt og vises i vinduslisten.\n\nHvis de er ukontrollerte er de koblet fra vindusbehandleren. Dette betyr at de ikke integreres like godt med skrivebordet ditt, men emuleringen blir mer presis s�nn at noen programmer virker bedre.", + IDC_STATIC,15,58,228,80 + CONTROL "Tillat vindusbehandleren � kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 + LTEXT "Du kan velge � emulere et Windows-skrivebord, der alle vinduene er bundet i en virtuell skjerm, eller du kan f� vinduene til � oppf�re seg som andre programmer p� skrivebordet.", - IDC_STATIC,15,73,228,28 - LTEXT "Skrivebordsstrrelse:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED + IDC_STATIC,15,146,228,28 + LTEXT "Skrivebordsstrrelse:",IDC_DESKTOP_SIZE,15,188,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,108,188,8,8,WS_DISABLED CONTROL "Emuler et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + BS_AUTOCHECKBOX | WS_TABSTOP,15,173,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,64,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,140,244,120 + GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 - LTEXT "Verteks-skyggelegging: ",IDC_STATIC,15,150,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,148,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Verteks-skyggelegging: ",IDC_STATIC,15,220,80,30 + COMBOBOX IDC_D3D_VSHADER_MODE,100,218,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,230,10 + CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Jacek Caban : shlwapi: Fix UrlCanonicalize.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: bb8a7478bc2b945bd082a9db8f987a1609c71f59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb8a7478bc2b945bd082a9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 26 12:58:28 2005 +0100 shlwapi: Fix UrlCanonicalize. - Added support for URL_FILE_USE_PATHURL. - Fix handling of '/' and '\'. --- dlls/shlwapi/tests/path.c | 9 ++++++ dlls/shlwapi/url.c | 69 +++++++++++++++++++++++++++++++-------------- 2 files changed, 56 insertions(+), 22 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index eca68b9..1efbe0f 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -60,10 +60,19 @@ const TEST_URL_CANONICALIZE TEST_CANONIC {"http://www.winehq.org/tests/../?query=x&return=y", 0, S_OK, "http://www.winehq.org/?query=x&return=y"}, {"http://www.winehq.org/tests/..#example", 0, S_OK, "http://www.winehq.org/#example"}, {"http://www.winehq.org/tests/../#example", 0, S_OK, "http://www.winehq.org/#example"}, + {"http://www.winehq.org/tests\\../#example", 0, S_OK, "http://www.winehq.org/#example"}, + {"http://www.winehq.org/tests/..\\#example", 0, S_OK, "http://www.winehq.org/#example"}, + {"http://www.winehq.org\\tests/../#example", 0, S_OK, "http://www.winehq.org/#example"}, {"http://www.winehq.org/tests/../#example", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests/../#example"}, {"http://www.winehq.org/tests/foo bar", URL_ESCAPE_SPACES_ONLY| URL_DONT_ESCAPE_EXTRA_INFO , S_OK, "http://www.winehq.org/tests/foo%20bar"}, {"http://www.winehq.org/tests/foo%20bar", URL_UNESCAPE , S_OK, "http://www.winehq.org/tests/foo bar"}, {"file:///c:/tests/foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar"}, + {"file:///c:/tests\\foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar"}, + {"file:///c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"file://c:/tests/../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"file://c:/tests\\../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"file://c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"file:///c://tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\\\tests\\foo bar"} }; typedef struct _TEST_URL_ESCAPE { diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index d25628e..4e5c691 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -327,9 +327,10 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR { HRESULT hr = S_OK; DWORD EscapeFlags; - LPWSTR lpszUrlCpy, wk1, wk2, mp, root; + LPWSTR lpszUrlCpy, wk1, wk2, mp, mp2, root; INT nByteLen, state; DWORD nLen, nWkLen; + WCHAR slash = dwFlags & URL_FILE_USE_PATHURL ? '\\' : '/'; TRACE("(%s %p %p 0x%08lx)\n", debugstr_w(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags); @@ -376,23 +377,37 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR *wk2++ = *wk1++; if (*wk1 != L'/') {state = 6; break;} *wk2++ = *wk1++; + if((dwFlags & URL_FILE_USE_PATHURL) && *wk1 == '/') + wk1++; state = 4; break; case 3: nWkLen = strlenW(wk1); memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); + mp = wk2; wk1 += nWkLen; wk2 += nWkLen; + + while(mp < wk2) { + if(*mp == '/' || *mp == '\\') + *mp = slash; + mp++; + } break; case 4: - if (!isalnumW(*wk1) && (*wk1 != L'-') && (*wk1 != L'.')) {state = 3; break;} - while(isalnumW(*wk1) || (*wk1 == L'-') || (*wk1 == L'.')) *wk2++ = *wk1++; - state = 5; - break; - case 5: - if (*wk1 != L'/') {state = 3; break;} - *wk2++ = *wk1++; - state = 6; + if (!isalnumW(*wk1) && (*wk1 != L'-') && (*wk1 != L'.') && (*wk1 != ':')) + {state = 3; break;} + while(isalnumW(*wk1) || (*wk1 == L'-') || (*wk1 == L'.') || (*wk1 == ':')) + *wk2++ = *wk1++; + state = 5; + break; + case 5: + if (*wk1 != '/' && *wk1 != '\\') {state = 3; break;} + while(*wk1 == '/') { + *wk2++ = slash; + wk1++; + } + state = 6; break; case 6: /* Now at root location, cannot back up any more. */ @@ -400,7 +415,11 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR root = wk2-1; while (*wk1) { TRACE("wk1=%c\n", (CHAR)*wk1); - mp = strchrW(wk1, L'/'); + + mp = strchrW(wk1, '/'); + mp2 = strchrW(wk1, '\\'); + if(mp2 && mp2 < mp) + mp = mp2; if (!mp) { nWkLen = strlenW(wk1); memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); @@ -408,35 +427,41 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR wk2 += nWkLen; continue; } - nLen = mp - wk1 + 1; - memcpy(wk2, wk1, nLen * sizeof(WCHAR)); - wk2 += nLen; - wk1 += nLen; + nLen = mp - wk1; + if(nLen) { + memcpy(wk2, wk1, nLen * sizeof(WCHAR)); + wk2 += nLen; + wk1 += nLen; + } + *wk2++ = slash; + wk1++; + if (*wk1 == L'.') { TRACE("found '/.'\n"); - if (*(wk1+1) == L'/') { + if (wk1[1] == '/' || wk1[1] == '\\') { /* case of /./ -> skip the ./ */ wk1 += 2; } - else if (*(wk1+1) == L'.') { + else if (wk1[1] == '.') { /* found /.. look for next / */ TRACE("found '/..'\n"); - if (*(wk1+2) == L'/' || *(wk1+2) == L'?' || *(wk1+2) == L'#' || *(wk1+2) == 0) { + if (wk1[2] == '/' || wk1[2] == '\\' ||wk1[2] == '?' + || wk1[2] == '#' || !wk1[2]) { /* case /../ -> need to backup wk2 */ TRACE("found '/../'\n"); *(wk2-1) = L'\0'; /* set end of string */ - mp = strrchrW(root, L'/'); + mp = strrchrW(root, slash); if (mp && (mp >= root)) { /* found valid backup point */ wk2 = mp + 1; - if(*(wk1+2) != L'/') + if(wk1[2] != '/' && wk1[2] != '\\') wk1 += 2; else wk1 += 3; } else { - /* did not find point, restore '/' */ - *(wk2-1) = L'/'; + /* did not find point, restore '/' */ + *(wk2-1) = slash; } } } @@ -458,7 +483,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR while ((nLen > 0) && ((lpszUrlCpy[nLen-1] == '\r')||(lpszUrlCpy[nLen-1] == '\n'))) lpszUrlCpy[--nLen]=0; - if(dwFlags & URL_UNESCAPE) + if(dwFlags & (URL_UNESCAPE | URL_FILE_USE_PATHURL)) UrlUnescapeW(lpszUrlCpy, NULL, &nLen, URL_UNESCAPE_INPLACE); if((EscapeFlags = dwFlags & (URL_ESCAPE_UNSAFE |

1 0

Rolf Kalbermatter : msrle32: Spelling fix.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: f989f620760bd6e11d677dbe90295f7e5ce1de83 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f989f620760bd6e11d677db… Author: Rolf Kalbermatter <rolf.kalbermatter(a)citeng.com> Date: Mon Dec 26 12:58:11 2005 +0100 msrle32: Spelling fix. --- dlls/msrle32/msrle32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5376688..7a4deca 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -18,7 +18,7 @@ /* TODO: * - some improvements possible - * - implement DecompressSetPalette? -- does we need it for anything? + * - implement DecompressSetPalette? -- do we need it for anything? */ #include <assert.h>

1 0

Eric Pouech : dbghelp: Internal search routines can now be case sensitive/insensitive.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: a959732fffda2455b349b8610e9f9f3ac82d10f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a959732fffda2455b349b86… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 26 12:57:26 2005 +0100 dbghelp: Internal search routines can now be case sensitive/insensitive. - Now handling option SYMOPT_CASE_INSENSITIVE for symbol search. - Quick implementation of SymSearch on top of SymEnumSymbols (should be the other way around). --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 51 +++++++++++++++++++++++++++++++++++++++++---- include/dbghelp.h | 5 ++++ 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 0d7106b..92ccd49 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -86,7 +86,7 @@ @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) @ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) -@ stub SymSearch +@ stdcall SymSearch(long double long long str double ptr ptr long) @ stdcall SymSetContext(long ptr ptr) @ stdcall SymSetOptions(long) @ stdcall SymSetParentWindow(long) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 74634d1..2e840e2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -738,7 +738,8 @@ static BOOL symt_enum_locals(struct proc BOOL ret; regex_t preg; - compile_regex(mask ? mask : "*", -1, &preg, FALSE); + compile_regex(mask ? mask : "*", -1, &preg, + dbghelp_options & SYMOPT_CASE_INSENSITIVE); ret = symt_enum_locals_helper(pcs, module, &preg, EnumSymbolsCallback, UserContext, sym_info, &((struct symt_function*)sym)->vchildren); @@ -785,8 +786,10 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce if (bang == Mask) return FALSE; - compile_regex(Mask, bang - Mask, &mod_regex, FALSE); - compile_regex(bang + 1, -1, &sym_regex, FALSE); + compile_regex(Mask, bang - Mask, &mod_regex, + dbghelp_options & SYMOPT_CASE_INSENSITIVE); + compile_regex(bang + 1, -1, &sym_regex, + dbghelp_options & SYMOPT_CASE_INSENSITIVE); for (module = pcs->lmodules; module; module = module->next) { @@ -829,7 +832,8 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce Mask = bang + 1; } - compile_regex(Mask ? Mask : "*", -1, &sym_regex, FALSE); + compile_regex(Mask ? Mask : "*", -1, &sym_regex, + dbghelp_options & SYMOPT_CASE_INSENSITIVE); symt_enum_module(module, &sym_regex, EnumSymbolsCallback, UserContext); regfree(&sym_regex); @@ -1311,3 +1315,42 @@ BOOL WINAPI SymMatchString(PCSTR string, return ret; } +/****************************************************************** + * SymSearch (DBGHELP.@) + */ +BOOL WINAPI SymSearch(HANDLE hProcess, ULONG64 BaseOfDll, DWORD Index, + DWORD SymTag, PCSTR Mask, DWORD64 Address, + PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, + PVOID UserContext, DWORD Options) +{ + TRACE("(%p %s %lu %lu %s %s %p %p %lx)\n", + hProcess, wine_dbgstr_longlong(BaseOfDll), Index, SymTag, Mask, + wine_dbgstr_longlong(Address), EnumSymbolsCallback, + UserContext, Options); + + if (Index != 0) + { + FIXME("Unsupported searching for a given Index (%lu)\n", Index); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (SymTag != 0) + { + FIXME("Unsupported searching for a given SymTag (%lu)\n", SymTag); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (Address != 0) + { + FIXME("Unsupported searching for a given Address (%s)\n", wine_dbgstr_longlong(Address)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (Options != SYMSEARCH_GLOBALSONLY) + { + FIXME("Unsupported searching with options (%lx)\n", Options); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return SymEnumSymbols(hProcess, BaseOfDll, Mask, EnumSymbolsCallback, UserContext); +} diff --git a/include/dbghelp.h b/include/dbghelp.h index c08e214..dd2aad8 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -800,6 +800,10 @@ typedef struct _TI_FINDCHILDREN_PARAMS #define UNDNAME_NO_ARGUMENTS (0x2000) #define UNDNAME_NO_SPECIAL_SYMS (0x4000) +#define SYMSEARCH_MASKOBJS 0x01 +#define SYMSEARCH_RECURSE 0x02 +#define SYMSEARCH_GLOBALSONLY 0x04 + BOOL WINAPI SymGetTypeInfo(HANDLE, DWORD64, ULONG, IMAGEHLP_SYMBOL_TYPE_INFO, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)(PSYMBOL_INFO, ULONG, PVOID); BOOL WINAPI SymEnumTypes(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); @@ -822,6 +826,7 @@ BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL, DWORD WINAPI UnDecorateSymbolName(LPCSTR, LPSTR, DWORD, DWORD); BOOL WINAPI SymMatchString(PCSTR string, PCSTR re, BOOL _case); BOOL WINAPI SymMatchStringW(PCWSTR string, PCWSTR re, BOOL _case); +BOOL WINAPI SymSearch(HANDLE, ULONG64, DWORD, DWORD, PCSTR, DWORD64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID, DWORD); /************************* * Source Files *

1 0

Maxime Bellengé : msvcrt: Prevent a crash if TlsGetValue returns NULL in DLL_THREAD_DETACH.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: def7563526f17c01d61c66f684930bda92334445 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=def7563526f17c01d61c66f… Author: Maxime Bellengé <maxime.bellenge(a)wanadoo.fr> Date: Mon Dec 26 12:57:06 2005 +0100 msvcrt: Prevent a crash if TlsGetValue returns NULL in DLL_THREAD_DETACH. --- dlls/msvcrt/main.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index a79d12f..779a293 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -70,8 +70,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, case DLL_THREAD_DETACH: /* Free TLS */ tls = TlsGetValue(msvcrt_tls_index); - HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); - HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); + if (tls) + { + HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); + HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); + } HeapFree(GetProcessHeap(), 0, tls); TRACE("finished thread free\n"); break;

1 0

Dmitry Timoshkov : x11drv: Update Canadian keyboard layout to better match the X11 one
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 328e18c2852b775412a03ffb3c9f71e0e5aa3570 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=328e18c2852b775412a03ff… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 26 12:56:26 2005 +0100 x11drv: Update Canadian keyboard layout to better match the X11 one --- dlls/x11drv/keyboard.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index 3c8e591..e011446 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -401,7 +401,7 @@ static const char main_key_ET[MAIN_LEN][ "<>" }; -/*** Canadian French keyboard layout */ +/*** Canadian French keyboard layout (setxkbmap ca_enhanced) */ static const char main_key_CF[MAIN_LEN][4] = { "#|\\","1!�","2\"@","3/�","4$�","5%�","6?�","7&�","8*�","9(�","0)�","-_�","=+�", @@ -411,13 +411,11 @@ static const char main_key_CF[MAIN_LEN][ "��" }; -/*** Canadian CAN/CSA Z243.200-92 keyboard layout - *** Contributed by Jean-Michel Dault <jmdault(a)revolutionlinux.com> */ +/*** Canadian keyboard layout (setxkbmap ca) */ static const char main_key_CA[MAIN_LEN][4] = { - "/\\","1!��","2@�","3#��","4$��","5%�","6?�","7&","8*","9(","0)","-_","=+", - "qQ","wW","eE","rR��","tT","yY","uU","iI","oO��","pP��","^��","��~", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO��","pP��","^��","��~", "aA��","sSߧ","dD��","fF","gG","hH","jJ","kK","lL",";:�","��","��", "zZ","xX","cC��","vV","bB","nN","mM��",",'",".\"��","��", "��" @@ -901,7 +899,7 @@ static const struct { {0x0406, "Danish keyboard layout", &main_key_DA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x040c, "French keyboard layout", &main_key_FR, &main_key_scan_qwerty, &main_key_vkey_azerty}, {0x0c0c, "Canadian French keyboard layout", &main_key_CF, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0c0c, "Canadian CAN/CSA-Z243.200-92 keyboard layout", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0c0c, "Canadian keyboard layout", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x080c, "Belgian keyboard layout", &main_key_BE, &main_key_scan_qwerty, &main_key_vkey_azerty}, {0x0816, "Portuguese keyboard layout", &main_key_PT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0416, "Brazilian ABNT-2 keyboard layout", &main_key_PT_br, &main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty},

1 0

Robert Shearman : Fix detection of V1a prop variant library in test suite.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 85128db39cf1960827ecb39b748c5d190563fc71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=85128db39cf1960827ecb39… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 12:56:48 2005 +0100 Fix detection of V1a prop variant library in test suite. --- dlls/ole32/tests/propvariant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index aa630c1..e8619e7 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -140,7 +140,7 @@ static void test_validtypes(void) hr = PropVariantClear(&propvar); if (hr == S_OK) { - propvar.vt = VT_I8; + propvar.vt = VT_I8 | VT_ARRAY; hr = PropVariantClear(&propvar); if (hr == S_OK) {

1 0

James Hawkins : shell32: Clean up the SHFileOperation tests.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 22ddd114a80854e4240ae0138fe2cad35c6cf56a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22ddd114a80854e4240ae01… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 26 12:56:06 2005 +0100 shell32: Clean up the SHFileOperation tests. - Make sure to create all the files used by the new tests. - Add a couple more SHFileOperation tests. - Fix some of the old tests. --- dlls/shell32/tests/shlfileop.c | 53 +++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 60418ed..fe753b7 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -75,8 +75,12 @@ static void init_shfo_tests(void) createTestFile("test1.txt"); createTestFile("test2.txt"); createTestFile("test3.txt"); + createTestFile("test_5.txt"); CreateDirectoryA("test4.txt", NULL); CreateDirectoryA("testdir2", NULL); + CreateDirectoryA("testdir2\\nested", NULL); + createTestFile("testdir2\\one.txt"); + createTestFile("testdir2\\nested\\two.txt"); } /* cleans after tests */ @@ -85,17 +89,22 @@ static void clean_after_shfo_tests(void) DeleteFileA("test1.txt"); DeleteFileA("test2.txt"); DeleteFileA("test3.txt"); + DeleteFileA("test_5.txt"); DeleteFileA("test4.txt\\test1.txt"); DeleteFileA("test4.txt\\test2.txt"); DeleteFileA("test4.txt\\test3.txt"); RemoveDirectoryA("test4.txt"); + DeleteFileA("testdir2\\one.txt"); DeleteFileA("testdir2\\test1.txt"); DeleteFileA("testdir2\\test2.txt"); DeleteFileA("testdir2\\test3.txt"); DeleteFileA("testdir2\\test4.txt\\test1.txt"); + DeleteFileA("testdir2\\nested\\two.txt"); RemoveDirectoryA("testdir2\\test4.txt"); + RemoveDirectoryA("testdir2\\nested"); RemoveDirectoryA("testdir2"); - DeleteFileA("nonexistent\\test2.txt"); + DeleteFileA("nonexistent\\notreal\\test2.txt"); + RemoveDirectoryA("nonexistent\\notreal"); RemoveDirectoryA("nonexistent"); } @@ -180,8 +189,8 @@ static void test_delete(void) { ok(!SHFileOperation(&shfo), "Failed to delete files\n"); ok(!file_exists("test1.txt"), "test1.txt should be removed\n"); + ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); } - ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); ok(file_exists("test4.txt"), "test4.txt should not be removed\n"); /* FOF_FILESONLY only deletes a dir if explicitly specified */ @@ -191,8 +200,8 @@ static void test_delete(void) { ok(!SHFileOperation(&shfo), "Failed to delete files\n"); ok(!file_exists("test4.txt"), "test4.txt should be removed\n"); + ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); } - ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); ok(file_exists("test1.txt"), "test1.txt should not be removed\n"); /* try to delete an invalid filename */ @@ -251,9 +260,9 @@ static void test_delete(void) todo_wine { ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", ret); + ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); + ok(!file_exists("testdir2\\nested"), "Expected testdir2\\nested to exist\n"); } - ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); - ok(!file_exists("testdir2\\nested"), "Expected testdir2\\nested to exist\n"); } /* tests the FO_RENAME action */ @@ -332,6 +341,22 @@ static void test_rename(void) ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + /* pFrom doesn't exist */ + shfo.pFrom = "idontexist\0"; + shfo.pTo = "newfile\0"; + retval = SHFileOperationA(&shfo); + ok(retval == 1026, "Expected 1026, got %ld\n", retval); + ok(!file_exists("newfile"), "Expected newfile to not exist\n"); + + /* pTo already exist */ + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "test2.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_ALREADY_EXISTS, "Expected ERROR_ALREADY_EXISTS, got %ld\n", retval); + } + /* pFrom is valid, but pTo is empty */ shfo.pFrom = "test1.txt\0"; shfo.pTo = "\0"; @@ -541,6 +566,18 @@ static void test_copy(void) ok(DeleteFile("testdir2\\b.txt"), "Expected testdir2\\b.txt to exist\n"); ok(RemoveDirectory("testdir2\\c.txt"), "Expected testdir2\\c.txt to exist\n"); + /* try many dest files without FOF_MULTIDESTFILES flag */ + shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; + shfo.pTo = "a.txt\0b.txt\0c.txt\0"; + shfo.fAnyOperationsAborted = FALSE; + shfo.fFlags &= ~FOF_MULTIDESTFILES; + retval = SHFileOperation(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(!file_exists("a.txt"), "Expected a.txt to not exist\n"); + /* try a glob */ shfo.pFrom = "test?.txt\0"; shfo.pTo = "testdir2\0"; @@ -660,7 +697,8 @@ static void test_copy(void) retval = SHFileOperation(&shfo); todo_wine { - ok(retval == 113, "Expected 113, got %ld\n", retval); + ok(retval == ERROR_NO_MORE_SEARCH_HANDLES, + "Expected ERROR_NO_MORE_SEARCH_HANDLES, got %ld\n", retval); ok(!shfo.fAnyOperationsAborted, "Expected no operations to be aborted\n"); ok(DeleteFile("b.txt"), "Expected b.txt to exist\n"); } @@ -730,6 +768,7 @@ static void test_copy(void) retval = SHFileOperation(&shfo); ok(retval == 1026, "Expected 1026, got %ld\n", retval); ok(!file_exists("nonexistent\\e.txt"), "Expected nonexistent\\e.txt to not exist\n"); + ok(!file_exists("nonexistent"), "Expected nonexistent to not exist\n"); } /* tests the FO_MOVE action */ @@ -883,7 +922,7 @@ static void test_move(void) { ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); } - ok(!file_exists("dir1"), "Expected dir1 to exist\n"); + ok(!file_exists("dir1"), "Expected dir1 to not exist\n"); /* try to overwrite an existing file */ shfo.pTo = "test3.txt\0";

1 0

Robert Reif : winecfg: Use hourglass cursor when opening audio drivers.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 35a92c86d537e4824b8f2da8d50c76f5d205b1d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35a92c86d537e4824b8f2da… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Dec 26 12:55:40 2005 +0100 winecfg: Use hourglass cursor when opening audio drivers. Misbehaving drivers can take a while to open so change to the hour glass cursor when opening them. --- programs/winecfg/audio.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 1d0a424..3d78e92 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -181,6 +181,7 @@ static void initAudioDeviceTree(HWND hDl HWND tree = NULL; HIMAGELIST hImageList; HBITMAP hBitMap; + HCURSOR old_cursor; tree = GetDlgItem(hDlg, IDC_AUDIO_TREE); @@ -205,6 +206,11 @@ static void initAudioDeviceTree(HWND hDl insert.u.item.cChildren = 1; root = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM)&insert); + /* change to the wait cursor because this can take a while if there is a + * misbehaving driver that takes a long time to open + */ + old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); + /* iterate over list of loaded drivers */ for (pAudioDrv = loadedAudioDrv, i = 0; *pAudioDrv->szName; i++, pAudioDrv++) { HDRVR hdrv; @@ -433,6 +439,9 @@ static void initAudioDeviceTree(HWND hDl } } + /* restore the original cursor */ + SetCursor(old_cursor); + SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_SELECTITEM, 0, 0); SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_EXPAND, TVE_EXPAND, (LPARAM)root); for (j = 0; j < i; j++) @@ -444,6 +453,7 @@ static void findAudioDrivers(void) { int numFound = 0; const AUDIO_DRIVER *pAudioDrv = NULL; + HCURSOR old_cursor; /* delete an existing list */ if (loadedAudioDrv) @@ -452,6 +462,11 @@ static void findAudioDrivers(void) loadedAudioDrv = 0; } + /* change to the wait cursor because this can take a while if there is a + * misbehaving driver that takes a long time to open + */ + old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); + for (pAudioDrv = getAudioDrivers(); *pAudioDrv->szName; pAudioDrv++) { if (strlen(pAudioDrv->szDriver)) @@ -476,6 +491,9 @@ static void findAudioDrivers(void) } } + /* restore the original cursor */ + SetCursor(old_cursor); + /* terminate list with empty driver */ loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER)); CopyMemory(&loadedAudioDrv[numFound], pAudioDrv, sizeof(AUDIO_DRIVER));

1 0

Ulrich Czekalla : atl: Implement AtlComPtrAssign.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 9da8128e4f3e0a340752053c03efda749b4126b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9da8128e4f3e0a340752053… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Mon Dec 26 12:55:22 2005 +0100 atl: Implement AtlComPtrAssign. According to MSDN AtlModuleInit should initialize the modules critical sections. --- dlls/atl/atl.spec | 2 +- dlls/atl/atl_main.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 471a194..9d0b482 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -22,7 +22,7 @@ 27 stub AtlHiMetricToPixel 28 stub AtlPixelToHiMetric 29 stub AtlDevModeW2A -30 stub AtlComPtrAssign +30 stdcall AtlComPtrAssign(ptr ptr) 31 stub AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stub AtlGetVersion diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index bcf25f0..a620f9e 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -73,6 +73,10 @@ HRESULT WINAPI AtlModuleInit(_ATL_MODULE pM->m_pObjMap = p; pM->m_hHeap = GetProcessHeap(); + InitializeCriticalSection(&pM->u.m_csTypeInfoHolder); + InitializeCriticalSection(&pM->m_csWindowCreate); + InitializeCriticalSection(&pM->m_csObjMap); + /* call mains */ i = 0; if (pM->m_pObjMap != NULL && size > ATLVer1Size) @@ -181,6 +185,17 @@ BOOL WINAPI AtlAxWinInit(void) } +IUnknown* WINAPI AtlComPtrAssign(IUnknown** pp, IUnknown *p) +{ + TRACE("(%p %p)\n", pp, p); + + if (p) IUnknown_AddRef(p); + if (*pp) IUnknown_Release(*pp); + *pp = p; + return p; +} + + HRESULT WINAPI AtlInternalQueryInterface(LPVOID this, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, LPVOID* ppvObject) { int i = 0;

1 0

lostwages/wwn wn20051223_302.xml
by WineHQ Dec. 24, 2005

Dec. 24, 2005

ChangeSet ID: 21961 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/24 01:39:43 Modified files: wwn : wn20051223_302.xml Log message: fixups in WWN #302 Patch: http://cvs.winehq.org/patch.py?id=21961 Old revision New revision Changes Path 1.1 1.2 +10 -8 lostwages/wwn/wn20051223_302.xml Index: lostwages/wwn/wn20051223_302.xml diff -u -p lostwages/wwn/wn20051223_302.xml:1.1 lostwages/wwn/wn20051223_302.xml:1.2 --- lostwages/wwn/wn20051223_302.xml:1.1 24 Dec 2005 7:39:43 -0000 +++ lostwages/wwn/wn20051223_302.xml 24 Dec 2005 7:39:43 -0000 @@ -168,7 +168,7 @@ going to beta without any real attempt freeze release cycle is not a good thing. At the very minimum I would think that we should know when the releases are going to happen but we do not even know that. -<Rant> +</Rant> </quote> Alexandre replied: @@ -261,12 +261,12 @@ and <a href="http://bugs.winehq.org">Bug and report problems. </section> <section - title="" - subject="" - archive="http://www.winehq.com/pipermail/wine-devel/2005-October/.html" - posts="" + title="OSDL Desktop Summit" + subject="[Desktop_architects] Portland, a w(h)iney comment" + archive="http://lists.osdl.org/pipermail/desktop_architects/2005-December/000354.html" + posts="1" > -<topic></topic> +<topic>Project Management</topic> We mentioned a few weeks ago (WWN <a href="http://www.winehq.com/?issue=299#Desktop%20Summit">#299</a>) there was a desktop summit being sponsored by OSDL. Well, Jeremy White and Dan @@ -297,7 +297,7 @@ and PageMaker. No one seems to care that Wine runs 3 of those 4. -<Rodney Dangerfield> We get no respect! <Rodney Dangerfield> +<Rodney Dangerfield> We get no respect! </Rodney Dangerfield> <grin> @@ -473,7 +473,9 @@ lines of code.</quote> Aric looked into it and noticed on SpecOps' <a href="http://www.specopslabs.com/partners-stratigicpartners.htm">Partners</a> -page that IBM and TurboLinux were both listed. +page that IBM and TurboLinux were both listed. Given their long history with +the community, presumably both of those companies would want to make sure the +licensing was followed. So, anyone out there have TurboLinux FUJI? Do you have the source code changes to Wine?

1 0

lostwages/ news/2005122301.xml wwn/wn20051223_ ...
by WineHQ Dec. 24, 2005

Dec. 24, 2005

ChangeSet ID: 21960 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/24 01:13:37 Added files: news : 2005122301.xml wwn : wn20051223_302.xml Log message: WWN #302 Patch: http://cvs.winehq.org/patch.py?id=21960 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2005122301.xml Added 1.1 +0 -0 lostwages/wwn/wn20051223_302.xml

1 0

lostwages/ include/winehq.conf news/2005122201.xml
by WineHQ Dec. 22, 2005

Dec. 22, 2005

ChangeSet ID: 21959 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/22 13:22:09 Modified files: include : winehq.conf Added files: news : 2005122201.xml Log message: news about Wine-0.9.4 Patch: http://cvs.winehq.org/patch.py?id=21959 Old revision New revision Changes Path 1.27 1.28 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2005122201.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.27 lostwages/include/winehq.conf:1.28 --- lostwages/include/winehq.conf:1.27 22 Dec 2005 19:22: 9 -0000 +++ lostwages/include/winehq.conf 22 Dec 2005 19:22: 9 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.3 +snapshot_date: 0.9.4 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2005122201.xml diff -u -p /dev/null lostwages/news/2005122201.xml:1.1 --- /dev/null 22 Dec 2005 19:22: 9 -0000 +++ lostwages/news/2005122201.xml 22 Dec 2005 19:22: 9 -0000 @@ -0,0 +1,30 @@ +<news> + <date>December 22, 2005</date> + <title>Wine 0.9.4 Released</title> + <body> + +Just in time for Christmas, a new CVS snapshot is out, wine-0.9.4. As +you might have noticed, we're seeing more snapshots now that we're in beta. +We'll cover that process in more detail in this week's Wine Weekly News. Until +then, happy compiling! + +Alexandre noted the following changes: +<ul> + <li>Improvements to the IDL compiler.</li> + <li>Some infrastructure work for loadable driver support.</li> + <li>The usual assortment of Direct3D improvements.</li> + <li>IME support in the edit control.</li> + <li>Better support for AVI animations.</li> + <li>Debugging support improvements.</li> + <li>Relay traces now work on NX platforms.</li> +</ul> + + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.4.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.108">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. + + </body> +</news>

1 0

Tag wine-0.9.4 : Alexandre Julliard : Release 0.9.4
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/tags/wine-0.9.4 Tag: f153d54a9b4f9681c93e085136e19026c876f994 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=f153d54a9b4f9681c93e085136… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 18:28:20 2005 +0100 Release 0.9.4

1 0

Alexandre Julliard : Release 0.9.4.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 4d05f2444a51c2eb4bf75afd9d6784368ebb9e71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d05f2444a51c2eb4bf75af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 18:28:20 2005 +0100 Release 0.9.4. --- ANNOUNCE | 20 + ChangeLog | 1128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1148 insertions(+), 20 deletions(-)

1 0

Michael Jung : shell32: Added some test to document native ITEMIDLIST format.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 259fd0340752477dbed99d5fdb6d82276911a838 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=259fd0340752477dbed99d5… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Thu Dec 22 17:16:11 2005 +0100 shell32: Added some test to document native ITEMIDLIST format. --- dlls/shell32/tests/shlfolder.c | 150 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 150 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 8c0d7f7..7a51844 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1059,6 +1059,155 @@ void test_FolderShortcut(void) { IPersistFolder3_Release(pPersistFolder3); } +#include "pshpack1.h" +struct FileStructA { + BYTE type; + BYTE dummy; + DWORD dwFileSize; + WORD uFileDate; /* In our current implementation this is */ + WORD uFileTime; /* FileTimeToDosDate(WIN32_FIND_DATA->ftLastWriteTime) */ + WORD uFileAttribs; + CHAR szName[1]; +}; + +struct FileStructW { + WORD cbLen; /* Length of this element. */ + BYTE abFooBar1[6]; /* Beyond any recognition. */ + WORD uDate; /* FileTimeToDosDate(WIN32_FIND_DATA->ftCreationTime)? */ + WORD uTime; /* (this is currently speculation) */ + WORD uDate2; /* FileTimeToDosDate(WIN32_FIND_DATA->ftLastAccessTime)? */ + WORD uTime2; /* (this is currently speculation) */ + BYTE abFooBar2[4]; /* Beyond any recognition. */ + WCHAR wszName[1]; /* The long filename in unicode. */ + /* Just for documentation: Right after the unicode string: */ + WORD cbOffset; /* FileStructW's offset from the beginning of the SHITMEID. + * SHITEMID->cb == uOffset + cbLen */ +}; +#include "poppack.h" + +void test_ITEMIDLIST_format(void) { + WCHAR wszPersonal[MAX_PATH]; + LPSHELLFOLDER psfDesktop, psfPersonal; + LPITEMIDLIST pidlPersonal, pidlFile; + HANDLE hFile; + HRESULT hr; + BOOL bResult; + WCHAR wszFile[3][17] = { { 'e','v','e','n','_',0 }, { 'o','d','d','_',0 }, + { 'l','o','n','g','e','r','_','t','h','a','n','.','8','_','3',0 } }; + int i; + + if(!pSHGetSpecialFolderPathW) return; + + bResult = pSHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); + ok(bResult, "SHGetSpecialFolderPathW failed! Last error: %08lx\n", GetLastError()); + if (!bResult) return; + + bResult = SetCurrentDirectoryW(wszPersonal); + ok(bResult, "SetCurrentDirectory failed! Last error: %ld\n", GetLastError()); + if (!bResult) return; + + hr = SHGetDesktopFolder(&psfDesktop); + ok(SUCCEEDED(hr), "SHGetDesktopFolder failed! hr: %08lx\n", hr); + if (FAILED(hr)) return; + + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszPersonal, NULL, &pidlPersonal, NULL); + ok(SUCCEEDED(hr), "psfDesktop->ParseDisplayName failed! hr = %08lx\n", hr); + if (FAILED(hr)) { + IShellFolder_Release(psfDesktop); + return; + } + + hr = IShellFolder_BindToObject(psfDesktop, pidlPersonal, NULL, &IID_IShellFolder, + (LPVOID*)&psfPersonal); + IShellFolder_Release(psfDesktop); + ILFree(pidlPersonal); + ok(SUCCEEDED(hr), "psfDesktop->BindToObject failed! hr = %08lx\n", hr); + if (FAILED(hr)) return; + + for (i=0; i<3; i++) { + CHAR szFile[MAX_PATH]; + struct FileStructA *pFileStructA; + WORD cbOffset; + + WideCharToMultiByte(CP_ACP, 0, wszFile[i], -1, szFile, MAX_PATH, NULL, NULL); + + hFile = CreateFileW(wszFile[i], GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_FLAG_WRITE_THROUGH, NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed! (%ld)\n", GetLastError()); + if (hFile == INVALID_HANDLE_VALUE) { + IShellFolder_Release(psfPersonal); + return; + } + CloseHandle(hFile); + + hr = IShellFolder_ParseDisplayName(psfPersonal, NULL, NULL, wszFile[i], NULL, &pidlFile, NULL); + DeleteFileW(wszFile[i]); + ok(SUCCEEDED(hr), "psfPersonal->ParseDisplayName failed! hr: %08lx\n", hr); + if (FAILED(hr)) { + IShellFolder_Release(psfPersonal); + return; + } + + pFileStructA = (struct FileStructA *)pidlFile->mkid.abID; + ok(pFileStructA->type == 0x32, "PIDLTYPE should be 0x32!\n"); + ok(pFileStructA->dummy == 0x00, "Dummy Byte should be 0x00!\n"); + ok(pFileStructA->dwFileSize == 0, "Filesize should be zero!\n"); + + if (i < 2) /* First two file names are already in valid 8.3 format */ + ok(!strcmp(szFile, (CHAR*)&pidlFile->mkid.abID[12]), "Wrong file name!\n"); + else + /* WinXP stores a derived 8.3 dos name (LONGER~1.8_3) here. We probably + * can't implement this correctly, since unix filesystems don't support + * this nasty short/long filename stuff. So we'll probably stay with our + * current habbit of storing the long filename here, which seems to work + * just fine. */ + todo_wine { ok(pidlFile->mkid.abID[18] == '~', "Should be derived 8.3 name!\n"); } + + if (i == 0) /* First file name has an even number of chars. No need for alignment. */ + todo_wine { ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] != '\0', + "Alignment byte, where there shouldn't be!\n"); } + + if (i == 1) /* Second file name has an uneven number of chars => alignment byte */ + ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] == '\0', + "There should be an alignment byte, but isn't!\n"); + + /* The offset of the FileStructW member is stored as a WORD at the end of the pidl. */ + cbOffset = *(WORD*)(((LPBYTE)pidlFile)+pidlFile->mkid.cb-sizeof(WORD)); + todo_wine { ok (cbOffset >= sizeof(struct FileStructA) && + cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW), + "Wrong offset value (%d) stored at the end of the PIDL\n", cbOffset); } + + if (cbOffset >= sizeof(struct FileStructA) && + cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)) + { + struct FileStructW *pFileStructW = (struct FileStructW *)(((LPBYTE)pidlFile)+cbOffset); + + ok(pidlFile->mkid.cb == cbOffset + pFileStructW->cbLen, + "FileStructW's offset and length should add up to the PIDL's length!\n"); + + if (pidlFile->mkid.cb == cbOffset + pFileStructW->cbLen) { + /* Since we just created the file, time of creation, + * time of last access and time of last write access just be the same. + * These tests seem to fail sometimes (on WinXP), if the test is run again shortly + * after the first run. I do remember something with NTFS keeping the creation time + * if a file is deleted and then created again within a couple of seconds or so. + * Might be the reason. */ + ok (pFileStructA->uFileDate == pFileStructW->uDate && + pFileStructA->uFileTime == pFileStructW->uTime, + "Last write time should match creation time!\n"); + + ok (pFileStructA->uFileDate == pFileStructW->uDate2 && + pFileStructA->uFileTime == pFileStructW->uTime2, + "Last write time should match last access time!\n"); + + ok (!lstrcmpW(wszFile[i], pFileStructW->wszName), + "The filename should be stored in unicode at this position!\n"); + } + } + + ILFree(pidlFile); + } +} + START_TEST(shlfolder) { init_function_pointers(); @@ -1074,6 +1223,7 @@ START_TEST(shlfolder) test_SHGetPathFromIDList(); test_CallForAttributes(); test_FolderShortcut(); + test_ITEMIDLIST_format(); OleUninitialize(); }

1 0

Alexandre Julliard : user/tests: Remove todo_wine from a few tests that (usually) succeed.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 0e6b4c43de329e298058bb4eb98e6140e3b13231 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e6b4c43de329e298058bb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 17:15:54 2005 +0100 user/tests: Remove todo_wine from a few tests that (usually) succeed. --- dlls/user/tests/msg.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 449f604..3cdaf5e 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -6775,9 +6775,7 @@ static void test_PeekMessage(void) qs_all_input &= ~QS_RAWINPUT; qs_input &= ~QS_RAWINPUT; } -todo_wine { ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus); -} trace("signalling to send message\n"); SetEvent(info.hevent[EV_SENDMSG]); @@ -6790,13 +6788,11 @@ todo_wine { ok(GetLastError() == ERROR_INVALID_FLAGS, "wrong error %ld\n", GetLastError()); qstatus = GetQueueStatus(qs_all_input); -todo_wine { ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE), "wrong qstatus %08lx\n", qstatus); -} while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(WmUser, "WmUser", TRUE); /* todo_wine */ + ok_sequence(WmUser, "WmUser", FALSE); qstatus = GetQueueStatus(qs_all_input); ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus);

1 0

Dmitry Timoshkov : mciavi32: Rewrite asynchronous MCI_PLAY command handling.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 43cbb44f4fe9ebd68cf86d8dec5a70df6c5e92ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43cbb44f4fe9ebd68cf86d8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 22 17:15:33 2005 +0100 mciavi32: Rewrite asynchronous MCI_PLAY command handling. Rewrite asynchronous MCI_PLAY command handling in MCIAVI driver, make it more responsive to commands in the MCI_MODE_PLAY state by checking hStopEvent even if the time frame between frames has expired. --- dlls/mciavi32/mciavi.c | 155 +++++++++++++++++++--------------------- dlls/mciavi32/private_mciavi.h | 1 2 files changed, 75 insertions(+), 81 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 8f1074c..a1f04f9 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -44,74 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static DWORD MCIAVI_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); -/* =================================================================== - * =================================================================== - * FIXME: should be using the new mmThreadXXXX functions from WINMM - * instead of those - * it would require to add a wine internal flag to mmThreadCreate - * in order to pass a 32 bit function instead of a 16 bit one - * =================================================================== - * =================================================================== */ - -struct SCA { - MCIDEVICEID wDevID; - UINT wMsg; - DWORD_PTR dwParam1; - DWORD_PTR dwParam2; -}; - -/************************************************************************** - * MCI_SCAStarter [internal] - */ -static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) -{ - struct SCA* sca = (struct SCA*)arg; - DWORD ret; - - TRACE("In thread before async command (%08x,%04x,%08lx,%08lx)\n", - sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); - ret = mciSendCommandA(sca->wDevID, sca->wMsg, sca->dwParam1 | MCI_WAIT, sca->dwParam2); - TRACE("In thread after async command (%08x,%04x,%08lx,%08lx)\n", - sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); - HeapFree(GetProcessHeap(), 0, sca); - return ret; -} - -/************************************************************************** - * MCI_SendCommandAsync [internal] - */ -static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, - DWORD_PTR dwParam2, UINT size) -{ - HANDLE handle; - struct SCA* sca = HeapAlloc(GetProcessHeap(), 0, sizeof(struct SCA) + size); - - if (sca == 0) - return MCIERR_OUT_OF_MEMORY; - - sca->wDevID = wDevID; - sca->wMsg = wMsg; - sca->dwParam1 = dwParam1; - - if (size && dwParam2) { - sca->dwParam2 = (DWORD_PTR)sca + sizeof(struct SCA); - /* copy structure passed by program in dwParam2 to be sure - * we can still use it whatever the program does - */ - memcpy((LPVOID)sca->dwParam2, (LPVOID)dwParam2, size); - } else { - sca->dwParam2 = dwParam2; - } - - if ((handle = CreateThread(NULL, 0, MCI_SCAStarter, sca, 0, NULL)) == 0) { - WARN("Couldn't allocate thread for async command handling, sending synchronously\n"); - return MCI_SCAStarter(&sca); - } - SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); - CloseHandle(handle); - return 0; -} - /*======================================================================* * MCI AVI implemantation * *======================================================================*/ @@ -152,6 +84,7 @@ static DWORD MCIAVI_drvOpen(LPCWSTR str, return 0; InitializeCriticalSection(&wma->cs); + wma->ack_event = CreateEventW(NULL, FALSE, FALSE, NULL); wma->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wma->wDevID = modp->wDeviceID; wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, mciAviWStr, 0); @@ -184,6 +117,7 @@ static DWORD MCIAVI_drvClose(DWORD dwDev mciSetDriverData(dwDevID, 0); mciFreeCommandResource(wma->wCommandTable); + CloseHandle(wma->ack_event); CloseHandle(wma->hStopEvent); LeaveCriticalSection(&wma->cs); @@ -393,6 +327,61 @@ DWORD MCIAVI_mciClose(UINT wDevID, DWORD return dwRet; } +static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms); + +struct MCIAVI_play_data +{ + MCIDEVICEID wDevID; + DWORD flags; + MCI_PLAY_PARMS params; +}; + +/* + * MCIAVI_mciPlay_thread + * + * FIXME: probably should use a common worker thread created at the driver + * load time and queue all async commands to it. + */ +static DWORD WINAPI MCIAVI_mciPlay_thread(LPVOID arg) +{ + struct MCIAVI_play_data *data = (struct MCIAVI_play_data *)arg; + DWORD ret; + + TRACE("In thread before async play command (id %08x, flags %08lx)\n", data->wDevID, data->flags); + ret = MCIAVI_mciPlay(data->wDevID, data->flags | MCI_WAIT, &data->params); + TRACE("In thread after async play command (id %08x, flags %08lx)\n", data->wDevID, data->flags); + + HeapFree(GetProcessHeap(), 0, data); + return ret; +} + +/* + * MCIAVI_mciPlay_async + */ +static DWORD MCIAVI_mciPlay_async(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpParams) +{ + HANDLE handle, ack_event = wma->ack_event; + struct MCIAVI_play_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(struct MCIAVI_play_data)); + + if (!data) return MCIERR_OUT_OF_MEMORY; + + data->wDevID = wma->wDevID; + data->flags = dwFlags; + memcpy(&data->params, lpParams, sizeof(MCI_PLAY_PARMS)); + + if (!(handle = CreateThread(NULL, 0, MCIAVI_mciPlay_thread, data, 0, NULL))) + { + WARN("Couldn't create thread for async play, playing synchronously\n"); + return MCIAVI_mciPlay_thread(data); + } + SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); + CloseHandle(handle); + /* wait until the thread starts up, so the app could see a changed status */ + WaitForSingleObject(ack_event, INFINITE); + TRACE("Async play has started\n"); + return 0; +} + /*************************************************************************** * MCIAVI_mciPlay [internal] */ @@ -429,10 +418,8 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, LeaveCriticalSection(&wma->cs); - if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wDevID, MCI_PLAY, dwFlags, - (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); - } + if (!(dwFlags & MCI_WAIT)) + return MCIAVI_mciPlay_async(wma, dwFlags, lpParms); if (!(GetWindowLongW(wma->hWndPaint, GWL_STYLE) & WS_VISIBLE)) ShowWindow(wma->hWndPaint, SW_SHOWNA); @@ -460,16 +447,20 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, if (wma->dwStatus == MCI_MODE_PLAY) { LeaveCriticalSection(&wma->cs); + SetEvent(wma->ack_event); return 0; } if (wma->dwToVideoFrame <= wma->dwCurrVideoFrame) { dwRet = 0; + SetEvent(wma->ack_event); goto mci_play_done; } wma->dwStatus = MCI_MODE_PLAY; + /* signal the state change */ + SetEvent(wma->ack_event); if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_DGV_PLAY_REVERSE|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN)) FIXME("Unsupported flag %08lx\n", dwFlags); @@ -492,6 +483,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, while (wma->dwStatus == MCI_MODE_PLAY) { HDC hDC; + DWORD ret; tc = GetTickCount(); @@ -504,7 +496,6 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, if (wma->lpWaveFormat) { HANDLE events[2]; - DWORD ret; events[0] = wma->hStopEvent; events[1] = wma->hEvent; @@ -522,15 +513,15 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, delta = GetTickCount() - tc; if (delta < frameTime) - { - DWORD ret; + delta = frameTime - delta; + else + delta = 0; - LeaveCriticalSection(&wma->cs); - ret = MsgWaitForMultipleObjectsEx(1, &wma->hStopEvent, frameTime - delta, - QS_ALLINPUT, MWMO_INPUTAVAILABLE); - EnterCriticalSection(&wma->cs); - if (ret == WAIT_OBJECT_0) break; - } + LeaveCriticalSection(&wma->cs); + ret = MsgWaitForMultipleObjectsEx(1, &wma->hStopEvent, delta, + QS_ALLINPUT, MWMO_INPUTAVAILABLE); + EnterCriticalSection(&wma->cs); + if (ret == WAIT_OBJECT_0) break; if (wma->dwCurrVideoFrame < dwToFrame) wma->dwCurrVideoFrame++; @@ -618,6 +609,8 @@ static DWORD MCIAVI_mciStop(UINT wDevID, EnterCriticalSection(&wma->cs); + TRACE("current status %04lx\n", wma->dwStatus); + switch (wma->dwStatus) { case MCI_MODE_PLAY: case MCI_MODE_RECORD: diff --git a/dlls/mciavi32/private_mciavi.h b/dlls/mciavi32/private_mciavi.h index 2cbed11..cd11f76 100644 --- a/dlls/mciavi32/private_mciavi.h +++ b/dlls/mciavi32/private_mciavi.h @@ -80,6 +80,7 @@ typedef struct { /* data for the background mechanism */ CRITICAL_SECTION cs; HANDLE hStopEvent; + HANDLE ack_event; /* acknowledge that an async command has started */ } WINE_MCIAVI; extern HINSTANCE MCIAVI_hInstance;

1 0

Ulrich Czekalla : ole32: Return error instead of asserting if storage file is corrupt.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 707fa2c3a25421a0a805ab466cdc90e3ddc89ed4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=707fa2c3a25421a0a805ab4… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Thu Dec 22 17:15:05 2005 +0100 ole32: Return error instead of asserting if storage file is corrupt. --- dlls/ole32/stg_stream.c | 37 +++++++++++++------------------------ dlls/ole32/storage32.c | 32 +++++++++++++++++++++----------- dlls/ole32/storage32.h | 2 +- include/winerror.h | 1 + 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 928028b..40f0e81 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -273,7 +273,7 @@ static HRESULT WINAPI StgStreamImpl_Read */ if (This->smallBlockChain!=0) { - SmallBlockChainStream_ReadAt(This->smallBlockChain, + res = SmallBlockChainStream_ReadAt(This->smallBlockChain, This->currentPosition, bytesToReadFromBuffer, pv, @@ -282,7 +282,7 @@ static HRESULT WINAPI StgStreamImpl_Read } else if (This->bigBlockChain!=0) { - BlockChainStream_ReadAt(This->bigBlockChain, + res = BlockChainStream_ReadAt(This->bigBlockChain, This->currentPosition, bytesToReadFromBuffer, pv, @@ -300,30 +300,19 @@ static HRESULT WINAPI StgStreamImpl_Read goto end; } - /* - * We should always be able to read the proper amount of data from the - * chain. - */ - assert(bytesToReadFromBuffer == *pcbRead); - - /* - * Advance the pointer for the number of positions read. - */ - This->currentPosition.u.LowPart += *pcbRead; - - if(*pcbRead != cb) + if (SUCCEEDED(res)) { - WARN("read %ld instead of the required %ld bytes !\n", *pcbRead, cb); - /* - * this used to return S_FALSE, however MSDN docu says that an app should - * be prepared to handle error in case of stream end reached, as *some* - * implementations *might* return an error (IOW: most do *not*). - * As some program fails on returning S_FALSE, I better use S_OK here. - */ - res = S_OK; + /* + * We should always be able to read the proper amount of data from the + * chain. + */ + assert(bytesToReadFromBuffer == *pcbRead); + + /* + * Advance the pointer for the number of positions read. + */ + This->currentPosition.u.LowPart += *pcbRead; } - else - res = S_OK; end: TRACE("<-- %08lx\n", res); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 708d994..c9d696e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3414,7 +3414,8 @@ BlockChainStream* Storage32Impl_SmallBlo ULARGE_INTEGER size, offset; ULONG cbRead, cbWritten, cbTotalRead, cbTotalWritten; ULONG propertyIndex; - BOOL successRead, successWrite; + BOOL successWrite; + HRESULT successRead; StgProperty chainProperty; BYTE *buffer; BlockChainStream *bbTempChain = NULL; @@ -3463,7 +3464,7 @@ BlockChainStream* Storage32Impl_SmallBlo offset.u.LowPart += This->smallBlockSize; - } while (successRead && successWrite); + } while (SUCCEEDED(successRead) && successWrite); HeapFree(GetProcessHeap(),0,buffer); assert(cbTotalRead == cbTotalWritten); @@ -4397,6 +4398,9 @@ BOOL BlockChainStream_ReadAt(BlockChainS blockNoInSequence--; } + if ((blockNoInSequence > 0) && (blockIndex == BLOCK_END_OF_CHAIN)) + return FALSE; /* We failed to find the starting block */ + This->lastBlockNoInSequenceIndex = blockIndex; /* @@ -5098,13 +5102,14 @@ ULONG SmallBlockChainStream_GetNextFreeB * bytesRead may be NULL. * Failure will be returned if the specified number of bytes has not been read. */ -BOOL SmallBlockChainStream_ReadAt( +HRESULT SmallBlockChainStream_ReadAt( SmallBlockChainStream* This, ULARGE_INTEGER offset, ULONG size, void* buffer, ULONG* bytesRead) { + HRESULT rc = S_OK; ULARGE_INTEGER offsetInBigBlockFile; ULONG blockNoInSequence = offset.u.LowPart / This->parentStorage->smallBlockSize; @@ -5127,9 +5132,9 @@ BOOL SmallBlockChainStream_ReadAt( while ( (blockNoInSequence > 0) && (blockIndex != BLOCK_END_OF_CHAIN)) { - if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, - &blockIndex))) - return FALSE; + rc = SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex); + if(FAILED(rc)) + return rc; blockNoInSequence--; } @@ -5158,27 +5163,32 @@ BOOL SmallBlockChainStream_ReadAt( /* * Read those bytes in the buffer from the small block file. + * The small block has already been identified so it shouldn't fail + * unless the file is corrupt. */ - BlockChainStream_ReadAt(This->parentStorage->smallBlockRootChain, + if (!BlockChainStream_ReadAt(This->parentStorage->smallBlockRootChain, offsetInBigBlockFile, bytesToReadInBuffer, bufferWalker, - &bytesReadFromBigBlockFile); + &bytesReadFromBigBlockFile)) + return STG_E_DOCFILECORRUPT; assert(bytesReadFromBigBlockFile == bytesToReadInBuffer); /* * Step to the next big block. */ - if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex))) - return FALSE; + rc = SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex); + if(FAILED(rc)) + return rc; + bufferWalker += bytesToReadInBuffer; size -= bytesToReadInBuffer; *bytesRead += bytesToReadInBuffer; offsetInBlock = 0; /* There is no offset on the next block */ } - return (size == 0); + return rc; } /****************************************************************************** diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 4061a06..0472524 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -667,7 +667,7 @@ void SmallBlockChainStream_FreeBlock( ULONG SmallBlockChainStream_GetNextFreeBlock( SmallBlockChainStream* This); -BOOL SmallBlockChainStream_ReadAt( +HRESULT SmallBlockChainStream_ReadAt( SmallBlockChainStream* This, ULARGE_INTEGER offset, ULONG size, diff --git a/include/winerror.h b/include/winerror.h index bf866da..b824c79 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1691,6 +1691,7 @@ #define STG_E_SHAREREQUIRED _HRESULT_TYPEDEF_(0x80030106L) #define STG_E_NOTFILEBASEDSTORAGE _HRESULT_TYPEDEF_(0x80030107L) #define STG_E_EXTANTMARSHALLINGS _HRESULT_TYPEDEF_(0x80030108L) +#define STG_E_DOCFILECORRUPT _HRESULT_TYPEDEF_(0x80030109L) #define STG_E_STATUS_COPY_PROTECTION_FAILURE _HRESULT_TYPEDEF_(0x80030305L) #define STG_E_CSS_AUTHENTICATION_FAILURE _HRESULT_TYPEDEF_(0x80030306L)

1 0

Dmitry Timoshkov : user32/tests: Add a PeekMessage test.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: b61b82011e616eb369dbfb01c036d6c796866ea5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b61b82011e616eb369dbfb0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 22 13:58:11 2005 +0100 user32/tests: Add a PeekMessage test. --- dlls/user/tests/msg.c | 285 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 284 insertions(+), 1 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 5d54386..449f604 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -24,7 +24,7 @@ #include <stdarg.h> #include <stdio.h> -#define _WIN32_WINNT 0x0500 /* For WM_CHANGEUISTATE */ +#define _WIN32_WINNT 0x0501 /* For WM_CHANGEUISTATE,QS_RAWINPUT */ #include "windef.h" #include "winbase.h" @@ -6680,6 +6680,288 @@ static void test_edit_messages(void) /**************************** End of Edit test ******************************/ +static const struct message WmChar[] = { + { WM_CHAR, sent|wparam, 'z' }, + { 0 } +}; + +static const struct message WmKeyDownUp[] = { + { WM_KEYDOWN, sent|wparam|lparam, 'N', 0x00000001 }, + { WM_KEYUP, sent|wparam|lparam, 'N', 0xc0000001 }, + { 0 } +}; + +static const struct message WmUserChar[] = { + { WM_USER, sent }, + { WM_CHAR, sent|wparam, 'z' }, + { 0 } +}; + +#define EV_START_STOP 0 +#define EV_SENDMSG 1 +#define EV_ACK 2 + +struct thread_info_2 +{ + HWND hwnd; + HANDLE hevent[3]; /* 0 - start/stop, 1 - SendMessage, 2 - ack */ +}; + +static DWORD CALLBACK send_msg_thread_2(void *param) +{ + DWORD ret; + struct thread_info_2 *info = param; + + trace("thread: waiting for start\n"); + WaitForSingleObject(info->hevent[EV_START_STOP], INFINITE); + trace("thread: looping\n"); + + while (1) + { + ret = WaitForMultipleObjects(2, info->hevent, FALSE, INFINITE); + + switch (ret) + { + case WAIT_OBJECT_0 + EV_START_STOP: + trace("thread: exiting\n"); + return 0; + + case WAIT_OBJECT_0 + EV_SENDMSG: + trace("thread: sending message\n"); + SendNotifyMessageA(info->hwnd, WM_USER, 0, 0); + SetEvent(info->hevent[EV_ACK]); + break; + + default: + trace("unexpected return: %04lx\n", ret); + assert(0); + break; + } + } + return 0; +} + +static void test_PeekMessage(void) +{ + MSG msg; + HANDLE hthread; + DWORD tid, qstatus; + UINT qs_all_input = QS_ALLINPUT; + UINT qs_input = QS_INPUT; + struct thread_info_2 info; + + info.hwnd = CreateWindowA("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ShowWindow(info.hwnd, SW_SHOW); + UpdateWindow(info.hwnd); + + info.hevent[EV_START_STOP] = CreateEventA(NULL, 0, 0, NULL); + info.hevent[EV_SENDMSG] = CreateEventA(NULL, 0, 0, NULL); + info.hevent[EV_ACK] = CreateEventA(NULL, 0, 0, NULL); + + hthread = CreateThread(NULL, 0, send_msg_thread_2, &info, 0, &tid); + + trace("signalling to start looping\n"); + SetEvent(info.hevent[EV_START_STOP]); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + flush_sequence(); + + SetLastError(0xdeadbeef); + qstatus = GetQueueStatus(qs_all_input); + if (GetLastError() == ERROR_INVALID_FLAGS) + { + trace("QS_RAWINPUT not supported on this platform\n"); + qs_all_input &= ~QS_RAWINPUT; + qs_input &= ~QS_RAWINPUT; + } +todo_wine { + ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus); +} + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + /* pass invalid QS_xxxx flags */ + SetLastError(0xdeadbeef); + qstatus = GetQueueStatus(0xffffffff); + ok(qstatus == 0, "GetQueueStatus should fail: %08lx\n", qstatus); + ok(GetLastError() == ERROR_INVALID_FLAGS, "wrong error %ld\n", GetLastError()); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(WmUser, "WmUser", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus); + + keybd_event('N', 0, 0, 0); + keybd_event('N', 0, KEYEVENTF_KEYUP, 0); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_KEY, QS_KEY), + "wrong qstatus %08lx\n", qstatus); + + PostMessageA(info.hwnd, WM_CHAR, 'z', 0); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); + + InvalidateRect(info.hwnd, NULL, FALSE); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_PAINT, QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (qs_input << 16))) DispatchMessageA(&msg); + ok_sequence(WmUser, "WmUser", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_POSTMESSAGE)) DispatchMessageA(&msg); + ok_sequence(WmUser, "WmUser", FALSE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_POSTMESSAGE)) DispatchMessageA(&msg); + ok_sequence(WmChar, "WmChar", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_PAINT|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_PAINT)) DispatchMessageA(&msg); + ok_sequence(WmPaint, "WmPaint", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + PostMessageA(info.hwnd, WM_CHAR, 'z', 0); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, WM_CHAR, WM_CHAR, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmUserChar, "WmUserChar", FALSE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + PostMessageA(info.hwnd, WM_CHAR, 'z', 0); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (QS_KEY << 16))) DispatchMessage(&msg); + ok_sequence(WmUser, "WmUser", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (QS_RAWINPUT << 16))) DispatchMessage(&msg); + ok_sequence(WmKeyDownUp, "WmKeyDownUp", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE)) DispatchMessage(&msg); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(WmChar, "WmChar", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, + "wrong qstatus %08lx\n", qstatus); + + trace("signalling to exit\n"); + SetEvent(info.hevent[EV_START_STOP]); + + WaitForSingleObject(hthread, INFINITE); + + CloseHandle(hthread); + CloseHandle(info.hevent[0]); + CloseHandle(info.hevent[1]); + CloseHandle(info.hevent[2]); + + DestroyWindow(info.hwnd); +} + + START_TEST(msg) { BOOL ret; @@ -6723,6 +7005,7 @@ START_TEST(msg) hEvent_hook = 0; #endif + test_PeekMessage(); test_scrollwindowex(); test_messages(); test_mdi_messages();

1 0

Eric Pouech : kernel/tests: Check that we successfully open the console.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 8218d91758dfc805a3fee2e9cb039df473fd7e2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8218d91758dfc805a3fee2e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Dec 22 13:55:03 2005 +0100 kernel/tests: Check that we successfully open the console. --- dlls/kernel/tests/console.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/tests/console.c b/dlls/kernel/tests/console.c index a7f3253..edd1eff 100644 --- a/dlls/kernel/tests/console.c +++ b/dlls/kernel/tests/console.c @@ -567,7 +567,7 @@ START_TEST(console) /* first, we detach and open a fresh console to play with */ FreeConsole(); - AllocConsole(); + ok(AllocConsole(), "Couldn't alloc console\n"); hConIn = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); hConOut = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); @@ -585,7 +585,6 @@ START_TEST(console) /* will test line scrolling at the bottom of the screen */ /* testBottomScroll(); */ /* will test all the scrolling operations */ - /* this one is disabled for now, Wine's result are way too bad */ testScroll(hConOut, sbi.dwSize); /* will test sb creation / modification... */ /* testScreenBuffer() */

1 0

Alexandre Julliard : server: Fixed console access rights handling.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: b4fa1b914c70d621343254d289579ab8b8e53ede URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4fa1b914c70d621343254d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 13:54:34 2005 +0100 server: Fixed console access rights handling. --- server/console.c | 58 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 21 deletions(-)

1 0

Raphael Junqueira : opengl: Fix last wgl regression.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 2d708edc5f715c2957790b3f926cf308f679de59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d708edc5f715c2957790b3… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Thu Dec 22 13:54:01 2005 +0100 opengl: Fix last wgl regression. Fix wgl regression: test glx server version and extensions to use (and not use glXQueryDrawable on older glx implementations). --- dlls/opengl32/wgl.c | 147 ++++++++++++++++++++++++++++++++++++----------- dlls/opengl32/wgl_ext.c | 13 +++- dlls/opengl32/wgl_ext.h | 13 ++++ 3 files changed, 133 insertions(+), 40 deletions(-)

1 0

James Hawkins : shell32: Add tests for SHFileOperation's FO_MOVE command.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 036d5eff7bf6d2146d036066336aff842d15c988 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=036d5eff7bf6d2146d03606… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 22 11:19:13 2005 +0100 shell32: Add tests for SHFileOperation's FO_MOVE command. --- dlls/shell32/tests/shlfileop.c | 81 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index e73a513..60418ed 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -738,6 +738,7 @@ static void test_move(void) SHFILEOPSTRUCTA shfo, shfo2; CHAR from[MAX_PATH]; CHAR to[MAX_PATH]; + DWORD retval; shfo.hwnd = NULL; shfo.wFunc = FO_MOVE; @@ -750,7 +751,8 @@ static void test_move(void) set_curr_dir_path(from, "test1.txt\0"); set_curr_dir_path(to, "test4.txt\0"); ok(!SHFileOperationA(&shfo), "Prepare test to check how directories are moved recursively\n"); - ok(file_exists("test4.txt\\test1.txt"), "The file is moved\n"); + ok(!file_exists("test1.txt"), "test1.txt should not exist\n"); + ok(file_exists("test4.txt\\test1.txt"), "The file is not moved\n"); set_curr_dir_path(from, "test?.txt\0"); set_curr_dir_path(to, "testdir2\0"); @@ -815,6 +817,83 @@ static void test_move(void) set_curr_dir_path(from, "test6.txt\0"); set_curr_dir_path(to, "test4.txt\0"); ok(!SHFileOperationA(&shfo), "Move dir back\n"); + + /* move one file to two others */ + init_shfo_tests(); + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "a.txt\0b.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", retval); + ok(!file_exists("test1.txt"), "Expected test1.txt to not exist\n"); + ok(DeleteFile("a.txt"), "Expected a.txt to exist\n"); + } + ok(!file_exists("b.txt"), "Expected b.txt to not exist\n"); + + /* move two files to one other */ + shfo.pFrom = "test2.txt\0test3.txt\0"; + shfo.pTo = "test1.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + ok(!file_exists("test1.txt"), "Expected test1.txt to not exist\n"); + } + ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); + + /* move a directory into itself */ + shfo.pFrom = "test4.txt\0"; + shfo.pTo = "test4.txt\\b.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", retval); + } + ok(!RemoveDirectory("test4.txt\\b.txt"), "Expected test4.txt\\b.txt to not exist\n"); + ok(file_exists("test4.txt"), "Expected test4.txt to exist\n"); + + /* move many files without FOF_MULTIDESTFILES */ + shfo.pFrom = "test2.txt\0test3.txt\0"; + shfo.pTo = "d.txt\0e.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(!DeleteFile("d.txt"), "Expected d.txt to not exist\n"); + ok(!DeleteFile("e.txt"), "Expected e.txt to not exist\n"); + + /* number of sources != number of targets */ + shfo.pTo = "d.txt\0"; + shfo.fFlags |= FOF_MULTIDESTFILES; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(!DeleteFile("d.txt"), "Expected d.txt to not exist\n"); + + /* FO_MOVE does not create dest directories */ + shfo.pFrom = "test2.txt\0"; + shfo.pTo = "dir1\\dir2\\test2.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(!file_exists("dir1"), "Expected dir1 to exist\n"); + + /* try to overwrite an existing file */ + shfo.pTo = "test3.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", retval); + ok(!file_exists("test2.txt"), "Expected test2.txt to not exist\n"); + } + ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); } static void test_sh_create_dir(void)

1 0

James Hawkins : shell32: Add tests for SHFileOperation's FO_COPY command.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: d49181f99a1b4a2a0c719928b418c1c096811911 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d49181f99a1b4a2a0c71992… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 22 11:17:19 2005 +0100 shell32: Add tests for SHFileOperation's FO_COPY command. --- dlls/shell32/tests/shlfileop.c | 280 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 272 insertions(+), 8 deletions(-)

1 0

James Hawkins : shell32: Add tests for SHFileOperation's FO_RENAME command.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: edf423ab8693f0c8883ef9bef1329e2de7465984 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=edf423ab8693f0c8883ef9b… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 22 11:16:57 2005 +0100 shell32: Add tests for SHFileOperation's FO_RENAME command. --- dlls/shell32/tests/shlfileop.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 1a6edd5..7a0c22a 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -323,6 +323,40 @@ static void test_rename(void) set_curr_dir_path(to, "test4.txt\0"); retval = SHFileOperationA(&shfo); ok(!retval, "Rename dir back failed, retval = %ld\n", retval); + + /* try to rename more than one file to a single file */ + shfo.pFrom = "test1.txt\0test2.txt\0"; + shfo.pTo = "a.txt\0"; + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_GEN_FAILURE, "Expected ERROR_GEN_FAILURE, got %ld\n", retval); + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + + /* pFrom is valid, but pTo is empty */ + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + + /* pFrom is empty */ + shfo.pFrom = "\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %ld\n", retval); + } + + /* pFrom is NULL */ + shfo.pFrom = NULL; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", retval); + } } /* tests the FO_COPY action */

1 0

James Hawkins : shell32: Add tests for SHFileOperation's FO_DELETE command.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: d3c3bc1d3a29d7e8aacfcf04c07331fc83b7dff7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d3c3bc1d3a29d7e8aacfcf0… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 22 11:15:42 2005 +0100 shell32: Add tests for SHFileOperation's FO_DELETE command. --- dlls/shell32/tests/shlfileop.c | 83 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index a850c3b..1a6edd5 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -171,6 +171,89 @@ static void test_delete(void) ok(!file_exists("test4.txt"), "Directory should be removed\n"); } ok(file_exists("test2.txt"), "This file should not be removed\n"); + + /* FOF_FILESONLY does not delete a dir matching a wildcard */ + init_shfo_tests(); + shfo.fFlags |= FOF_FILESONLY; + shfo.pFrom = "*.txt\0"; + todo_wine + { + ok(!SHFileOperation(&shfo), "Failed to delete files\n"); + ok(!file_exists("test1.txt"), "test1.txt should be removed\n"); + } + ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); + ok(file_exists("test4.txt"), "test4.txt should not be removed\n"); + + /* FOF_FILESONLY only deletes a dir if explicitly specified */ + init_shfo_tests(); + shfo.pFrom = "test_?.txt\0test4.txt\0"; + todo_wine + { + ok(!SHFileOperation(&shfo), "Failed to delete files\n"); + ok(!file_exists("test4.txt"), "test4.txt should be removed\n"); + } + ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); + ok(file_exists("test1.txt"), "test1.txt should not be removed\n"); + + /* try to delete an invalid filename */ + init_shfo_tests(); + shfo.pFrom = "\0"; + shfo.fFlags &= ~FOF_FILESONLY; + shfo.fAnyOperationsAborted = FALSE; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %ld\n", ret); + } + ok(!shfo.fAnyOperationsAborted, "Expected no aborted operations\n"); + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + + /* try an invalid function */ + init_shfo_tests(); + shfo.pFrom = "test1.txt\0"; + shfo.wFunc = 0; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); + } + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + + /* try an invalid list, only one null terminator */ + init_shfo_tests(); + shfo.pFrom = ""; + shfo.wFunc = FO_DELETE; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %ld\n", ret); + } + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + + /* delete a dir, and then a file inside the dir, same as + * deleting a nonexistent file + */ + init_shfo_tests(); + shfo.pFrom = "testdir2\0testdir2\\one.txt\0"; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %ld\n", ret); + ok(!file_exists("testdir2"), "Expected testdir2 to not exist\n"); + } + ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); + + /* try the FOF_NORECURSION flag, continues deleting subdirs */ + init_shfo_tests(); + shfo.pFrom = "testdir2\0"; + shfo.fFlags |= FOF_NORECURSION; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", ret); + } + ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); + ok(!file_exists("testdir2\\nested"), "Expected testdir2\\nested to exist\n"); } /* tests the FO_RENAME action */

1 0

Robert Reif : winecfg: Add unmanaged windows configuration.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: e998da5e0738266e03fb5e4623611f3cf738665c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e998da5e0738266e03fb5e4… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Dec 22 11:15:32 2005 +0100 winecfg: Add unmanaged windows configuration. --- programs/winecfg/En.rc | 26 +++++++++++++++----------- programs/winecfg/x11drvdlg.c | 18 ++++++++++++++++++ 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 3f37bf8..887aa81 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -65,28 +65,31 @@ BEGIN LTEXT "Screen color depth: ",IDC_STATIC,8,10,70,30 COMBOBOX IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Window settings ",IDC_STATIC,8,25,244,110 + GROUPBOX " Window settings ",IDC_STATIC,8,25,244,180 CONTROL "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Enable desktop double buffering",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + LTEXT "If windows are managed by your window manager, then they will have the standard borders, they will respect your virtual desktop and appear in your window list. \n\nIf the windows are unmanaged, they will be disconnected from your window manager. This will mean the windows do not integrate as closely with your desktop, but the emulation will be more accurate so it can help some programs to work better.", + IDC_STATIC,15,58,228,80 + CONTROL "Allow the window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 /* FIXME: the wording of this explanation could be a lot better */ LTEXT "You can choose to emulate a windows desktop, where all the windows are confined to one 'virtual screen', or you can have the windows placed on your standard desktop.", - IDC_STATIC,15,73,228,28 - LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED + IDC_STATIC,15,146,228,28 + LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,188,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,108,188,8,8,WS_DISABLED CONTROL "Emulate a virtual desktop",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + BS_AUTOCHECKBOX | WS_TABSTOP,15,173,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,64,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,140,244,120 + GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 - LTEXT "Vertex Shader Support: ",IDC_STATIC,15,150,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,148,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vertex Shader Support: ",IDC_STATIC,15,220,80,30 + COMBOBOX IDC_D3D_VSHADER_MODE,100,218,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,230,10 + CONTROL "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -219,6 +222,7 @@ BEGIN CONTROL "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Enable desktop double buffering",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + CONTROL "Allow the window manager to manage created windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,55,230,8 GROUPBOX " Window settings ",IDC_STATIC,8,25,244,110 diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 4f93241..9348bbd 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -154,6 +154,13 @@ static void init_dialog(HWND dialog) } HeapFree(GetProcessHeap(), 0, buf); + buf = get_reg_key(config_key, keypath("X11 Driver"), "Managed", "Y"); + if (IS_OPTION_TRUE(*buf)) + CheckDlgButton(dialog, IDC_ENABLE_MANAGED, BST_CHECKED); + else + CheckDlgButton(dialog, IDC_ENABLE_MANAGED, BST_UNCHECKED); + HeapFree(GetProcessHeap(), 0, buf); + SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_RESETCONTENT, 0, 0); for (it = 0; NULL != D3D_VS_Modes[it]; ++it) { SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_ADDSTRING, 0, (LPARAM) D3D_VS_Modes[it]); @@ -221,6 +228,16 @@ static void on_enable_desktop_clicked(HW update_gui_for_desktop_mode(dialog); } +static void on_enable_managed_clicked(HWND dialog) { + WINE_TRACE("\n"); + + if (IsDlgButtonChecked(dialog, IDC_ENABLE_MANAGED) == BST_CHECKED) { + set_reg_key(config_key, keypath("X11 Driver"), "Managed", "Y"); + } else { + set_reg_key(config_key, keypath("X11 Driver"), "Managed", "N"); + } +} + static void on_screen_depth_changed(HWND dialog) { char *newvalue = get_text(dialog, IDC_SCREEN_DEPTH); char *spaceIndex = strchr(newvalue, ' '); @@ -290,6 +307,7 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARA SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); switch(LOWORD(wParam)) { case IDC_ENABLE_DESKTOP: on_enable_desktop_clicked(hDlg); break; + case IDC_ENABLE_MANAGED: on_enable_managed_clicked(hDlg); break; case IDC_DX_MOUSE_GRAB: on_dx_mouse_grab_clicked(hDlg); break; case IDC_DOUBLE_BUFFER: on_double_buffer_clicked(hDlg); break; case IDC_D3D_PSHADER_MODE: on_d3d_pshader_mode_clicked(hDlg); break;

1 0

Eric Pouech : dbghelp: Correct handling for all module names.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 87ab6e6cd85901f8b87dec8a234ac45dbe27c00a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=87ab6e6cd85901f8b87dec8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Dec 22 11:11:39 2005 +0100 dbghelp: Correct handling for all module names. --- dlls/dbghelp/module.c | 44 +++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c00cc74..2b0de8c 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -33,10 +33,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -static void module_fill_module(const char* in, char* out, unsigned size) +static const char* ext[] = {".acm", ".dll", ".drv", ".exe", ".ocx", ".vxd", NULL}; + +static int match_ext(const char* ptr, size_t len) +{ + const char**e; + size_t l; + + for (e = ext; *e; e++) + { + l = strlen(*e); + if (l >= len) return FALSE; + if (strncasecmp(&ptr[len - l], *e, l)) continue; + return l; + } + return 0; +} + +static void module_fill_module(const char* in, char* out, size_t size) { - const char *ptr,*endptr; - unsigned len; + const char *ptr,*endptr; + size_t len, l; endptr = in + strlen(in); for (ptr = endptr - 1; @@ -46,24 +63,17 @@ static void module_fill_module(const cha len = min(endptr-ptr,size-1); memcpy(out, ptr, len); out[len] = '\0'; - if (len > 4 && - (!strcasecmp(&out[len - 4], ".dll") || !strcasecmp(&out[len - 4], ".exe"))) - out[len - 4] = '\0'; - else if (((len > 12 && out[len - 13] == '/') || len == 12) && + if (len > 4 && (l = match_ext(out, len))) + out[len - l] = '\0'; + else if (len > 12 && (!strcasecmp(out + len - 12, "wine-pthread") || !strcasecmp(out + len - 12, "wine-kthread"))) - lstrcpynA(out, "<wine-loader>",size); + lstrcpynA(out, "<wine-loader>", size); else { - if (len > 7 && - (!strcasecmp(&out[len - 7], ".dll.so") || !strcasecmp(&out[len - 7], ".exe.so"))) - strcpy(&out[len - 7], "<elf>"); - else if (len > 7 && - out[len - 7] == '.' && !strcasecmp(&out[len - 3], ".so")) - { - if (len + 3 < size) strcpy(&out[len - 3], "<elf>"); - else WARN("Buffer too short: %s\n", out); - } + if (len > 3 && !strcasecmp(&out[len - 3], ".so") && + (l = match_ext(out, len - 3))) + strcpy(&out[len - l - 3], "<elf>"); } while ((*out = tolower(*out))) out++; }

1 0

Bill Medland : msi: Prevent array underflow in MsiFormat when measuring with zero-length buffer.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: b56ed22277549dd7aa9a2b35951f9b2db7be870f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b56ed22277549dd7aa9a2b3… Author: Bill Medland <billmedland(a)mercuryspeed.com> Date: Wed Dec 21 21:19:47 2005 +0100 msi: Prevent array underflow in MsiFormat when measuring with zero-length buffer. --- dlls/msi/format.c | 8 +++++++- dlls/msi/tests/format.c | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index c280541..85f9028 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -639,10 +639,15 @@ UINT MSI_FormatRecordA( MSIPACKAGE* pack len = deformat_string_internal(package,rec,&deformated,strlenW(rec), record, NULL); + /* If len is zero then WideCharToMultiByte will return 0 indicating + * failure, but that will do just as well since we are ignoring + * possible errors. + */ lenA = WideCharToMultiByte(CP_ACP,0,deformated,len,NULL,0,NULL,NULL); if (buffer) { + /* Ditto above */ WideCharToMultiByte(CP_ACP,0,deformated,len,buffer,*size,NULL, NULL); if (*size>lenA) { @@ -652,7 +657,8 @@ UINT MSI_FormatRecordA( MSIPACKAGE* pack else { rc = ERROR_MORE_DATA; - buffer[(*size)-1] = 0; + if (*size) + buffer[(*size)-1] = 0; } } else diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 11cd455..59c6f11 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -109,7 +109,7 @@ static void test_formatrecord(void) char buffer[100]; MSIHANDLE hrec; UINT r; - DWORD sz=100; + DWORD sz; r = MsiFormatRecord(0, 0, NULL, NULL ); ok( r == ERROR_INVALID_HANDLE, "wrong error\n"); @@ -122,6 +122,11 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "format failed\n"); buffer[0] = 'x'; buffer[1] = 0; + sz=0; + r = MsiFormatRecord(0, hrec, buffer+1, &sz); + ok( r == ERROR_MORE_DATA && buffer[0] == 'x', "format failed measuring with buffer\n"); + ok( sz == 16, "size wrong\n"); + sz=100; r = MsiFormatRecord(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed with empty buffer\n"); ok( sz == 16, "size wrong\n");

1 0

James Hawkins : shell32: Remove the '.\' prefix from filenames, because it hides a
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: bad4a1dc5fc0d057153a64a23bb47174ec66c866 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bad4a1dc5fc0d057153a64a… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Dec 21 21:18:19 2005 +0100 shell32: Remove the '.\\' prefix from filenames, because it hides a bug in SHFileOperation. --- dlls/shell32/tests/shlfileop.c | 173 ++++++++++++++++++++-------------------- 1 files changed, 88 insertions(+), 85 deletions(-)

1 0

Ivan Leo Puoti : ddraw: Fix DirectDrawSurface::QueryInterface crash.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 3cc9e40c3bae7571574565a719cded877ccef29b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3cc9e40c3bae7571574565a… Author: Ivan Leo Puoti <ivanleo(a)gmail.com> Date: Wed Dec 21 21:11:54 2005 +0100 ddraw: Fix DirectDrawSurface::QueryInterface crash. --- dlls/ddraw/surface_main.c | 3 +++ dlls/ddraw/tests/dsurface.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface_main.c b/dlls/ddraw/surface_main.c index fd10394..ba11359 100644 --- a/dlls/ddraw/surface_main.c +++ b/dlls/ddraw/surface_main.c @@ -160,6 +160,9 @@ Main_DirectDrawSurface_QueryInterface(LP *ppObj = NULL; + if(!riid) + return DDERR_INVALIDPARAMS; + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDirectDrawSurface7, riid) || IsEqualGUID(&IID_IDirectDrawSurface4, riid)) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 10faf02..e1e0c93 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3,6 +3,7 @@ * * Copyright (C) 2005 Antoine Chavasse (a.chavasse(a)gmail.com) * Copyright (C) 2005 Christian Costa + * Copyright 2005 Ivan Leo Puoti * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -220,11 +221,38 @@ static void SrcColorKey32BlitTest(void) IDirectDrawSurface_Release(lpDst); } +static void QueryInterface(void) +{ + LPDIRECTDRAWSURFACE dsurface; + DDSURFACEDESC surface; + LPVOID object; + HRESULT ret; + + /* Create a surface */ + ZeroMemory(&surface, sizeof(surface)); + surface.dwSize = sizeof(surface); + surface.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + surface.dwHeight = 10; + surface.dwWidth = 10; + ret = IDirectDraw_CreateSurface(lpDD, &surface, &dsurface, NULL); + if(ret != DD_OK) + { + ok(FALSE, "IDirectDraw::CreateSurface failed with error %lx\n", ret); + return; + } + + /* Call IUnkown::QueryInterface */ + ret = IDirectDrawSurface_QueryInterface(dsurface, 0, &object); + ok(ret == DDERR_INVALIDPARAMS, "IDirectDrawSurface::QueryInterface returned %lx\n", ret); + + IDirectDrawSurface_Release(dsurface); +} START_TEST(dsurface) { CreateDirectDraw(); MipMapCreationTest(); SrcColorKey32BlitTest(); + QueryInterface(); ReleaseDirectDraw(); }

1 0

Detlef Riekenberg : winspool: Add version resource.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 8827bcfd741f5dfed7e43fa36b2ea74a9944c86a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8827bcfd741f5dfed7e43fa… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Dec 21 21:11:43 2005 +0100 winspool: Add version resource. --- dlls/winspool/winspool.rc | 16 ++++++++++++++++ include/wine/wine_common_ver.rc | 8 ++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winspool/winspool.rc b/dlls/winspool/winspool.rc index cc7344c..006e2ae 100644 --- a/dlls/winspool/winspool.rc +++ b/dlls/winspool/winspool.rc @@ -22,6 +22,22 @@ #include "winbase.h" #include "winuser.h" #include "wspool.h" +#include "winver.h" + +#define WINE_FILENAME_STR "winspool.drv" +#define WINE_FILEDESCRIPTION_STR "Wine core printer driver" + +#define WINE_FILETYPE VFT_DRV +#define WINE_FILESUBTYPE VFT2_DRV_PRINTER + +/* Same Version as WinXP_sp2 */ +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" + +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" #include "Bg.rc" #include "De.rc" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index c1fd409..2f15de5 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -51,6 +51,10 @@ never complain. #define WINE_FILETYPE VFT_DLL #endif +#ifndef WINE_FILESUBTYPE +#define WINE_FILESUBTYPE VFT2_UNKNOWN +#endif + #ifndef WINE_PRODUCTVERSION #define WINE_PRODUCTVERSION 1,0,0,0 #endif @@ -66,11 +70,11 @@ never complain. VS_VERSION_INFO VERSIONINFO FILEVERSION WINE_FILEVERSION PRODUCTVERSION WINE_PRODUCTVERSION -FILEFLAGSMASK 0 +FILEFLAGSMASK 63 FILEFLAGS 0 FILEOS VOS_UNKNOWN FILETYPE WINE_FILETYPE -FILESUBTYPE VFT2_UNKNOWN +FILESUBTYPE WINE_FILESUBTYPE { BLOCK "StringFileInfo" {

1 0

Alexandre Julliard : msvcrt: Return a per-thread buffer in localtime and gmtime.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 06c1a36bce839e06d0cb962f4b45bb1a2fc9dd55 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06c1a36bce839e06d0cb962… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 20:54:26 2005 +0100 msvcrt: Return a per-thread buffer in localtime and gmtime. --- dlls/msvcrt/msvcrt.h | 25 ++++++++++---------- dlls/msvcrt/time.c | 64 +++++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 44 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index b454579..68f5ca6 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -74,6 +74,18 @@ typedef void (*MSVCRT__beginthread_start typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); typedef int (*MSVCRT__onexit_t)(void); +struct MSVCRT_tm { + int tm_sec; + int tm_min; + int tm_hour; + int tm_mday; + int tm_mon; + int tm_year; + int tm_wday; + int tm_yday; + int tm_isdst; +}; + /* TLS data */ extern DWORD msvcrt_tls_index; @@ -84,6 +96,7 @@ struct __thread_data { unsigned char *mbstok_next; /* next ptr for mbstok() */ char *efcvt_buffer; /* buffer for ecvt/fcvt */ MSVCRT_wchar_t *wasctime_buffer; /* buffer for asctime */ + struct MSVCRT_tm time_buffer; /* buffer for localtime/gmtime */ int fpecode; MSVCRT_terminate_function terminate_handler; MSVCRT_unexpected_function unexpected_handler; @@ -173,18 +186,6 @@ extern unsigned msvcrt_create_io_inherit #define _RT_CRNL 252 #define _RT_BANNER 255 -struct MSVCRT_tm { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -}; - struct MSVCRT__timeb { MSVCRT_time_t time; unsigned short millitm; diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index f462aa7..9b26770 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -54,9 +54,6 @@ static inline int IsLeapYear(int Year) #define TICKSPERMSEC 10000 #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) -/* native uses a single static buffer for localtime/gmtime/mktime */ -static struct MSVCRT_tm tm; - /********************************************************************** * mktime (MSVCRT.@) */ @@ -65,7 +62,7 @@ MSVCRT_time_t MSVCRT_mktime(struct MSVCR MSVCRT_time_t secs; FILETIME lft, uft; ULONGLONG time; - struct MSVCRT_tm ts; + struct MSVCRT_tm ts, *ptm; int cleaps, day; ts=*t; @@ -125,7 +122,7 @@ MSVCRT_time_t MSVCRT_mktime(struct MSVCR secs = time - SECS_1601_TO_1970; /* compute tm_wday, tm_yday and renormalize the other fields of the * tm structure */ - if( MSVCRT_localtime( &secs)) *t = tm; + if ((ptm = MSVCRT_localtime( &secs ))) *t = *ptm; return secs; } @@ -135,8 +132,8 @@ MSVCRT_time_t MSVCRT_mktime(struct MSVCR */ struct MSVCRT_tm* MSVCRT_localtime(const MSVCRT_time_t* secs) { + thread_data_t * const data = msvcrt_get_thread_data(); int i; - FILETIME ft, lft; SYSTEMTIME st; DWORD tzid; @@ -152,34 +149,37 @@ struct MSVCRT_tm* MSVCRT_localtime(const if (st.wYear < 1970) return NULL; - tm.tm_sec = st.wSecond; - tm.tm_min = st.wMinute; - tm.tm_hour = st.wHour; - tm.tm_mday = st.wDay; - tm.tm_year = st.wYear - 1900; - tm.tm_mon = st.wMonth - 1; - tm.tm_wday = st.wDayOfWeek; + data->time_buffer.tm_sec = st.wSecond; + data->time_buffer.tm_min = st.wMinute; + data->time_buffer.tm_hour = st.wHour; + data->time_buffer.tm_mday = st.wDay; + data->time_buffer.tm_year = st.wYear - 1900; + data->time_buffer.tm_mon = st.wMonth - 1; + data->time_buffer.tm_wday = st.wDayOfWeek; - for (i = tm.tm_yday = 0; i < st.wMonth - 1; i++) { - tm.tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; + for (i = data->time_buffer.tm_yday = 0; i < st.wMonth - 1; i++) { + data->time_buffer.tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; } - tm.tm_yday += st.wDay - 1; + data->time_buffer.tm_yday += st.wDay - 1; tzid = GetTimeZoneInformation(&tzinfo); if (tzid == TIME_ZONE_ID_INVALID) - tm.tm_isdst = -1; + data->time_buffer.tm_isdst = -1; else - tm.tm_isdst = (tzid == TIME_ZONE_ID_DAYLIGHT?1:0); + data->time_buffer.tm_isdst = (tzid == TIME_ZONE_ID_DAYLIGHT?1:0); - return &tm; + return &data->time_buffer; } +/********************************************************************* + * gmtime (MSVCRT.@) + */ struct MSVCRT_tm* MSVCRT_gmtime(const MSVCRT_time_t* secs) { + thread_data_t * const data = msvcrt_get_thread_data(); int i; - FILETIME ft; SYSTEMTIME st; @@ -192,21 +192,21 @@ struct MSVCRT_tm* MSVCRT_gmtime(const MS if (st.wYear < 1970) return NULL; - tm.tm_sec = st.wSecond; - tm.tm_min = st.wMinute; - tm.tm_hour = st.wHour; - tm.tm_mday = st.wDay; - tm.tm_year = st.wYear - 1900; - tm.tm_mon = st.wMonth - 1; - tm.tm_wday = st.wDayOfWeek; - for (i = tm.tm_yday = 0; i < st.wMonth - 1; i++) { - tm.tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; + data->time_buffer.tm_sec = st.wSecond; + data->time_buffer.tm_min = st.wMinute; + data->time_buffer.tm_hour = st.wHour; + data->time_buffer.tm_mday = st.wDay; + data->time_buffer.tm_year = st.wYear - 1900; + data->time_buffer.tm_mon = st.wMonth - 1; + data->time_buffer.tm_wday = st.wDayOfWeek; + for (i = data->time_buffer.tm_yday = 0; i < st.wMonth - 1; i++) { + data->time_buffer.tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; } - tm.tm_yday += st.wDay - 1; - tm.tm_isdst = 0; + data->time_buffer.tm_yday += st.wDay - 1; + data->time_buffer.tm_isdst = 0; - return &tm; + return &data->time_buffer; } /**********************************************************************

1 0

H. Verbeet : d3d9: Add traces for when shader support is missing in the shader test.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 2bb87a90b28f1d66f41e4d31a8aa741b06d8fe4b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2bb87a90b28f1d66f41e4d3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Dec 21 20:45:07 2005 +0100 d3d9: Add traces for when shader support is missing in the shader test. --- dlls/d3d9/tests/shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 6da5164..563d5fa 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -151,8 +151,11 @@ START_TEST(shader) { test_get_set_vertex_shader(device_ptr); } + else trace("No vertex shader support, skipping test\n"); + if (caps.PixelShaderVersion & 0xffff) { test_get_set_pixel_shader(device_ptr); } + else trace("No pixel shader support, skipping test\n"); }

1 0

Hans Leidekker : kernel: Some documentation improvements.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: fa57544a4699d558aace5a286939037ca73d3987 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa57544a4699d558aace5a2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Dec 21 20:44:49 2005 +0100 kernel: Some documentation improvements. --- dlls/kernel/process.c | 54 ++++++++++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 19d945b..4bfbbc9 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -2127,17 +2127,19 @@ void WINAPI ExitProcess( DWORD status ) /*********************************************************************** - * GetExitCodeProcess [KERNEL32.@] + * GetExitCodeProcess [KERNEL32.@] * - * Gets termination status of specified process + * Gets termination status of specified process. + * + * PARAMS + * hProcess [in] Handle to the process. + * lpExitCode [out] Address to receive termination status. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI GetExitCodeProcess( - HANDLE hProcess, /* [in] handle to the process */ - LPDWORD lpExitCode) /* [out] address to receive termination status */ +BOOL WINAPI GetExitCodeProcess( HANDLE hProcess, LPDWORD lpExitCode ) { NTSTATUS status; PROCESS_BASIC_INFORMATION pbi; @@ -2166,12 +2168,12 @@ UINT WINAPI SetErrorMode( UINT mode ) /********************************************************************** - * TlsAlloc [KERNEL32.@] Allocates a TLS index. + * TlsAlloc [KERNEL32.@] * - * Allocates a thread local storage index + * Allocates a thread local storage index. * * RETURNS - * Success: TLS Index + * Success: TLS index. * Failure: 0xFFFFFFFF */ DWORD WINAPI TlsAlloc( void ) @@ -2209,16 +2211,18 @@ DWORD WINAPI TlsAlloc( void ) /********************************************************************** - * TlsFree [KERNEL32.@] Releases a TLS index. + * TlsFree [KERNEL32.@] * - * Releases a thread local storage index, making it available for reuse + * Releases a thread local storage index, making it available for reuse. + * + * PARAMS + * index [in] TLS index to free. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI TlsFree( - DWORD index) /* [in] TLS Index to free */ +BOOL WINAPI TlsFree( DWORD index ) { BOOL ret; @@ -2241,14 +2245,18 @@ BOOL WINAPI TlsFree( /********************************************************************** - * TlsGetValue [KERNEL32.@] Gets value in a thread's TLS slot + * TlsGetValue [KERNEL32.@] + * + * Gets value in a thread's TLS slot. + * + * PARAMS + * index [in] TLS index to retrieve value for. * * RETURNS - * Success: Value stored in calling thread's TLS slot for index - * Failure: 0 and GetLastError() returns NO_ERROR + * Success: Value stored in calling thread's TLS slot for index. + * Failure: 0 and GetLastError() returns NO_ERROR. */ -LPVOID WINAPI TlsGetValue( - DWORD index) /* [in] TLS index to retrieve value for */ +LPVOID WINAPI TlsGetValue( DWORD index ) { LPVOID ret; @@ -2273,15 +2281,19 @@ LPVOID WINAPI TlsGetValue( /********************************************************************** - * TlsSetValue [KERNEL32.@] Stores a value in the thread's TLS slot. + * TlsSetValue [KERNEL32.@] + * + * Stores a value in the thread's TLS slot. + * + * PARAMS + * index [in] TLS index to set value for. + * value [in] Value to be stored. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI TlsSetValue( - DWORD index, /* [in] TLS index to set value for */ - LPVOID value) /* [in] Value to be stored */ +BOOL WINAPI TlsSetValue( DWORD index, LPVOID value ) { if (index < TLS_MINIMUM_AVAILABLE) {

1 0

Marcus Meissner : msvcrt: Implemented wctime(), wasctime().
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 9a583763eefb7cec46e0b4b031cf71d6b5d2a5ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a583763eefb7cec46e0b4b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Dec 21 20:23:47 2005 +0100 msvcrt: Implemented wctime(), wasctime(). Free thread data in DLL_THREAD_DETACH. --- dlls/msvcrt/main.c | 2 ++ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/time.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index b8660bb..a79d12f 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -70,6 +70,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, case DLL_THREAD_DETACH: /* Free TLS */ tls = TlsGetValue(msvcrt_tls_index); + HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); + HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); HeapFree(GetProcessHeap(), 0, tls); TRACE("finished thread free\n"); break; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index d46f738..b454579 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -83,6 +83,7 @@ struct __thread_data { unsigned long thread_doserrno; unsigned char *mbstok_next; /* next ptr for mbstok() */ char *efcvt_buffer; /* buffer for ecvt/fcvt */ + MSVCRT_wchar_t *wasctime_buffer; /* buffer for asctime */ int fpecode; MSVCRT_terminate_function terminate_handler; MSVCRT_unexpected_function unexpected_handler; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f964f29..a4d3ade 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -487,7 +487,7 @@ @ cdecl _vsnprintf(ptr long ptr ptr) MSVCRT_vsnprintf @ cdecl _vsnwprintf(ptr long wstr long) MSVCRT_vsnwprintf @ cdecl _waccess(wstr long) -@ stub _wasctime #(ptr) MSVCRT__wasctime +@ cdecl _wasctime(ptr) MSVCRT__wasctime @ cdecl _wchdir(wstr) @ cdecl _wchmod(wstr long) @ extern _wcmdln MSVCRT__wcmdln @@ -503,7 +503,7 @@ @ cdecl _wcsrev(wstr) @ cdecl _wcsset(wstr long) @ cdecl _wcsupr(wstr) ntdll._wcsupr -@ stub _wctime #(ptr) +@ cdecl _wctime(ptr) MSVCRT__wctime @ extern _wenviron @ stub _wexecl #(wstr wstr) varargs @ stub _wexecle #(wstr wstr) varargs diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index f7daab5..f462aa7 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -410,3 +410,35 @@ void MSVCRT__tzset(void) lstrcpynA(tzname_dst, tzname[1], sizeof(tzname_dst)); tzname_dst[sizeof(tzname_dst) - 1] = '\0'; } + +/********************************************************************* + * _wctime (MSVCRT.@) + */ +MSVCRT_wchar_t *MSVCRT__wasctime(const struct MSVCRT_tm *mstm) { + thread_data_t *data = msvcrt_get_thread_data(); + struct tm xtm; + + memset(&xtm,0,sizeof(xtm)); + xtm.tm_sec = mstm->tm_sec; + xtm.tm_min = mstm->tm_min; + xtm.tm_hour = mstm->tm_hour; + xtm.tm_mday = mstm->tm_mday; + xtm.tm_mon = mstm->tm_mon; + xtm.tm_year = mstm->tm_year; + xtm.tm_wday = mstm->tm_wday; + xtm.tm_yday = mstm->tm_yday; + xtm.tm_isdst = mstm->tm_isdst; + + if (!data->wasctime_buffer) + data->wasctime_buffer = MSVCRT_malloc( 30*sizeof(MSVCRT_wchar_t) ); /* ought to be enough */ + MultiByteToWideChar( CP_UNIXCP, 0, asctime(&xtm), -1, data->wasctime_buffer, 30 ); + return data->wasctime_buffer; +} + +/********************************************************************* + * _wctime (MSVCRT.@) + */ +MSVCRT_wchar_t *MSVCRT__wctime(MSVCRT_time_t *time) +{ + return MSVCRT__wasctime( MSVCRT_localtime(time) ); +}

1 0

Robert Reif : winecfg: Select an audio driver on fresh install.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 9f34fd378754b3e8632cd29bef8dd2205865028a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f34fd378754b3e8632cd29… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Dec 21 20:07:56 2005 +0100 winecfg: Select an audio driver on fresh install. --- programs/winecfg/En.rc | 1 + programs/winecfg/audio.c | 67 ++++++++++++++++++++++++++++++++++++++++--- programs/winecfg/resource.h | 1 + 3 files changed, 64 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 5a750ff..3f37bf8 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -201,6 +201,7 @@ BEGIN IDS_WINECFG_TITLE "Wine configuration" IDS_THEMEFILE "Theme files" IDS_THEMEFILE_SELECT "Select a theme file" + IDS_AUDIO_MISSING "There is no audio driver currently specified in the registry.\n\nA recommended driver has been selected for you.\nYou can use this driver or select another driver if available.\n\nYou must click Apply for the selection to take effect." END diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index ae079df..1d0a424 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -516,6 +516,23 @@ start_over: free(tokens); } +static void selectDriver(HWND hDlg, const char * driver) +{ + WCHAR text[1024]; + WCHAR caption[64]; + + strcpy(curAudioDriver, driver); + set_reg_key(config_key, "Drivers", "Audio", curAudioDriver); + + if (LoadStringW(GetModuleHandle(NULL), IDS_AUDIO_MISSING, text, sizeof(text)/sizeof(text[0]))) + { + if (LoadStringW(GetModuleHandle(NULL), IDS_WINECFG_TITLE, caption, sizeof(caption)/sizeof(caption[0]))) + MessageBoxW(hDlg, text, caption, MB_OK | MB_ICONINFORMATION); + } + + SendMessage(GetParent(hDlg), PSM_CHANGED, (WPARAM) hDlg, 0); /* enable apply button */ +} + static void initAudioDlg (HWND hDlg) { int i; @@ -523,14 +540,54 @@ static void initAudioDlg (HWND hDlg) WINE_TRACE("\n"); - /* make a local copy of the current registry setting */ - strcpy(curAudioDriver, get_reg_key(config_key, "Drivers", "Audio", "")); - - WINE_TRACE("curAudioDriver = %s\n", curAudioDriver); - /* make a list of all drivers that can be loaded */ findAudioDrivers(); + /* get current registry setting if available */ + buf = get_reg_key(config_key, "Drivers", "Audio", NULL); + + /* check for first time install and set a default driver + * select in this order: oss, alsa, first available driver, none + */ + if (buf == NULL) + { + const AUDIO_DRIVER *pAudioDrv = NULL; + + /* select oss if available */ + for (pAudioDrv = loadedAudioDrv; *pAudioDrv->szName; pAudioDrv++) + { + if (strcmp(pAudioDrv->szDriver, "oss") == 0) + { + selectDriver(hDlg, "oss"); + break; + } + } + + if (strlen(curAudioDriver) == 0) + { + /* select alsa if available */ + for (pAudioDrv = loadedAudioDrv; *pAudioDrv->szName; pAudioDrv++) + { + if (strcmp(pAudioDrv->szDriver, "alsa") == 0) + { + selectDriver(hDlg, "alsa"); + break; + } + } + } + + if (strlen(curAudioDriver) == 0) + { + /* select first available driver */ + if (*loadedAudioDrv->szDriver) + selectDriver(hDlg, loadedAudioDrv->szDriver); + } + } + else /* make a local copy of the current registry setting */ + strcpy(curAudioDriver, buf); + + WINE_TRACE("curAudioDriver = %s\n", curAudioDriver); + /* check for drivers that can't be loaded */ checkRegistrySetting(hDlg); diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index e79f861..df7f0b9 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -141,6 +141,7 @@ #define IDR_WINECFG 1305 #define IDB_CHECKBOX 1306 #define IDB_DEVICE 1307 +#define IDS_AUDIO_MISSING 1308 /* appearance tab */ #define IDC_THEME_COLORCOMBO 1401

1 0

Saulius Krasuckas : mscms: Test only one invalid GetStandardColorSpaceProfile() param in a
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 975ffe8abc823ee5e7d9a617d22b3e0e697fc1b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=975ffe8abc823ee5e7d9a61… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Wed Dec 21 20:07:42 2005 +0100 mscms: Test only one invalid GetStandardColorSpaceProfile() param in a single check. --- dlls/mscms/tests/profile.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 45b569c..0797161 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -460,6 +460,19 @@ static void test_GetStandardColorSpacePr /* Parameter checks */ + /* Single invalid parameter checks */ + todo_wine + fail_GSCSPA(machine, SPACE_RGB, newprofile, &size, sizeP, (GLE == ERROR_NOT_SUPPORTED)); + todo_wine + fail_GSCSPA(NULL, (DWORD)-1, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); + todo_wine + fail_GSCSPA(NULL, SPACE_RGB, NULL, &size, sizeP, (GLE == ERROR_INSUFFICIENT_BUFFER)); + todo_wine + fail_GSCSPA(NULL, SPACE_RGB, newprofile, NULL, sizeP, (GLE == ERROR_INVALID_PARAMETER)); + todo_wine + fail_GSCSPA(NULL, SPACE_RGB, newprofile, &size, 0, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER)); + + /* Several invalid parameter checks */ todo_wine fail_GSCSPA(machine, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); todo_wine @@ -514,6 +527,19 @@ static void test_GetStandardColorSpacePr /* Parameter checks */ + /* Single invalid parameter checks */ + todo_wine + fail_GSCSPW(machineW, SPACE_RGB, newprofile, &size, sizeP, (GLE == ERROR_NOT_SUPPORTED)); + todo_wine + fail_GSCSPW(NULL, (DWORD)-1, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); + todo_wine + fail_GSCSPW(NULL, SPACE_RGB, NULL, &size, sizeP, (GLE == ERROR_INSUFFICIENT_BUFFER)); + todo_wine + fail_GSCSPW(NULL, SPACE_RGB, newprofile, NULL, sizeP, (GLE == ERROR_INVALID_PARAMETER)); + todo_wine + fail_GSCSPW(NULL, SPACE_RGB, newprofile, &size, 0, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER)); + + /* Several invalid parameter checks */ todo_wine fail_GSCSPW(machineW, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); todo_wine

1 0

Jesse Allen : msvcrt: Fix printf sign flags.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 180326bb0aa5adfe6906728f40f1cd27be617f1c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=180326bb0aa5adfe6906728… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Wed Dec 21 20:07:03 2005 +0100 msvcrt: Fix printf sign flags. Fix the printf sign flags so that '+' doesn't always override ' ' space alone. If they both appear, continue parsing and let '+' take precedence. --- dlls/msvcrt/tests/printf.c | 10 ++++++++++ dlls/msvcrt/wcs.c | 5 ++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 3979a95..d96c61e 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -56,6 +56,16 @@ static void test_sprintf( void ) ok(!strcmp(buffer, "I"), "Problem with \"I\" interpretation\n"); ok( r==1, "return count wrong\n"); + format = "% d"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer, " 1"),"Problem with sign place-holder: '%s'\n",buffer); + ok( r==2, "return count wrong\n"); + + format = "%+ d"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer, "+1"),"Problem with sign flags: '%s'\n",buffer); + ok( r==2, "return count wrong\n"); + format = "%S"; r = sprintf(buffer,format,wide); ok(!strcmp(buffer,"wide"),"Problem with wide string format\n"); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index efb93d8..83a713e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -438,7 +438,10 @@ static int pf_vsnprintf( pf_output *out, while (*p) { if( *p == '+' || *p == ' ' ) - flags.Sign = '+'; + { + if ( flags.Sign != '+' ) + flags.Sign = *p; + } else if( *p == '-' ) flags.LeftAlign = *p; else if( *p == '0' )

1 0

Dmitry Timoshkov : msvideo: Handle ESC key press in the MCIWND class as an alias to stop command.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: b6c4beda587072c658f75fea3cb4b1e88ce58ad4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b6c4beda587072c658f75fe… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 21 20:07:22 2005 +0100 msvideo: Handle ESC key press in the MCIWND class as an alias to stop command. --- dlls/msvideo/mciwnd.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msvideo/mciwnd.c b/dlls/msvideo/mciwnd.c index cf52beb..4524e5e 100644 --- a/dlls/msvideo/mciwnd.c +++ b/dlls/msvideo/mciwnd.c @@ -429,6 +429,21 @@ static LRESULT mci_get_devcaps(MCIWndInf return mci_devcaps.dwReturn; } +static LRESULT MCIWND_KeyDown(MCIWndInfo *mwi, UINT key) +{ + TRACE("%p, key %04x\n", mwi->hWnd, key); + + switch(key) + { + case VK_ESCAPE: + SendMessageW(mwi->hWnd, MCI_STOP, 0, 0); + return 0; + + default: + return 0; + } +} + static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam) { MCIWndInfo *mwi; @@ -477,6 +492,9 @@ static LRESULT WINAPI MCIWndProc(HWND hW case WM_COMMAND: return MCIWND_Command(mwi, wParam, lParam); + case WM_KEYDOWN: + return MCIWND_KeyDown(mwi, wParam); + case WM_NCACTIVATE: if (mwi->uTimer) {

1 0