Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[cwittich] 36403: sync oleaut32 with wine 1.1.5
by cwittich＠svn.reactos.org 22 Sep '08

22 Sep '08

Author: cwittich Date: Mon Sep 22 09:20:27 2008 New Revision: 36403 URL: http://svn.reactos.org/svn/reactos?rev=36403&view=rev Log: sync oleaut32 with wine 1.1.5 Modified: trunk/reactos/dll/win32/oleaut32/hash.c trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/varformat.c trunk/reactos/dll/win32/oleaut32/vartype.c Modified: trunk/reactos/dll/win32/oleaut32/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/hash.c?… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/hash.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/hash.c [iso-8859-1] Mon Sep 22 09:20:27 2008 @@ -509,6 +509,9 @@ ULONG nOffset, nMask = skind == SYS_MAC ? 1 : 0; ULONG nHiWord, nLoWord = 0x0deadbee; const unsigned char *str = (const unsigned char *)lpStr, *pnLookup = NULL; + + TRACE("(%d, %d, %s) %s\n", skind, lcid, debugstr_a(lpStr), + (skind == SYS_WIN16) ? "SYS_WIN16" : (skind == SYS_WIN32) ? "SYS_WIN32" : ""); if (!str) return 0; Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] Mon Sep 22 09:20:27 2008 @@ -508,9 +508,10 @@ }; /* how much space do we use on stack in DWORD steps. */ -int -_argsize(DWORD vt) { - switch (vt) { +static int +_argsize(TYPEDESC *tdesc, ITypeInfo *tinfo) { + switch (tdesc->vt) { + case VT_I8: case VT_UI8: return 8/sizeof(DWORD); case VT_R8: @@ -519,30 +520,53 @@ return sizeof(CY)/sizeof(DWORD); case VT_DATE: return sizeof(DATE)/sizeof(DWORD); + case VT_DECIMAL: + return (sizeof(DECIMAL)+3)/sizeof(DWORD); case VT_VARIANT: return (sizeof(VARIANT)+3)/sizeof(DWORD); + case VT_USERDEFINED: + { + ITypeInfo *tinfo2; + TYPEATTR *tattr; + HRESULT hres; + DWORD ret; + + hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.hreftype,&tinfo2); + if (FAILED(hres)) + return 0; /* should fail critically in serialize_param */ + ITypeInfo_GetTypeAttr(tinfo2,&tattr); + ret = (tattr->cbSizeInstance+3)/sizeof(DWORD); + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); + ITypeInfo_Release(tinfo2); + return ret; + } default: return 1; } } +/* how much space do we use on the heap (in bytes) */ static int -_xsize(const TYPEDESC *td) { +_xsize(const TYPEDESC *td, ITypeInfo *tinfo) { switch (td->vt) { case VT_DATE: return sizeof(DATE); + case VT_CY: + return sizeof(CY); + /* FIXME: VT_BOOL should return 2? */ case VT_VARIANT: - return sizeof(VARIANT)+3; + return sizeof(VARIANT)+3; /* FIXME: why the +3? */ case VT_CARRAY: { int i, arrsize = 1; const ARRAYDESC *adesc = td->u.lpadesc; for (i=0;i<adesc->cDims;i++) arrsize *= adesc->rgbounds[i].cElements; - return arrsize*_xsize(&adesc->tdescElem); + return arrsize*_xsize(&adesc->tdescElem, tinfo); } case VT_UI8: case VT_I8: + case VT_R8: return 8; case VT_UI2: case VT_I2: @@ -550,6 +574,22 @@ case VT_UI1: case VT_I1: return 1; + case VT_USERDEFINED: + { + ITypeInfo *tinfo2; + TYPEATTR *tattr; + HRESULT hres; + DWORD ret; + + hres = ITypeInfo_GetRefTypeInfo(tinfo,td->u.hreftype,&tinfo2); + if (FAILED(hres)) + return 0; + ITypeInfo_GetTypeAttr(tinfo2,&tattr); + ret = tattr->cbSizeInstance; + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); + ITypeInfo_Release(tinfo2); + return ret; + } default: return 4; } @@ -843,7 +883,7 @@ if (debugout) TRACE_(olerelay)("(vt %s)",debugstr_vt(adesc->tdescElem.vt)); if (debugout) TRACE_(olerelay)("["); for (i=0;i<arrsize;i++) { - hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)arg+i*_xsize(&adesc->tdescElem)), buf); + hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)arg+i*_xsize(&adesc->tdescElem, tinfo)), buf); if (hres) return hres; if (debugout && (i<arrsize-1)) TRACE_(olerelay)(","); @@ -1092,7 +1132,7 @@ if (alloc) { /* Allocate space for the referenced struct */ if (derefhere) - *arg=(DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc)); + *arg=(DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc, tinfo)); } if (derefhere) return deserialize_param(tinfo, readit, debugout, alloc, tdesc->u.lptdesc, (LPDWORD)*arg, buf); @@ -1141,9 +1181,6 @@ case TKIND_RECORD: { int i; - if (alloc) - *arg = (DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,tattr->cbSizeInstance); - if (debugout) TRACE_(olerelay)("{"); for (i=0;i<tattr->cVars;i++) { VARDESC *vdesc; @@ -1161,7 +1198,7 @@ debugout, alloc, &vdesc->elemdescVar.tdesc, - (DWORD*)(((LPBYTE)*arg)+vdesc->u.oInst), + (DWORD*)(((LPBYTE)arg)+vdesc->u.oInst), buf ); ITypeInfo2_ReleaseVarDesc(tinfo2, vdesc); @@ -1207,7 +1244,7 @@ debugout, alloc, &adesc->tdescElem, - (DWORD*)((LPBYTE)(arg)+i*_xsize(&adesc->tdescElem)), + (DWORD*)((LPBYTE)(arg)+i*_xsize(&adesc->tdescElem, tinfo)), buf ); return S_OK; @@ -1407,7 +1444,7 @@ } /* No need to marshal other data than FIN and any VT_PTR. */ if (!is_in_elem(elem) && (elem->tdesc.vt != VT_PTR)) { - xargs+=_argsize(elem->tdesc.vt); + xargs+=_argsize(&elem->tdesc, tinfo); if (relaydeb) TRACE_(olerelay)("[out]"); continue; } @@ -1425,7 +1462,7 @@ ERR("Failed to serialize param, hres %x\n",hres); break; } - xargs+=_argsize(elem->tdesc.vt); + xargs+=_argsize(&elem->tdesc, tinfo); } if (relaydeb) TRACE_(olerelay)(")"); @@ -1466,7 +1503,7 @@ } /* No need to marshal other data than FOUT and any VT_PTR */ if (!is_out_elem(elem) && (elem->tdesc.vt != VT_PTR)) { - xargs += _argsize(elem->tdesc.vt); + xargs += _argsize(&elem->tdesc, tinfo); if (relaydeb) TRACE_(olerelay)("[in]"); continue; } @@ -1484,7 +1521,7 @@ status = hres; break; } - xargs += _argsize(elem->tdesc.vt); + xargs += _argsize(&elem->tdesc, tinfo); } hres = xbuf_get(&buf, (LPBYTE)&remoteresult, sizeof(DWORD)); @@ -1725,7 +1762,7 @@ /* some args take more than 4 byte on the stack */ nrofargs = 0; for (j=0;j<fdesc->cParams;j++) - nrofargs += _argsize(fdesc->lprgelemdescParam[j].tdesc.vt); + nrofargs += _argsize(&fdesc->lprgelemdescParam[j].tdesc, proxy->tinfo); #ifdef __i386__ if (fdesc->callconv != CC_STDCALL) { @@ -2055,7 +2092,7 @@ /*dump_FUNCDESC(fdesc);*/ nrofargs = 0; for (i=0;i<fdesc->cParams;i++) - nrofargs += _argsize(fdesc->lprgelemdescParam[i].tdesc.vt); + nrofargs += _argsize(&fdesc->lprgelemdescParam[i].tdesc, tinfo); args = HeapAlloc(GetProcessHeap(),0,(nrofargs+1)*sizeof(DWORD)); if (!args) { @@ -2077,7 +2114,7 @@ xargs, &buf ); - xargs += _argsize(elem->tdesc.vt); + xargs += _argsize(&elem->tdesc, tinfo); if (hres) { ERR("Failed to deserialize param %s, hres %x\n",relaystr(names[i+1]),hres); break; @@ -2123,7 +2160,7 @@ xargs, &buf ); - xargs += _argsize(elem->tdesc.vt); + xargs += _argsize(&elem->tdesc, tinfo); if (hres) { ERR("Failed to stuballoc param, hres %x\n",hres); break; Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] Mon Sep 22 09:20:27 2008 @@ -3146,7 +3146,7 @@ sizeof(VARIANT)); V_VT((*ppVarDesc)->vardesc.u.lpvarValue) = VT_INT; if (pItem->flags & 0x08) - V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) = pItem->byte_offs; + V_INT((*ppVarDesc)->vardesc.u.lpvarValue) = pItem->byte_offs; else { switch ((*ppVarDesc)->vardesc.elemdescVar.tdesc.vt) { @@ -3172,7 +3172,9 @@ case VT_UI2: case VT_I4: case VT_UI4: - V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) = + case VT_INT: + case VT_UINT: + V_INT((*ppVarDesc)->vardesc.u.lpvarValue) = *(INT*)(pBlk + pItem->byte_offs); break; default: @@ -5483,7 +5485,32 @@ return res; } -extern int _argsize(DWORD vt); +/* The size of the argument on the stack in DWORD units (in all x86 call + * convetions the arguments on the stack are DWORD-aligned) + */ +int _dispargsize(VARTYPE vt) +{ + switch (vt) { + case VT_I8: + case VT_UI8: + return 8/sizeof(DWORD); + case VT_R8: + return sizeof(double)/sizeof(DWORD); + case VT_DECIMAL: + return (sizeof(DECIMAL)+3)/sizeof(DWORD); + case VT_CY: + return sizeof(CY)/sizeof(DWORD); + case VT_DATE: + return sizeof(DATE)/sizeof(DWORD); + case VT_VARIANT: + return (sizeof(VARIANT)+3)/sizeof(DWORD); + case VT_RECORD: + FIXME("VT_RECORD not implemented\n"); + return 1; + default: + return 1; + } +} static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) { @@ -5671,9 +5698,9 @@ for (i=0;i<cActuals;i++) { - TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_argsize(prgvt[i])); + TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_dispargsize(prgvt[i])); dump_Variant(prgpvarg[i]); - argsize += _argsize(prgvt[i]); + argsize += _dispargsize(prgvt[i]); } args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*argsize); @@ -5689,10 +5716,10 @@ VARIANT *arg = prgpvarg[i]; TRACE("Storing arg %d (%d as %d)\n",i,V_VT(arg),prgvt[i]); if (prgvt[i] == VT_VARIANT) - memcpy(&args[argspos], arg, _argsize(prgvt[i]) * sizeof(DWORD)); + memcpy(&args[argspos], arg, _dispargsize(prgvt[i]) * sizeof(DWORD)); else - memcpy(&args[argspos], &V_NONE(arg), _argsize(prgvt[i]) * sizeof(DWORD)); - argspos += _argsize(prgvt[i]); + memcpy(&args[argspos], &V_NONE(arg), _dispargsize(prgvt[i]) * sizeof(DWORD)); + argspos += _dispargsize(prgvt[i]); } if (pvInstance) Modified: trunk/reactos/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/varform… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/varformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/varformat.c [iso-8859-1] Mon Sep 22 09:20:27 2008 @@ -966,7 +966,7 @@ } fmt_state &= ~FMT_STATE_OPEN_COPY; } - else if ((*pFormat == 'q' || *pFormat == 'q') && COULD_BE(FMT_TYPE_DATE)) + else if ((*pFormat == 'q' || *pFormat == 'Q') && COULD_BE(FMT_TYPE_DATE)) { /* Date formats: Quarter specifier * Other formats: Literal Modified: trunk/reactos/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/vartype… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] Mon Sep 22 09:20:27 2008 @@ -5500,7 +5500,7 @@ VARIANT_DIFromDec(pDecLeft, &di_left); VARIANT_DIFromDec(pDecRight, &di_right); divresult = VARIANT_DI_div(&di_left, &di_right, &di_result); - if (divresult) + if (divresult != S_OK) { /* division actually overflowed */ hRet = divresult;

