May 2006 - Wine-Commits - list.winehq.org

Robert Shearman : rpcrt4: If the number of pointers is 0 for NdrFullPointerXlatInit then
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: 11eb8ee042f6b324d3b2c0457bcf5a676dfd7579 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11eb8ee042f6b324d3b2c04… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 29 16:27:48 2006 +0100 rpcrt4: If the number of pointers is 0 for NdrFullPointerXlatInit then set the number of pointers to a large default, so that NumberOfBuckets doesn't end up less than zero. --- dlls/rpcrt4/ndr_fullpointer.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index f4485b2..b89b669 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -32,11 +32,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(rpc); PFULL_PTR_XLAT_TABLES WINAPI NdrFullPointerXlatInit(unsigned long NumberOfPointers, XLAT_SIDE XlatSide) { - unsigned long NumberOfBuckets = ((NumberOfPointers + 3) & 4) - 1; + unsigned long NumberOfBuckets; PFULL_PTR_XLAT_TABLES pXlatTables = HeapAlloc(GetProcessHeap(), 0, sizeof(*pXlatTables)); TRACE("(%ld, %d)\n", NumberOfPointers, XlatSide); + if (!NumberOfPointers) NumberOfPointers = 512; + NumberOfBuckets = ((NumberOfPointers + 3) & ~3) - 1; + pXlatTables->RefIdToPointer.XlatTable = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(void *) * NumberOfPointers);

1 0

