[ros-diffs] [fireball] 32256: Winesync to Wine-0.9.55.
fireball at svn.reactos.org
fireball at svn.reactos.org
Sun Feb 10 13:26:59 CET 2008
Author: fireball
Date: Sun Feb 10 15:26:59 2008
New Revision: 32256
URL: http://svn.reactos.org/svn/reactos?rev=32256&view=rev
Log:
Winesync to Wine-0.9.55.
Modified:
trunk/reactos/dll/win32/oleaut32/oleaut.c
trunk/reactos/dll/win32/oleaut32/olefont.c
trunk/reactos/dll/win32/oleaut32/olepicture.c
trunk/reactos/dll/win32/oleaut32/safearray.c
trunk/reactos/dll/win32/oleaut32/tmarshal.c
trunk/reactos/dll/win32/oleaut32/typelib.c
trunk/reactos/dll/win32/oleaut32/typelib.h
trunk/reactos/dll/win32/oleaut32/typelib16.c
trunk/reactos/dll/win32/oleaut32/typelib2.c
trunk/reactos/dll/win32/oleaut32/variant.c
Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut.c?rev=32256&r1=32255&r2=32256&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/oleaut.c (original)
+++ trunk/reactos/dll/win32/oleaut32/oleaut.c Sun Feb 10 15:26:59 2008
@@ -837,7 +837,7 @@
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hInstDll);
- OLEAUT32_hModule = (HMODULE)hInstDll;
+ OLEAUT32_hModule = hInstDll;
break;
case DLL_PROCESS_DETACH:
break;
Modified: trunk/reactos/dll/win32/oleaut32/olefont.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olefont.c?rev=32256&r1=32255&r2=32256&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/olefont.c (original)
+++ trunk/reactos/dll/win32/oleaut32/olefont.c Sun Feb 10 15:26:59 2008
@@ -1215,6 +1215,7 @@
return hres;
}
hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IFontDisp, ppTInfo);
+ ITypeLib_Release(tl);
if (FAILED(hres)) {
FIXME("Did not IDispatch typeinfo from typelib, hres %x\n",hres);
}
Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepicture.c?rev=32256&r1=32255&r2=32256&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/olepicture.c (original)
+++ trunk/reactos/dll/win32/oleaut32/olepicture.c Sun Feb 10 15:26:59 2008
@@ -1237,6 +1237,7 @@
This->desc.picType = PICTYPE_BITMAP;
OLEPictureImpl_SetBitmap(This);
DGifCloseFile(gif);
+ HeapFree(GetProcessHeap(),0,bmi);
HeapFree(GetProcessHeap(),0,bytes);
return S_OK;
}
@@ -1277,7 +1278,7 @@
jd.err = pjpeg_std_error(&jerr);
/* jpeg_create_decompress is a macro that expands to jpeg_CreateDecompress - see jpeglib.h
* jpeg_create_decompress(&jd); */
- pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, (size_t) sizeof(struct jpeg_decompress_struct));
+ pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct));
jd.src = &xjsm;
ret=pjpeg_read_header(&jd,TRUE);
jd.out_color_space = JCS_RGB;
Modified: trunk/reactos/dll/win32/oleaut32/safearray.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/safearray.c?rev=32256&r1=32255&r2=32256&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/safearray.c (original)
+++ trunk/reactos/dll/win32/oleaut32/safearray.c Sun Feb 10 15:26:59 2008
@@ -805,7 +805,7 @@
if (!psa)
return E_INVALIDARG;
- if ((LONG)InterlockedDecrement( (LONG*) &psa->cLocks) < 0)
+ if (InterlockedDecrement( (LONG*) &psa->cLocks) < 0)
{
WARN("Unlocked but no lock held!\n");
InterlockedIncrement( (LONG*) &psa->cLocks);
Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarshal.c?rev=32256&r1=32255&r2=32256&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/tmarshal.c (original)
+++ trunk/reactos/dll/win32/oleaut32/tmarshal.c Sun Feb 10 15:26:59 2008
@@ -1468,6 +1468,7 @@
hres = remoteresult;
exit:
+ IRpcChannelBuffer_FreeBuffer(chanbuf,&msg);
for (i = 0; i < nrofnames; i++)
SysFreeString(names[i]);
HeapFree(GetProcessHeap(),0,buf.base);
Modified: trunk/reactos/dll/win32/oleaut32/typelib.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib.c?rev=32256&r1=32255&r2=32256&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/typelib.c (original)
+++ trunk/reactos/dll/win32/oleaut32/typelib.c Sun Feb 10 15:26:59 2008
@@ -2587,7 +2587,7 @@
ITypeInfoImpl **ppTI = &(pTypeLibImpl->pTypeInfo);
int i;
- for(i = 0; i<(int)tlbHeader.nrtypeinfos; i++)
+ for(i = 0; i < tlbHeader.nrtypeinfos; i++)
{
*ppTI = MSFT_DoTypeInfo(&cx, i, pTypeLibImpl);
@@ -6249,7 +6249,7 @@
if(ref_type->pImpTLInfo->pImpTypeLib) {
TRACE("typeinfo in imported typelib that is already loaded\n");
pTLib = (ITypeLib*)ref_type->pImpTLInfo->pImpTypeLib;
- ITypeLib2_AddRef((ITypeLib*) pTLib);
+ ITypeLib2_AddRef(pTLib);
result = S_OK;
} else {
TRACE("typeinfo in imported typelib that isn't already loaded\n");
Modified: trunk/reactos/dll/win32/oleaut32/typelib.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib.h?rev=32256&r1=32255&r2=32256&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/typelib.h (original)
+++ trunk/reactos/dll/win32/oleaut32/typelib.h Sun Feb 10 15:26:59 2008
@@ -96,13 +96,13 @@
/*1*/MSFT_pSeg pTypeInfoTab; /* each type info get an entry of 0x64 bytes */
/* (25 ints) */
/*2*/MSFT_pSeg pImpInfo; /* table with info for imported types */
-/*3*/MSFT_pSeg pImpFiles; /* import libaries */
+/*3*/MSFT_pSeg pImpFiles; /* import libraries */
/*4*/MSFT_pSeg pRefTab; /* References table */
-/*5*/MSFT_pSeg pLibtab; /* always exists, alway same size (0x80) */
+/*5*/MSFT_pSeg pLibtab; /* always exists, always same size (0x80) */
/* hash table w offsets to guid????? */
/*6*/MSFT_pSeg pGuidTab; /* all guids are stored here together with */
/* offset in some table???? */
-/*7*/MSFT_pSeg res07; /* always created, alway same size (0x200) */
+/*7*/MSFT_pSeg res07; /* always created, always same size (0x200) */
/* purpose largely unknown */
/*8*/MSFT_pSeg pNametab; /* name tables */
/*9*/MSFT_pSeg pStringtab; /* string table */
@@ -120,10 +120,10 @@
/* base type info data */
typedef struct tagMSFT_TypeInfoBase {
/*000*/ INT typekind; /* it is the TKIND_xxx */
- /* some byte alignment stuf */
+ /* some byte alignment stuff */
INT memoffset; /* points past the file, if no elements */
INT res2; /* zero if no element, N*0x40 */
- INT res3; /* -1 if no lement, (N-1)*0x38 */
+ INT res3; /* -1 if no element, (N-1)*0x38 */
/*010*/ INT res4; /* always? 3 */
INT res5; /* always? zero */
INT cElement; /* counts elements, HI=cVars, LO=cFuncs */
Modified: trunk/reactos/dll/win32/oleaut32/typelib16.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib16.c?rev=32256&r1=32255&r2=32256&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/typelib16.c (original)
+++ trunk/reactos/dll/win32/oleaut32/typelib16.c Sun Feb 10 15:26:59 2008
@@ -91,7 +91,7 @@
wMaj,wMin,lcid);
} else {
sprintf(xguid,"<guid 0x%08x>",(DWORD)guid);
- FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,(DWORD)lcid,path);
+ FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path);
return E_FAIL;
}
plen = sizeof(pathname);
Modified: trunk/reactos/dll/win32/oleaut32/typelib2.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib2.c?rev=32256&r1=32255&r2=32256&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/typelib2.c (original)
+++ trunk/reactos/dll/win32/oleaut32/typelib2.c Sun Feb 10 15:26:59 2008
@@ -1225,7 +1225,7 @@
This->typeinfo->flags = uTypeFlags;
- if (uTypeFlags & 0x1000) {
+ if (uTypeFlags & TYPEFLAG_FDISPATCHABLE) {
MSFT_GuidEntry foo;
int guidoffset;
int fileoffset;
Modified: trunk/reactos/dll/win32/oleaut32/variant.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant.c?rev=32256&r1=32255&r2=32256&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/variant.c (original)
+++ trunk/reactos/dll/win32/oleaut32/variant.c Sun Feb 10 15:26:59 2008
@@ -2654,7 +2654,7 @@
* left [I] First variant
* right [I] Second variant
* lcid [I] LCID (locale identifier) for the comparison
- * flags [I] Flags to be used in the comparision:
+ * flags [I] Flags to be used in the comparison:
* NORM_IGNORECASE, NORM_IGNORENONSPACE, NORM_IGNORESYMBOLS,
* NORM_IGNOREWIDTH, NORM_IGNOREKANATYPE, NORM_IGNOREKASHIDA
*
@@ -2677,9 +2677,9 @@
* is not an EMPTY variant. All four VT_RESERVED combinations have a
* different meaning:
* - BSTR and other: BSTR is always greater than the other variant.
- * - BSTR|VT_RESERVED and other: a string comparision is performed.
+ * - BSTR|VT_RESERVED and other: a string comparison is performed.
* - BSTR and other|VT_RESERVED: If the BSTR is a number a numeric
- * comparision will take place else the BSTR is always greater.
+ * comparison will take place else the BSTR is always greater.
* - BSTR|VT_RESERVED and other|VT_RESERVED: It seems that the other
* variant is ignored and the return value depends only on the sign
* of the BSTR if it is a number else the BSTR is always greater. A
@@ -2763,7 +2763,7 @@
/* No VT_RESERVED set ==> BSTR always greater */
rc = VARCMP_GT;
else if (breserv && !nreserv) {
- /* BSTR has VT_RESERVED set. Do a string comparision */
+ /* BSTR has VT_RESERVED set. Do a string comparison */
rc = VariantChangeTypeEx(&rv,nonbv,lcid,0,VT_BSTR);
if (FAILED(rc))
return rc;
@@ -2780,7 +2780,7 @@
the BSTR number */
rc = (V_R8(&lv) >= 0) ? VARCMP_GT : VARCMP_LT;
else
- /* Numeric comparision, will be handled below.
+ /* Numeric comparison, will be handled below.
VARCMP_NULL used only to break out. */
rc = VARCMP_NULL;
VariantClear(&lv);
More information about the Ros-diffs
mailing list