1 0

[cwittich] 36402: fix some memory leaks (patch by Ged)
by cwittich＠svn.reactos.org 22 Sep '08

22 Sep '08

Author: cwittich Date: Mon Sep 22 07:18:12 2008 New Revision: 36402 URL: http://svn.reactos.org/svn/reactos?rev=36402&view=rev Log: fix some memory leaks (patch by Ged) Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Mon Sep 22 07:18:12 2008 @@ -702,6 +702,10 @@ if (dwError != ERROR_SUCCESS) { /* Free the service table */ + for (i = 0; i < dwActiveServiceCount; i++) + { + RtlFreeUnicodeString(&lpActiveServices[i].ServiceName); + } RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); lpActiveServices = NULL; dwActiveServiceCount = 0; @@ -714,6 +718,10 @@ if (lpMessageBuffer == NULL) { /* Free the service table */ + for (i = 0; i < dwActiveServiceCount; i++) + { + RtlFreeUnicodeString(&lpActiveServices[i].ServiceName); + } RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); lpActiveServices = NULL; dwActiveServiceCount = 0; @@ -728,6 +736,10 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, lpMessageBuffer); /* Free the service table */ + for (i = 0; i < dwActiveServiceCount; i++) + { + RtlFreeUnicodeString(&lpActiveServices[i].ServiceName); + } RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); lpActiveServices = NULL; dwActiveServiceCount = 0; @@ -780,6 +792,10 @@ if (dwError != ERROR_SUCCESS) { /* Free the service table */ + for (i = 0; i < dwActiveServiceCount; i++) + { + RtlFreeUnicodeString(&lpActiveServices[i].ServiceName); + } RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); lpActiveServices = NULL; dwActiveServiceCount = 0; @@ -792,6 +808,10 @@ if (lpMessageBuffer == NULL) { /* Free the service table */ + for (i = 0; i < dwActiveServiceCount; i++) + { + RtlFreeUnicodeString(&lpActiveServices[i].ServiceName); + } RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); lpActiveServices = NULL; dwActiveServiceCount = 0; @@ -806,6 +826,10 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, lpMessageBuffer); /* Free the service table */ + for (i = 0; i < dwActiveServiceCount; i++) + { + RtlFreeUnicodeString(&lpActiveServices[i].ServiceName); + } RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); lpActiveServices = NULL; dwActiveServiceCount = 0;