Robert Shearman : rpcrt4: Handle marshaling/unmarshaling full pointers.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: ff9fd9c430fc4d5144372fae09f005e718085ff0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff9fd9c430fc4d5144372fa… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 29 16:27:27 2006 +0100 rpcrt4: Handle marshaling/unmarshaling full pointers. --- dlls/rpcrt4/ndr_marshall.c | 58 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index f9164df..8b66899 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -749,6 +749,8 @@ static void PointerMarshall(PMIDL_STUB_M unsigned type = pFormat[0], attr = pFormat[1]; PFORMAT_STRING desc; NDR_MARSHALL m; + unsigned long pointer_id; + int pointer_needs_marshaling; TRACE("(%p,%p,%p,%p)\n", pStubMsg, Buffer, Pointer, pFormat); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); @@ -762,21 +764,33 @@ #if 0 /* this causes problems for Instal if (!Pointer) RpcRaiseException(RPC_X_NULL_REF_POINTER); #endif + pointer_needs_marshaling = 1; break; case RPC_FC_UP: /* unique pointer */ case RPC_FC_OP: /* object pointer - same as unique here */ - TRACE("writing %p to buffer\n", Pointer); - NDR_LOCAL_UINT32_WRITE(Buffer, (unsigned long)Pointer); + if (Pointer) + pointer_needs_marshaling = 1; + else + pointer_needs_marshaling = 0; + pointer_id = (unsigned long)Pointer; + TRACE("writing 0x%08lx to buffer\n", pointer_id); + NDR_LOCAL_UINT32_WRITE(Buffer, pointer_id); break; case RPC_FC_FP: + pointer_needs_marshaling = !NdrFullPointerQueryPointer( + pStubMsg->FullPtrXlatTables, Pointer, 1, &pointer_id); + TRACE("writing 0x%08lx to buffer\n", pointer_id); + NDR_LOCAL_UINT32_WRITE(Buffer, pointer_id); + break; default: FIXME("unhandled ptr type=%02x\n", type); RpcRaiseException(RPC_X_BAD_STUB_DATA); + return; } TRACE("calling marshaller for type 0x%x\n", (int)*desc); - if (Pointer) { + if (pointer_needs_marshaling) { if (attr & RPC_FC_P_DEREF) { Pointer = *(unsigned char**)Pointer; TRACE("deref => %p\n", Pointer); @@ -802,6 +816,7 @@ static void PointerUnmarshall(PMIDL_STUB PFORMAT_STRING desc; NDR_UNMARSHALL m; DWORD pointer_id = 0; + int pointer_needs_unmarshaling; TRACE("(%p,%p,%p,%p,%d)\n", pStubMsg, Buffer, pPointer, pFormat, fMustAlloc); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); @@ -811,25 +826,39 @@ static void PointerUnmarshall(PMIDL_STUB switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ - pointer_id = ~0UL; + pointer_needs_unmarshaling = 1; break; case RPC_FC_UP: /* unique pointer */ pointer_id = NDR_LOCAL_UINT32_READ(Buffer); TRACE("pointer_id is 0x%08lx\n", pointer_id); + if (pointer_id) + pointer_needs_unmarshaling = 1; + else + pointer_needs_unmarshaling = 0; break; case RPC_FC_OP: /* object pointer - we must free data before overwriting it */ pointer_id = NDR_LOCAL_UINT32_READ(Buffer); TRACE("pointer_id is 0x%08lx\n", pointer_id); if (!fMustAlloc && *pPointer) FIXME("free object pointer %p\n", *pPointer); + if (pointer_id) + pointer_needs_unmarshaling = 1; + else + pointer_needs_unmarshaling = 0; break; case RPC_FC_FP: + pointer_id = NDR_LOCAL_UINT32_READ(Buffer); + TRACE("pointer_id is 0x%08lx\n", pointer_id); + pointer_needs_unmarshaling = !NdrFullPointerQueryRefId( + pStubMsg->FullPtrXlatTables, pointer_id, 1, (void **)pPointer); + break; default: FIXME("unhandled ptr type=%02x\n", type); RpcRaiseException(RPC_X_BAD_STUB_DATA); + return; } - if (pointer_id) { + if (pointer_needs_unmarshaling) { if (attr & RPC_FC_P_DEREF) { if (!*pPointer || fMustAlloc) *pPointer = NdrAllocate(pStubMsg, sizeof(void *)); @@ -839,6 +868,10 @@ static void PointerUnmarshall(PMIDL_STUB m = NdrUnmarshaller[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, pPointer, desc, fMustAlloc); else FIXME("no unmarshaller for data type=%02x\n", *desc); + + if (type == RPC_FC_FP) + NdrFullPointerInsertRefId(pStubMsg->FullPtrXlatTables, pointer_id, + *pPointer); } TRACE("pointer=%p\n", *pPointer); @@ -854,6 +887,8 @@ static void PointerBufferSize(PMIDL_STUB unsigned type = pFormat[0], attr = pFormat[1]; PFORMAT_STRING desc; NDR_BUFFERSIZE m; + int pointer_needs_sizing; + unsigned long pointer_id; TRACE("(%p,%p,%p)\n", pStubMsg, Pointer, pFormat); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); @@ -871,9 +906,15 @@ static void PointerBufferSize(PMIDL_STUB return; break; case RPC_FC_FP: + pointer_needs_sizing = !NdrFullPointerQueryPointer( + pStubMsg->FullPtrXlatTables, Pointer, 0, &pointer_id); + if (!pointer_needs_sizing) + return; + break; default: FIXME("unhandled ptr type=%02x\n", type); RpcRaiseException(RPC_X_BAD_STUB_DATA); + return; } if (attr & RPC_FC_P_DEREF) { @@ -942,6 +983,13 @@ static void PointerFree(PMIDL_STUB_MESSA if (!Pointer) return; + if (type == RPC_FC_FP) { + int pointer_needs_freeing = NdrFullPointerFree( + pStubMsg->FullPtrXlatTables, Pointer); + if (!pointer_needs_freeing) + return; + } + if (attr & RPC_FC_P_DEREF) { Pointer = *(unsigned char**)Pointer; TRACE("deref => %p\n", Pointer);

1 0

