December 2005 - Wine-commits

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

26 Dec '05

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 26 Dec '05

26 Dec '05

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 26 Dec '05

26 Dec '05

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 26 Dec '05

26 Dec '05

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 26 Dec '05

26 Dec '05

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 26 Dec '05

26 Dec '05

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 26 Dec '05

26 Dec '05

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 26 Dec '05

26 Dec '05

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 26 Dec '05

26 Dec '05

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 26 Dec '05

26 Dec '05

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