1 0

[sginsberg] 36401: - Remove deprecated output
by sginsberg＠svn.reactos.org 22 Sep '08

22 Sep '08

Author: sginsberg Date: Mon Sep 22 06:46:51 2008 New Revision: 36401 URL: http://svn.reactos.org/svn/reactos?rev=36401&view=rev Log: - Remove deprecated output Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=36401… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Mon Sep 22 06:46:51 2008 @@ -139,7 +139,6 @@ if (Mode != KernelMode) { DPRINT1("MmAccessFault(Mode %d, Address %x)\n", Mode, Address); - DbgPrint("%s:%d\n",__FILE__,__LINE__); return(STATUS_ACCESS_VIOLATION); } AddressSpace = MmGetKernelAddressSpace();

1 0

[cwittich] 36400: the time has COM import stdole32.tlb from wine
by cwittich＠svn.reactos.org 22 Sep '08

22 Sep '08

Author: cwittich Date: Mon Sep 22 06:38:51 2008 New Revision: 36400 URL: http://svn.reactos.org/svn/reactos?rev=36400&view=rev Log: the time has COM import stdole32.tlb from wine Added: trunk/reactos/dll/win32/stdole32.tlb/ (with props) trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc (with props) trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl (with props) trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild (with props) trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.spec (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Sep 22 06:38:51 2008 @@ -338,6 +338,7 @@ dll\win32\smdll\smdll.dll 1 dll\win32\snmpapi\snmpapi.dll 1 dll\win32\stdole2.tlb\stdole2.tlb 1 +dll\win32\stdole32.tlb\stdole32.tlb 1 dll\win32\sxs\sxs.dll 1 dll\win32\syssetup\syssetup.dll 1 dll\win32\tapi32\tapi32.dll 1 Propchange: trunk/reactos/dll/win32/stdole32.tlb/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Sep 22 06:38:51 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/stdole32.tlb/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/stdole32.tlb/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/stdole32.tlb/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/rsr… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc (added) +++ trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc [iso-8859-1] Mon Sep 22 06:38:51 2008 @@ -1,0 +1,31 @@ +/* + * Resource file for stdole32 + * + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "wine/wine_common_ver.rc" + +/* @makedep: std_ole_v1.tlb */ +1 TYPELIB LOADONCALL DISCARDABLE std_ole_v1.tlb Propchange: trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl (added) +++ trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] Mon Sep 22 06:38:51 2008 @@ -1,0 +1,137 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +[ + uuid(00020430-0000-0000-C000-000000000046), + version(1.0), + helpstring("OLE Automation") +] +library stdole +{ + /* typedefs aren't stored in the type library. + These type names are known by the type compiler so it + doesn't really matter what we define them as. */ + + typedef void *VARIANT; + typedef wchar_t *BSTR; + typedef unsigned long SCODE; + typedef unsigned long HRESULT; + + typedef struct GUID { + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned char Data4[ 8 ]; + } GUID; + + typedef struct DISPPARAMS { + VARIANT *rgvarg; + long *rgdispidNamedArgs; + unsigned int cArgs; + unsigned int cNamedArgs; + } DISPPARAMS; + + typedef struct EXCEPINFO { + unsigned short wCode; + unsigned short wReserved; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + unsigned long dwHelpContext; + void *pvReserved; + void *pfnDeferredFillIn; + SCODE scode; + } EXCEPINFO; + + [ + odl, + uuid(00000000-0000-0000-C000-000000000046) + ] + interface IUnknown + { + [restricted] + HRESULT QueryInterface( + [in] GUID *riid, + [out] void **ppvObj); + + [restricted] + unsigned long AddRef(); + + [restricted] + unsigned long Release(); + } + + [ + odl, + uuid(00020400-0000-0000-C000-000000000046) + ] + interface IDispatch : IUnknown + { + [restricted] + HRESULT GetTypeInfoCount( + [out] unsigned int *pctinfo); + + [restricted] + HRESULT GetTypeInfo( + [in] unsigned int itinfo, + [in] unsigned long lcid, + [out] void **pptinfo); + + [restricted] + HRESULT GetIDsOfNames( + [in] GUID *riid, + [in] char **rgszNames, + [in] unsigned int cNames, + [in] unsigned long lcid, + [out] long *rgdispid); + + [restricted] + HRESULT Invoke( + [in] long dispidMember, + [in] GUID *riid, + [in] unsigned long lcid, + [in] unsigned short wFlags, + [in] DISPPARAMS *pdispparams, + [out] VARIANT *pvarResult, + [out] EXCEPINFO *pexcepinfo, + [out] unsigned int *puArgErr); + + } + + [ + odl, + uuid(00020404-0000-0000-C000-000000000046) + ] + interface IEnumVARIANT : IUnknown + { + HRESULT Next( + [in] unsigned long celt, + [in] VARIANT *rgvar, + [out] unsigned long *pceltFetched); + + HRESULT Skip( + [in] unsigned long celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumVARIANT **ppenum); + } +}; Propchange: trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild (added) +++ trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild [iso-8859-1] Mon Sep 22 06:38:51 2008 @@ -1,0 +1,25 @@ +<group> +<module name="std_ole_v1" type="embeddedtypelib"> + <include base="std_ole_v1">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <file>std_ole_v1.idl</file> +</module> +<module name="stdole32.tlb" type="win32dll" extension=".tlb" installbase="system32" installname="stdole32.tlb" entrypoint="0"> + <importlibrary definition="stdole32.tlb.spec.def" /> + <include base="stdole32.tlb">.</include> + <include base="stdole32.tlb" root="intermediate">.</include> + <include base="ReactOS">include/reactos/wine</include> + <dependency>std_ole_v1</dependency> + <define name="__WINESRC__" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>kernel32</library> + <file>stdole32.tlb.spec</file> + <file>rsrc.rc</file> +</module> +</group> Propchange: trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.spec (added) +++ trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.spec [iso-8859-1] Mon Sep 22 06:38:51 2008 @@ -1,0 +1,1 @@ +# no exported entry points Propchange: trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Mon Sep 22 06:38:51 2008 @@ -346,6 +346,9 @@ <directory name="stdole2.tlb"> <xi:include href="stdole2.tlb/stdole2.rbuild" /> </directory> +<directory name="stdole32.tlb"> + <xi:include href="stdole32.tlb/stdole32.rbuild" /> +</directory> <directory name="sxs"> <xi:include href="sxs/sxs.rbuild" /> </directory>