Andrew Talbot : comctl32/tests: Write-strings warnings fix.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: 5ca5c8489e0d339c1eeb73eb4c5b083a22b62135 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ca5c8489e0d339c1eeb73e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 29 17:26:51 2006 +0100 comctl32/tests: Write-strings warnings fix. --- dlls/comctl32/tests/treeview.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 06e9332..b71be91 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -70,25 +70,27 @@ static void IdentifyItem(HTREEITEM hItem static void FillRoot(void) { TVINSERTSTRUCTA ins; + static CHAR root[] = "Root", + child[] = "Child"; Clear(); - AddItem('A'); + AddItem('A'); ins.hParent = TVI_ROOT; ins.hInsertAfter = TVI_ROOT; U(ins).item.mask = TVIF_TEXT; - U(ins).item.pszText = "Root"; + U(ins).item.pszText = root; hRoot = TreeView_InsertItem(hTree, &ins); assert(hRoot); - + AddItem('B'); ins.hParent = hRoot; ins.hInsertAfter = TVI_FIRST; U(ins).item.mask = TVIF_TEXT; - U(ins).item.pszText = "Child"; + U(ins).item.pszText = child; hChild = TreeView_InsertItem(hTree, &ins); assert(hChild); AddItem('.'); - + ok(!strcmp(sequence, "AB."), "Item creation\n"); }

1 0

Robert Shearman : rpcrt4: For full pointers the state consists of flags, so or new flags into the field instead of assigning.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: bf985900e2b5b238b05b5697321bc816a5845926 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf985900e2b5b238b05b569… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 29 16:27:16 2006 +0100 rpcrt4: For full pointers the state consists of flags, so or new flags into the field instead of assigning. The return value of all full pointer functions that return an int depends on the passed in query type being a flag in the state. --- dlls/rpcrt4/ndr_fullpointer.c | 21 ++++++++++++--------- dlls/rpcrt4/tests/ndr_marshall.c | 25 +++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index bd2f5a3..f4485b2 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -113,10 +113,10 @@ int WINAPI NdrFullPointerQueryPointer(PF if (pPointer == XlatTableEntry->Pointer) { *pRefId = XlatTableEntry->RefId; - if (pXlatTables->XlatSide == XLAT_SERVER) - return XlatTableEntry->State; - else - return 0; + if (XlatTableEntry->State & QueryType) + return 1; + XlatTableEntry->State |= QueryType; + return 0; } XlatTableEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(*XlatTableEntry)); @@ -152,9 +152,10 @@ int WINAPI NdrFullPointerQueryRefId(PFUL *ppPointer = pXlatTables->RefIdToPointer.XlatTable[RefId]; if (QueryType) { - int ret = pXlatTables->RefIdToPointer.StateTable[RefId]; - pXlatTables->RefIdToPointer.StateTable[RefId] = QueryType; - return ret; + if (pXlatTables->RefIdToPointer.StateTable[RefId] & QueryType) + return 1; + pXlatTables->RefIdToPointer.StateTable[RefId] |= QueryType; + return 0; } else return 0; @@ -209,7 +210,9 @@ int WINAPI NdrFullPointerFree(PFULL_PTR_ for (; XlatTableEntry; XlatTableEntry = XlatTableEntry->Next) if (Pointer == XlatTableEntry->Pointer) { - XlatTableEntry->State = 0x20; + if (XlatTableEntry->State & 0x20) + return 0; + XlatTableEntry->State |= 0x20; RefId = XlatTableEntry->RefId; break; } @@ -219,7 +222,7 @@ int WINAPI NdrFullPointerFree(PFULL_PTR_ if (pXlatTables->RefIdToPointer.NumberOfEntries > RefId) { - pXlatTables->RefIdToPointer.StateTable[RefId] = 0x20; + pXlatTables->RefIdToPointer.StateTable[RefId] |= 0x20; return 1; } diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 22dee82..0a70b9a 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -767,9 +767,7 @@ static void test_fullpointer_xlat(void) ok(RefId == 0x3, "RefId should be 0x3 instead of 0x%lx\n", RefId); ret = NdrFullPointerQueryPointer(pXlatTables, (void *)0xcafebeef, 0, &RefId); - todo_wine { ok(ret == 0, "ret should be 0 instead of 0x%x\n", ret); - } ok(RefId == 0x3, "RefId should be 0x3 instead of 0x%lx\n", RefId); ret = NdrFullPointerQueryPointer(pXlatTables, (void *)0xcafebabe, 0, &RefId); @@ -785,12 +783,35 @@ static void test_fullpointer_xlat(void) ret = NdrFullPointerFree(pXlatTables, (void *)0xcafebeef); ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); + ret = NdrFullPointerQueryPointer(pXlatTables, (void *)0xcafebeef, 0x20, &RefId); + ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); + ok(RefId == 0x3, "RefId should be 0x3 instead of 0x%lx\n", RefId); + + ret = NdrFullPointerQueryPointer(pXlatTables, (void *)0xcafebeef, 1, &RefId); + ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); + ok(RefId == 0x3, "RefId should be 0x3 instead of 0x%lx\n", RefId); + ret = NdrFullPointerFree(pXlatTables, (void *)0xcafebabe); ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); ret = NdrFullPointerFree(pXlatTables, (void *)0xdeadbeef); ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); + ret = NdrFullPointerQueryPointer(pXlatTables, (void *)0xdeadbeef, 0x20, &RefId); + ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); + ok(RefId == 0x4, "RefId should be 0x4 instead of 0x%lx\n", RefId); + + ret = NdrFullPointerQueryPointer(pXlatTables, (void *)0xdeadbeef, 1, &RefId); + ok(ret == 0, "ret should be 0 instead of 0x%x\n", ret); + ok(RefId == 0x4, "RefId should be 0x4 instead of 0x%lx\n", RefId); + + ret = NdrFullPointerQueryPointer(pXlatTables, (void *)0xdeadbeef, 1, &RefId); + ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); + ok(RefId == 0x4, "RefId should be 0x4 instead of 0x%lx\n", RefId); + + ret = NdrFullPointerFree(pXlatTables, (void *)0xdeadbeef); + ok(ret == 0, "ret should be 0 instead of 0x%x\n", ret); + NdrFullPointerXlatFree(pXlatTables); }