1 0

[cwittich] 36399: -add missing raddr2line.c -fix some memory leaks
by cwittich＠svn.reactos.org 22 Sep '08

22 Sep '08

Author: cwittich Date: Mon Sep 22 05:51:36 2008 New Revision: 36399 URL: http://svn.reactos.org/svn/reactos?rev=36399&view=rev Log: -add missing raddr2line.c -fix some memory leaks Added: trunk/tools/sysreg2/raddr2line.c (with props) Modified: trunk/tools/sysreg2/options.c trunk/tools/sysreg2/virt.c Modified: trunk/tools/sysreg2/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/options.c?rev=36399&… ============================================================================== --- trunk/tools/sysreg2/options.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/options.c [iso-8859-1] Mon Sep 22 05:51:36 2008 @@ -29,6 +29,8 @@ { strncpy(AppSettings.Filename, obj->stringval, 254); } + if (obj) + xmlXPathFreeObject(obj); obj = xmlXPathEval(BAD_CAST"string(/settings/@vm)",ctxt); if ((obj != NULL) && ((obj->type == XPATH_STRING) && @@ -36,6 +38,8 @@ { strncpy(AppSettings.Name, obj->stringval, 79); } + if (obj) + xmlXPathFreeObject(obj); obj = xmlXPathEval(BAD_CAST"number(/settings/general/timeout/@ms)",ctxt); if ((obj != NULL) && (obj->type == XPATH_NUMBER)) @@ -44,6 +48,8 @@ * which means infinite */ AppSettings.Timeout = (int)obj->floatval; } + if (obj) + xmlXPathFreeObject(obj); obj = xmlXPathEval(BAD_CAST"number(/settings/general/hdd/@size)",ctxt); if ((obj != NULL) && (obj->type == XPATH_NUMBER)) @@ -53,6 +59,8 @@ else AppSettings.ImageSize = (int)obj->floatval; } + if (obj) + xmlXPathFreeObject(obj); for (Stage=0;Stage<3;Stage++) { @@ -65,6 +73,8 @@ { strncpy(AppSettings.Stage[Stage].BootDevice, obj->stringval, 7); } + if (obj) + xmlXPathFreeObject(obj); strcpy(TempStr, "string(/settings/"); strcat(TempStr, StageNames[Stage]); strcat(TempStr, "/success/@on)"); @@ -74,6 +84,8 @@ { strncpy(AppSettings.Stage[Stage].Checkpoint, obj->stringval, 79); } + if (obj) + xmlXPathFreeObject(obj); } xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); @@ -94,6 +106,8 @@ { strncpy(AppSettings.HardDiskImage, obj->stringval, 254); } + if (obj) + xmlXPathFreeObject(obj); xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); Added: trunk/tools/sysreg2/raddr2line.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/raddr2line.c?rev=363… ============================================================================== --- trunk/tools/sysreg2/raddr2line.c (added) +++ trunk/tools/sysreg2/raddr2line.c [iso-8859-1] Mon Sep 22 05:51:36 2008 @@ -1,0 +1,86 @@ +#include "sysreg.h" + +bool GetPackagePath(char* Buffer, int BuffSize, char* Module) +{ + char* ptr; + FILE* fp; + int i; + + fp = fopen("boot/bootdata/packages/reactos.dff", "r"); + if (fp) + { + while(fgets(Buffer, BuffSize,fp)) + { + if (strstr(Buffer, Module)) + { + ptr = strchr(Buffer, ' '); + if (ptr) + *ptr = '\0'; + + for (i = 0; i < strlen(Buffer); i++) + { + if (Buffer[i] == '\\') + Buffer[i] = '/'; + } + fclose(fp); + return true; + } + } + fclose(fp); + } + return false; +} + +bool ResolveAddressFromFile(char* Buffer, int BuffSize, char* Data) +{ + char* sep; + char* sep2; + char Module[32]; + char Addr[20]; + char Command[256]; + char PkgData[80]; + char emptystr[] = ""; + + if ((strchr(Data, '>')) && (!strchr(Data, ')'))) + { + sep = strchr(Data, ':'); + if (sep) + { + strncpy(Module, Data + 1, (int) (sep - Data) - 1); + Module[(int)(sep-Data)-2] = '\0'; + sep2 = strchr(Data, '>'); + strncpy(Addr, Data + (sep - Data + 1), (int) (sep2 - sep) -1); + Addr[(int)(sep2- sep)-1] = '\0'; + + if (GetPackagePath(PkgData, sizeof(PkgData), Module)) + { + const char* outdir = getenv("ROS_OUTPUT"); + char* ptr; + if (!outdir) + outdir = emptystr; + sprintf(Command, "%s/tools/raddr2line %s/%s %s 2>&1", + outdir, outdir, PkgData, Addr); + FILE* p = popen(Command, "r"); + char buf[100] = {'\0'}; + while(feof(p)==0) + { + fgets(buf,100,p); + if (strstr(buf, "error")) + strcpy(buf, "(no debug info)"); + ptr = strchr(buf, '\n'); + if (ptr) + *ptr = '\0'; + ptr = strchr(Data, '>'); + if (ptr) + *ptr = '\0'; + strcpy(Buffer, Data); + strcat(Buffer, " "); + strcat(Buffer, buf); + strcat(Buffer, ">\n"); + return true; + } + } + } + } + return false; +} Propchange: trunk/tools/sysreg2/raddr2line.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/sysreg2/virt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=36399&r1=… ============================================================================== --- trunk/tools/sysreg2/virt.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Mon Sep 22 05:51:36 2008 @@ -1,38 +1,41 @@ #include "sysreg.h" #include <libvirt.h> -const char* GetConsole(virDomainPtr vDomPtr) +bool GetConsole(virDomainPtr vDomPtr, char* console) { xmlDocPtr xml = NULL; xmlXPathObjectPtr obj = NULL; xmlXPathContextPtr ctxt = NULL; char* XmlDoc; - const char* RetVal = NULL; + bool RetVal = false; XmlDoc = virDomainGetXMLDesc(vDomPtr, 0); if (!XmlDoc) - return NULL; + return false; xml = xmlReadDoc((const xmlChar *) XmlDoc, "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOWARNING); free(XmlDoc); if (!xml) - return NULL; + return false; ctxt = xmlXPathNewContext(xml); if (!ctxt) { xmlFreeDoc(xml); - return NULL; + return false; } obj = xmlXPathEval(BAD_CAST "string(/domain/devices/console/@tty)", ctxt); if ((obj != NULL) && ((obj->type == XPATH_STRING) && (obj->stringval != NULL) && (obj->stringval[0] != 0))) { - RetVal = (const char*)obj->stringval; - } + strcpy(console, obj->stringval); + RetVal = true; + } + if (obj) + xmlXPathFreeObject(obj); xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); @@ -66,11 +69,13 @@ if (strcasecmp(name, domname) == 0) { virDomainFree(vDomPtr); + free(ids); return true; } virDomainFree(vDomPtr); } } + free(ids); return false; } @@ -105,12 +110,13 @@ { xmlSetProp(obj->nodesetval->nodeTab[0], "dev", BootDevice); } + if (obj) + xmlXPathFreeObject(obj); free(buffer); xmlDocDumpMemory(xml, (xmlChar**) &buffer, &len); xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); - xmlXPathFreeObject(obj); virDomainPtr vDomPtr = virDomainDefineXML(vConn, buffer); xmlFree((xmlChar*)buffer); @@ -146,6 +152,7 @@ FILE* file; char config[255]; int Ret = EXIT_SUCCESS; + char console[50]; if (argc == 2) strcpy(config, argv[1]); @@ -193,7 +200,8 @@ printf("\n\n\n"); printf("Running stage %d...\n", Stage + 1); printf("Domain %s started.\n", virDomainGetName(vDom)); - if (!ProcessDebugData(GetConsole(vDom), + GetConsole(vDom, console); + if (!ProcessDebugData(console, AppSettings.Timeout, Stage)) { Ret = EXIT_FAILURE;