1 0

Hans Leidekker : msi: Implement MsiLocateComponent{A,W}.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: 4f62bf79dcd31989dfbe8875692e0b7b4e1c7308 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f62bf79dcd31989dfbe887… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon May 29 12:51:00 2006 +0200 msi: Implement MsiLocateComponent{A,W}. --- dlls/msi/msi.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 53efaee..05d9380 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -835,15 +835,27 @@ LANGID WINAPI MsiLoadStringA( MSIHANDLE INSTALLSTATE WINAPI MsiLocateComponentA(LPCSTR szComponent, LPSTR lpPathBuf, DWORD *pcchBuf) { - FIXME("%s %p %p\n", debugstr_a(szComponent), lpPathBuf, pcchBuf); - return INSTALLSTATE_UNKNOWN; + char szProduct[GUID_SIZE]; + + TRACE("%s %p %p\n", debugstr_a(szComponent), lpPathBuf, pcchBuf); + + if (MsiGetProductCodeA( szComponent, szProduct ) != ERROR_SUCCESS) + return INSTALLSTATE_UNKNOWN; + + return MsiGetComponentPathA( szProduct, szComponent, lpPathBuf, pcchBuf ); } INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR szComponent, LPWSTR lpPathBuf, DWORD *pcchBuf) { - FIXME("%s %p %p\n", debugstr_w(szComponent), lpPathBuf, pcchBuf); - return INSTALLSTATE_UNKNOWN; + WCHAR szProduct[GUID_SIZE]; + + TRACE("%s %p %p\n", debugstr_w(szComponent), lpPathBuf, pcchBuf); + + if (MsiGetProductCodeW( szComponent, szProduct ) != ERROR_SUCCESS) + return INSTALLSTATE_UNKNOWN; + + return MsiGetComponentPathW( szProduct, szComponent, lpPathBuf, pcchBuf ); } UINT WINAPI MsiMessageBoxA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType,

1 0

Mike McCormack : wldap32: Fix unused variable warnings.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: e4438fe14f1c8cb6f92905fe649cfbe28c74d13c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4438fe14f1c8cb6f92905f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon May 29 19:39:09 2006 +0900 wldap32: Fix unused variable warnings. --- dlls/wldap32/add.c | 9 +++++++-- dlls/wldap32/modify.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/add.c b/dlls/wldap32/add.c index 3d6bd82..99d7c81 100644 --- a/dlls/wldap32/add.c +++ b/dlls/wldap32/add.c @@ -31,8 +31,9 @@ #include "winnls.h" #ifdef HAVE_LDAP_H #include <ldap.h> -static LDAPMod *nullattrs[] = { NULL }; -#else +#endif + +#ifndef LDAP_NOT_SUPPORTED #define LDAP_NOT_SUPPORTED 0x5c #endif @@ -41,6 +42,10 @@ #include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#ifdef HAVE_LDAP +static LDAPMod *nullattrs[] = { NULL }; +#endif + /*********************************************************************** * ldap_addA (WLDAP32.@) * diff --git a/dlls/wldap32/modify.c b/dlls/wldap32/modify.c index 029bdb5..e0890ce 100644 --- a/dlls/wldap32/modify.c +++ b/dlls/wldap32/modify.c @@ -31,8 +31,9 @@ #include "winnls.h" #ifdef HAVE_LDAP_H #include <ldap.h> -static LDAPMod *nullmods[] = { NULL }; -#else +#endif + +#ifndef LDAP_NOT_SUPPORTED #define LDAP_NOT_SUPPORTED 0x5c #endif @@ -41,6 +42,10 @@ #include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#ifdef HAVE_LDAP +static LDAPMod *nullmods[] = { NULL }; +#endif + /*********************************************************************** * ldap_modifyA (WLDAP32.@) *