1 0

[jimtabor] 36398: - Add UPDATELAYEREDWINDOWINFO structure and UpdateLayeredWindowIndirect and types to psdk. - Move UpdateLayeredWindow to def and change it to UpdateLayeredWindowIndirect.
by jimtabor＠svn.reactos.org 22 Sep '08

22 Sep '08

Author: jimtabor Date: Sun Sep 21 19:52:24 2008 New Revision: 36398 URL: http://svn.reactos.org/svn/reactos?rev=36398&view=rev Log: - Add UPDATELAYEREDWINDOWINFO structure and UpdateLayeredWindowIndirect and types to psdk. - Move UpdateLayeredWindow to def and change it to UpdateLayeredWindowIndirect. Modified: trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] Sun Sep 21 19:52:24 2008 @@ -704,7 +704,7 @@ UnregisterHotKey@8=NtUserUnregisterHotKey@8 UnregisterMessagePumpHook@0 UnregisterUserApiHook@0 -UpdateLayeredWindow@36 +UpdateLayeredWindow@36=NtUserUpdateLayeredWindow@36 UpdatePerUserSystemParameters@8 UpdateWindow@4 User32InitializeImmEntryTable@4 Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sun Sep 21 19:52:24 2008 @@ -1762,15 +1762,8 @@ * @unimplemented */ BOOL STDCALL -UpdateLayeredWindow(HWND hwnd, - HDC hdcDst, - POINT *pptDst, - SIZE *psize, - HDC hdcSrc, - POINT *pptSrc, - COLORREF crKey, - BLENDFUNCTION *pblend, - DWORD dwFlags) +UpdateLayeredWindowIndirect(HWND hwnd, + const UPDATELAYEREDWINDOWINFO *info) { UNIMPLEMENTED; return FALSE; Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Sep 21 19:52:24 2008 @@ -2594,6 +2594,10 @@ #define LWA_COLORKEY 1 #define LWA_ALPHA 2 #endif +#define ULW_COLORKEY 0x00000001 +#define ULW_ALPHA 0x00000002 +#define ULW_OPAQUE 0x00000004 +#define ULW_EX_NORESIZE 0x00000008 #define GA_PARENT 1 #define GA_ROOT 2 #define GA_ROOTOWNER 3 @@ -4279,6 +4283,20 @@ BOOL WINAPI SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD); #if defined(_WINGDI_) && !defined(NOGDI) BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); +typedef struct tagUPDATELAYEREDWINDOWINFO +{ + DWORD cbSize; + HDC hdcDst; + POINT CONST* pptDst; + SIZE CONST* psize; + HDC hdcSrc; + POINT CONST* pptSrc; + COLORREF crKey; + BLENDFUNCTION CONST* pblend; + DWORD dwFlags; + RECT CONST* prcDirty; +} UPDATELAYEREDWINDOWINFO, *PUPDATELAYEREDWINDOWINFO; +BOOL WINAPI UpdateLayeredWindowIndirect(HWND,UPDATELAYEREDWINDOWINFO CONST*); #endif #endif #if (_WIN32_WINNT >= 0x0501)