1 0

Stefan Dösinger : wined3d: Release the memory in IWineGDISurface::PrivateSetup before calling GetDC.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: 21218c8587be416f6bf4c6d546351961f14239b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=21218c8587be416f6bf4c6d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 29 10:53:43 2006 +0200 wined3d: Release the memory in IWineGDISurface::PrivateSetup before calling GetDC. --- dlls/wined3d/surface_gdi.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 3b25ff4..b84bc25 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1459,13 +1459,20 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3 HRESULT hr; HDC hdc; + /* Sysmem textures have memory already allocated - + * release it, this avoids an unnecessary memcpy + */ + HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + This->resource.allocatedMemory = NULL; + /* We don't mind the nonpow2 stuff in GDI */ + This->resource.size = This->currentDesc.Width * D3DFmtGetBpp(This->resource.wineD3DDevice, This->resource.format) * This->currentDesc.Width; This->pow2Size = This->resource.size; This->pow2Width = This->currentDesc.Width; This->pow2Height = This->currentDesc.Height; This->Flags &= ~SFLAG_NONPOW2; - /* Call GetDC to create a DIB section. We will use that + /* Call GetDC to create a DIB section. We will use that * DIB section for rendering * * Release the DC afterwards to allow the app to use it

1 0

Mike McCormack : msiexec: Improve 64bit compatibility.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: e550eab7e5b114afd0365ae951839d448d5c6d0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e550eab7e5b114afd0365ae… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue May 30 10:47:27 2006 +0900 msiexec: Improve 64bit compatibility. --- programs/msiexec/msiexec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 3c7c306..809b38f 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -453,7 +453,7 @@ int main(int argc, char **argv) DWORD RepairMode = 0; - DWORD AdvertiseMode = 0; + DWORD_PTR AdvertiseMode = 0; struct string_list *transform_list = NULL; LANGID Language = 0;

1 0

Stefan Dösinger : wined3d: Do not disable GL_BLEND when alpha blending is active.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: ebcef4a5f616aaf5e6d2f5ae907efddf18becc2c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ebcef4a5f616aaf5e6d2f5a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 29 10:55:38 2006 +0200 wined3d: Do not disable GL_BLEND when alpha blending is active. --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a22275..a9dc6b4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3943,7 +3943,8 @@ #endif glEnable(GL_LINE_SMOOTH); checkGLcall("glEnable(GL_LINE_SMOOTH)"); } else { - glDisable(GL_BLEND); + if(!This->stateBlock->renderState[WINED3DRS_ALPHABLENDENABLE]) + glDisable(GL_BLEND); checkGLcall("glDisable(GL_BLEND)"); glDisable(GL_LINE_SMOOTH); checkGLcall("glDisable(GL_LINE_SMOOTH)");

1 0

Mike McCormack : gdi32: Fix an unused variable warning.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: 20c24fd3a27eb6d9e63783b4566fcfe0ad745426 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=20c24fd3a27eb6d9e63783b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon May 29 19:38:49 2006 +0900 gdi32: Fix an unused variable warning. --- dlls/gdi/freetype.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 3136244..abb33f9 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -4040,21 +4040,23 @@ BOOL WINAPI FontIsLinked(HDC hdc) static BOOL is_hinting_enabled(void) { - FT_Module mod; - /* Use the >= 2.2.0 function if available */ if(pFT_Get_TrueType_Engine_Type) { FT_TrueTypeEngineType type = pFT_Get_TrueType_Engine_Type(library); return type == FT_TRUETYPE_ENGINE_TYPE_PATENTED; } - - /* otherwise if we've been compiled with < 2.2.0 headers - use the internal macro */ #ifdef FT_DRIVER_HAS_HINTER - mod = pFT_Get_Module(library, "truetype"); - if(mod && FT_DRIVER_HAS_HINTER(mod)) - return TRUE; + else + { + FT_Module mod; + + /* otherwise if we've been compiled with < 2.2.0 headers + use the internal macro */ + mod = pFT_Get_Module(library, "truetype"); + if(mod && FT_DRIVER_HAS_HINTER(mod)) + return TRUE; + } #endif return FALSE;

1 0