1 0

[tkreuzer] 36397: rename .spec to .pspec
by tkreuzer＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: tkreuzer Date: Sun Sep 21 17:38:52 2008 New Revision: 36397 URL: http://svn.reactos.org/svn/reactos?rev=36397&view=rev Log: rename .spec to .pspec Added: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.pspec - copied unchanged from r36393, branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec Removed: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] Sun Sep 21 17:38:52 2008 @@ -9,7 +9,7 @@ <library>hal</library> <file>scsiport.c</file> <file>scsiport.rc</file> - <file>scsiport.spec</file> + <file>scsiport.pspec</file> <if property="ARCH" value="amd64"> <file>stubs.c</file> </if> Removed: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec (removed) @@ -1,51 +1,0 @@ -#ifdef __x86_64__ -#define MAYBEFWD(x) -#else -#define MAYBEFWD(x) x -#endif - -@ cdecl ScsiDebugPrint() -@ stdcall ScsiPortCompleteRequest(ptr long long long long) -@ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) -@ stdcall ScsiPortConvertUlongToPhysicalAddress(long) MAYBEFWD(NTOSKRNL.RtlConvertUlongToLargeInteger) -@ stdcall ScsiPortFlushDma(ptr) -@ stdcall ScsiPortFreeDeviceBase(ptr ptr) -@ stdcall ScsiPortGetBusData(ptr long long long ptr long) -@ stdcall ScsiPortGetDeviceBase(ptr long long long long long long) -@ stdcall ScsiPortGetLogicalUnit(ptr long long long) -@ stdcall ScsiPortGetPhysicalAddress(ptr ptr ptr long) -@ stdcall ScsiPortGetSrb(ptr long long long long) -@ stdcall ScsiPortGetUncachedExtension(ptr ptr long) -@ stdcall ScsiPortGetVirtualAddress(ptr long long) -@ stdcall ScsiPortInitialize(ptr ptr ptr ptr) -@ stdcall ScsiPortIoMapTransfer(ptr ptr long long) -@ stdcall ScsiPortLogError(ptr ptr long long long long long) -@ stdcall ScsiPortMoveMemory(ptr ptr long) -@ cdecl ScsiPortNotification() -@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_UCHAR) -@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_USHORT) -@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_ULONG) -@ stdcall ScsiPortReadPortUchar(ptr) MAYBEFWD(HAL.READ_PORT_UCHAR) -@ stdcall ScsiPortReadPortUshort(ptr) MAYBEFWD(HAL.READ_PORT_USHORT) -@ stdcall ScsiPortReadPortUlong(ptr) MAYBEFWD(HAL.READ_PORT_ULONG) -@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_UCHAR) -@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_USHORT) -@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_ULONG) -@ stdcall ScsiPortReadRegisterUchar(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_UCHAR) -@ stdcall ScsiPortReadRegisterUshort(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_USHORT) -@ stdcall ScsiPortReadRegisterUlong(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_ULONG) -@ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long) -@ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor -@ stdcall ScsiPortValidateRange(ptr long long long long long long) -@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_UCHAR) -@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_USHORT) -@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_ULONG) -@ stdcall ScsiPortWritePortUchar(ptr long) MAYBEFWD(HAL.WRITE_PORT_UCHAR) -@ stdcall ScsiPortWritePortUshort(ptr long) MAYBEFWD(HAL.WRITE_PORT_USHORT) -@ stdcall ScsiPortWritePortUlong(ptr long) MAYBEFWD(HAL.WRITE_PORT_ULONG) -@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR) -@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT) -@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG) -@ stdcall ScsiPortWriteRegisterUchar(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_UCHAR) -@ stdcall ScsiPortWriteRegisterUshort(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_USHORT) -@ stdcall ScsiPortWriteRegisterUlong(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_ULONG)

1 0

[tkreuzer] 36396: use precompiler for .pspec files
by tkreuzer＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: tkreuzer Date: Sun Sep 21 17:37:57 2008 New Revision: 36396 URL: http://svn.reactos.org/svn/reactos?rev=36396&view=rev Log: use precompiler for .pspec files Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Sep 21 17:37:57 2008 @@ -440,6 +440,8 @@ newExtension = ".rc"; else if ( extension == ".spec" || extension == ".SPEC" ) newExtension = ".stubs.o"; + else if ( extension == ".pspec" || extension == ".PSPEC" ) + newExtension = ".stubs.o"; else if ( extension == ".idl" || extension == ".IDL" ) { if ( module.type == RpcServer ) @@ -1101,6 +1103,21 @@ "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c:\n" "\t${cp} $(NUL) $@ 1>$(NUL)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_CC)\n" + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule winebuildPCRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_WINEBLD)\n" + "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" + "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c: $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n" + "\t$(ECHO_WINEBLD)\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", @@ -1294,6 +1311,7 @@ { HostDontCare, TypeDontCare, ".mc", &wmcRule }, { HostFalse, Kernel, ".spec", &winebuildKMRule }, { HostFalse, KernelModeDLL, ".spec", &winebuildKMRule }, + { HostDontCare, TypeDontCare, ".pspec", &winebuildPCRule }, { HostDontCare, TypeDontCare, ".spec", &winebuildRule }, { HostDontCare, RpcServer, ".idl", &widlServerRule }, { HostDontCare, RpcClient, ".idl", &widlClientRule },

1 0

[tkreuzer] 36395: revert 36379
by tkreuzer＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: tkreuzer Date: Sun Sep 21 17:34:38 2008 New Revision: 36395 URL: http://svn.reactos.org/svn/reactos?rev=36395&view=rev Log: revert 36379 Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Sep 21 17:34:38 2008 @@ -1095,16 +1095,29 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule winebuildKMRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_WINEBLD)\n" + "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c:\n" + "\t${cp} $(NUL) $@ 1>$(NUL)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_CC)\n" + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" - "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c:\n" - "\t${cp} $(NUL) $@ 1>$(NUL)\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source)\n" + "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n" + "\t$(ECHO_WINEBLD)\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o", @@ -1279,6 +1292,8 @@ { HostDontCare, TypeDontCare, ".asm", &nasmRule }, { HostDontCare, TypeDontCare, ".rc", &windresRule }, { HostDontCare, TypeDontCare, ".mc", &wmcRule }, + { HostFalse, Kernel, ".spec", &winebuildKMRule }, + { HostFalse, KernelModeDLL, ".spec", &winebuildKMRule }, { HostDontCare, TypeDontCare, ".spec", &winebuildRule }, { HostDontCare, RpcServer, ".idl", &widlServerRule }, { HostDontCare, RpcClient, ".idl", &widlClientRule },

1 0

[ekohl] 36394: Sync to Wine-0.9.58 - Rob Shearman <rob@codeweavers.com> Thu, 14 Feb 2008 widl: Remove unused headers. - Rob Shearman <rob@codeweavers.com> Thu, 14 Feb 2008 widl: Guard the inclusion of unistd.h. - Rob Shearman <rob@codeweavers.com> Tue, 19 Feb 2008 Add the nounistd option to all lex source files. - Alexandre Julliard <julliard@winehq.org> Tue, 19 Feb 2008 Avoid the nounistd option that doesn't exist on older flex, define YY_NO_UNISTD_H... - Dan Hipschman <dsh@linux.ucla.edu> Thu,
by ekohl＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: ekohl Date: Sun Sep 21 16:18:42 2008 New Revision: 36394 URL: http://svn.reactos.org/svn/reactos?rev=36394&view=rev Log: Sync to Wine-0.9.58 - Rob Shearman <rob(a)codeweavers.com> Thu, 14 Feb 2008 widl: Remove unused headers. - Rob Shearman <rob(a)codeweavers.com> Thu, 14 Feb 2008 widl: Guard the inclusion of unistd.h. - Rob Shearman <rob(a)codeweavers.com> Tue, 19 Feb 2008 Add the nounistd option to all lex source files. - Alexandre Julliard <julliard(a)winehq.org> Tue, 19 Feb 2008 Avoid the nounistd option that doesn't exist on older flex, define YY_NO_UNISTD_H... - Dan Hipschman <dsh(a)linux.ucla.edu> Thu, 21 Feb 2008 widl: Allow is_string_type to work for typedef'd types. - Gerald Pfeifer <gerald(a)pfeifer.com> Fri, 22 Feb 2008 widl: Include <unistd.h> for prototype of unlink(). - Dan Hipschman <dsh(a)linux.ucla.edu> Wed, 19 Mar 2008 widl: Ignore libraries in imported IDL files. - Dan Hipschman <dsh(a)linux.ucla.edu> Thu, 20 Mar 2008 widl: Make structures with FC_ENUM16 fields complex. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=36… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=36… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=36… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=36… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=36… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=363… Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=36… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=3… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=3639… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re…

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008