February 2008 - Wine-commits

James Hawkins : msi: Forward MsiSourceListEnumSourcesA to a stub implementation of MsiSourceListEnumSourcesW .
by Alexandre Julliard 20 Feb '08

20 Feb '08

Module: wine Branch: master Commit: 55b470545f1e0d9c4ee8fc5edd29d989d569057f URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b470545f1e0d9c4ee8fc5ed… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 19 20:53:44 2008 -0600 msi: Forward MsiSourceListEnumSourcesA to a stub implementation of MsiSourceListEnumSourcesW. --- dlls/msi/msi.spec | 2 +- dlls/msi/source.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 9329e7f..2810b82 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -257,7 +257,7 @@ 261 stub MsiSourceListForceResolutionExA 262 stub MsiSourceListForceResolutionExW 263 stdcall MsiSourceListEnumSourcesA(str str long long long ptr ptr) -264 stub MsiSourceListEnumSourcesW +264 stdcall MsiSourceListEnumSourcesW(wstr wstr long long long ptr ptr) 265 stdcall MsiSourceListGetInfoA(str str long long str ptr ptr) 266 stdcall MsiSourceListGetInfoW(wstr wstr long long wstr ptr ptr) 267 stdcall MsiSourceListSetInfoA(str str long long str str) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 1d9a28b..5537122 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -148,8 +148,62 @@ UINT WINAPI MsiSourceListEnumSourcesA(LPCSTR szProductCodeOrPatch, LPCSTR szUser DWORD dwOptions, DWORD dwIndex, LPSTR szSource, LPDWORD pcchSource) { - FIXME("(%s, %s, %d, %d, %d, %p, %p): stub!\n", szProductCodeOrPatch, szUserSid, - dwContext, dwOptions, dwIndex, szSource, pcchSource); + LPWSTR product = NULL; + LPWSTR usersid = NULL; + LPWSTR source = NULL; + DWORD len = 0; + UINT r; + + TRACE("(%s, %s, %d, %d, %d, %p, %p)\n", debugstr_a(szProductCodeOrPatch), + debugstr_a(szUserSid), dwContext, dwOptions, dwIndex, szSource, pcchSource); + + if (szSource && !pcchSource) + return ERROR_INVALID_PARAMETER; + + if (szProductCodeOrPatch) product = strdupAtoW(szProductCodeOrPatch); + if (szUserSid) usersid = strdupAtoW(szUserSid); + + r = MsiSourceListEnumSourcesW(product, usersid, dwContext, dwOptions, + dwIndex, NULL, &len); + if (r != ERROR_SUCCESS) + goto done; + + source = msi_alloc(++len * sizeof(WCHAR)); + if (!source) + return ERROR_OUTOFMEMORY; + + *source = '\0'; + r = MsiSourceListEnumSourcesW(product, usersid, dwContext, dwOptions, + dwIndex, source, &len); + if (r != ERROR_SUCCESS) + goto done; + + len = WideCharToMultiByte(CP_ACP, 0, source, -1, NULL, 0, NULL, NULL); + if (*pcchSource >= len) + WideCharToMultiByte(CP_ACP, 0, source, -1, szSource, len, NULL, NULL); + else if (szSource) + r = ERROR_MORE_DATA; + + *pcchSource = len - 1; + +done: + msi_free(product); + msi_free(usersid); + msi_free(source); + + return r; +} + +/****************************************************************** + * MsiSourceListEnumSourcesA (MSI.@) + */ +UINT WINAPI MsiSourceListEnumSourcesW(LPCWSTR szProductCodeOrPatch, LPCWSTR szUserSid, + MSIINSTALLCONTEXT dwContext, + DWORD dwOptions, DWORD dwIndex, + LPWSTR szSource, LPDWORD pcchSource) +{ + FIXME("(%s, %s, %d, %d, %d, %p, %p): stub!\n", debugstr_w(szProductCodeOrPatch), + debugstr_w(szUserSid), dwContext, dwOptions, dwIndex, szSource, pcchSource); return ERROR_CALL_NOT_IMPLEMENTED; }

1 0

Michael Stefaniuc : gdi32: Move EnumFontFamiliesEx16() to gdi16. c and reimplement it based on EnumFontFamiliesExW().
by Alexandre Julliard 20 Feb '08

20 Feb '08

Module: wine Branch: master Commit: de66aebebdb5dc496684f11f51fa95241c6a90fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=de66aebebdb5dc496684f11f5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 20 00:13:32 2008 +0100 gdi32: Move EnumFontFamiliesEx16() to gdi16.c and reimplement it based on EnumFontFamiliesExW(). --- dlls/gdi32/font.c | 196 ---------------------------------------------------- dlls/gdi32/gdi16.c | 109 +++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 196 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de66aebebdb5dc496684f…

1 0

Marcus Meissner : netapi32: Added some return value checking.
by Alexandre Julliard 20 Feb '08

20 Feb '08

Module: wine Branch: master Commit: 47b050a047fcd47664376cb652f4ea97b9a86993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b050a047fcd47664376cb65… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Feb 19 23:08:14 2008 +0100 netapi32: Added some return value checking. --- dlls/netapi32/wksta.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index a72b18e..9a4d531 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -308,6 +308,8 @@ NetWkstaTransportEnum(LMSTR ServerName, DWORD level, PBYTE* pbuf, NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, PBYTE* bufptr) { + NET_API_STATUS nastatus; + TRACE("(%s, %d, %p)\n", debugstr_w(reserved), level, bufptr); switch (level) { @@ -317,8 +319,10 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, DWORD dwSize = UNLEN + 1; /* set up buffer */ - NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_0) + dwSize * sizeof(WCHAR), + nastatus = NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_0) + dwSize * sizeof(WCHAR), (LPVOID *) bufptr); + if (nastatus != NERR_Success) + return ERROR_NOT_ENOUGH_MEMORY; ui = (PWKSTA_USER_INFO_0) *bufptr; ui->wkui0_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_0)); @@ -329,11 +333,14 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, NetApiBufferFree(ui); return ERROR_NOT_ENOUGH_MEMORY; } - else - NetApiBufferReallocate( + else { + nastatus = NetApiBufferReallocate( *bufptr, sizeof(WKSTA_USER_INFO_0) + (lstrlenW(ui->wkui0_username) + 1) * sizeof(WCHAR), (LPVOID *) bufptr); + if (nastatus != NERR_Success) + return nastatus; + } break; } @@ -356,7 +363,9 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, /* get some information first to estimate size of the buffer */ ui0 = NULL; - NetWkstaUserGetInfo(NULL, 0, (PBYTE *) &ui0); + nastatus = NetWkstaUserGetInfo(NULL, 0, (PBYTE *) &ui0); + if (nastatus != NERR_Success) + return nastatus; username_sz = lstrlenW(ui0->wkui0_username) + 1; ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); @@ -376,10 +385,14 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, LsaClose(PolicyHandle); /* set up buffer */ - NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_1) + + nastatus = NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_1) + (username_sz + logon_domain_sz + oth_domains_sz + logon_server_sz) * sizeof(WCHAR), (LPVOID *) bufptr); + if (nastatus != NERR_Success) { + NetApiBufferFree(ui0); + return nastatus; + } ui = (WKSTA_USER_INFO_1 *) *bufptr; ui->wkui1_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_1)); ui->wkui1_logon_domain = (LMSTR) ( @@ -414,9 +427,10 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, /* FIXME see also wkui1_oth_domains for level 1 */ /* set up buffer */ - NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_1101) + dwSize * sizeof(WCHAR), + nastatus = NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_1101) + dwSize * sizeof(WCHAR), (LPVOID *) bufptr); - + if (nastatus != NERR_Success) + return nastatus; ui = (PWKSTA_USER_INFO_1101) *bufptr; ui->wkui1101_oth_domains = (LMSTR)(ui + 1); @@ -442,10 +456,9 @@ NET_API_STATUS WINAPI NetpGetComputerName(LPWSTR *Buffer) NetApiBufferAllocate(dwSize * sizeof(WCHAR), (LPVOID *) Buffer); if (GetComputerNameW(*Buffer, &dwSize)) { - NetApiBufferReallocate( + return NetApiBufferReallocate( *Buffer, (dwSize + 1) * sizeof(WCHAR), (LPVOID *) Buffer); - return NERR_Success; } else {

1 0

Roderick Colenbrander : wined3d: Let flush_to_framebuffer_drawpixels use a valid rect.
by Alexandre Julliard 20 Feb '08

20 Feb '08

Module: wine Branch: master Commit: 8f18eeea359f9f09ea878c8938a6d221263b1d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f18eeea359f9f09ea878c893… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Feb 19 21:18:26 2008 +0100 wined3d: Let flush_to_framebuffer_drawpixels use a valid rect. --- dlls/wined3d/surface.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ca3dea4..f1217d9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1163,11 +1163,19 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm checkGLcall("glBindBufferARB"); } - glDrawPixels(This->lockedRect.right - This->lockedRect.left, - (This->lockedRect.bottom - This->lockedRect.top)-1, - fmt, type, - mem + bpp * This->lockedRect.left + pitch * This->lockedRect.top); - checkGLcall("glDrawPixels"); + /* When the surface is locked we only have to refresh the locked part else we need to update the whole image */ + if(This->Flags & SFLAG_LOCKED) { + glDrawPixels(This->lockedRect.right - This->lockedRect.left, + (This->lockedRect.bottom - This->lockedRect.top)-1, + fmt, type, + mem + bpp * This->lockedRect.left + pitch * This->lockedRect.top); + checkGLcall("glDrawPixels"); + } else { + glDrawPixels(This->currentDesc.Width, + This->currentDesc.Height, + fmt, type, mem); + checkGLcall("glDrawPixels"); + } if(This->Flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0));

1 0

Andrew Talbot : dmband: Assign to struct instead of using memcpy.
by Alexandre Julliard 20 Feb '08

20 Feb '08

Module: wine Branch: master Commit: 0c4ffe4ff094edf0854c78b2cae6f44cc7454ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4ffe4ff094edf0854c78b2c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 19 22:03:43 2008 +0000 dmband: Assign to struct instead of using memcpy. --- dlls/dmband/band.c | 24 ++++++++++++------------ dlls/dmband/bandtrack.c | 6 +++--- dlls/dmband/dmutils.c | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 067fc38..891fb5a 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -155,12 +155,12 @@ static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_GetDescriptor (LPD static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { ICOM_THIS_MULTI(IDirectMusicBandImpl, ObjectVtbl, iface); TRACE("(%p, %p): setting descriptor:\n", This, pDesc); debug_DMUS_OBJECTDESC (pDesc); - + /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - memcpy (&This->pDesc->guidObject, &pDesc->guidObject, sizeof (pDesc->guidObject)); + This->pDesc->guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - memcpy (&This->pDesc->guidClass, &pDesc->guidClass, sizeof (pDesc->guidClass)); + This->pDesc->guidClass = pDesc->guidClass; if (pDesc->dwValidData & DMUS_OBJ_NAME) lstrcpynW (This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) @@ -168,11 +168,11 @@ static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_SetDescriptor (LPD if (pDesc->dwValidData & DMUS_OBJ_FILENAME) lstrcpynW (This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); if (pDesc->dwValidData & DMUS_OBJ_VERSION) - memcpy (&This->pDesc->vVersion, &pDesc->vVersion, sizeof (pDesc->vVersion)); + This->pDesc->vVersion = pDesc->vVersion; if (pDesc->dwValidData & DMUS_OBJ_DATE) - memcpy (&This->pDesc->ftDate, &pDesc->ftDate, sizeof (pDesc->ftDate)); + This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); + This->pDesc->llMemLength = pDesc->llMemLength; memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); } if (pDesc->dwValidData & DMUS_OBJ_STREAM) { @@ -192,11 +192,11 @@ static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_ParseDescriptor (L LARGE_INTEGER liMove; /* used when skipping chunks */ TRACE("(%p, %p)\n", pStream, pDesc); - + /* FIXME: should this be determined from stream? */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&pDesc->guidClass, &CLSID_DirectMusicBand, sizeof(CLSID)); - + pDesc->guidClass = CLSID_DirectMusicBand; + IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { @@ -361,7 +361,7 @@ static ULONG WINAPI IDirectMusicBandImpl_IPersistStream_Release (LPPERSISTSTREAM static HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicBand, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicBand; return S_OK; } @@ -702,9 +702,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicBandImpl (LPCGUID lpcGUID, LPVOID* ppobj, obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&obj->pDesc->guidClass, &CLSID_DirectMusicBand, sizeof (CLSID)); + obj->pDesc->guidClass = CLSID_DirectMusicBand; obj->ref = 0; /* will be inited by QueryInterface */ list_init (&obj->Instruments); - + return IDirectMusicBandImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 3c7bac4..ccb0c69 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -255,7 +255,7 @@ static ULONG WINAPI IDirectMusicBandTrack_IPersistStream_Release (LPPERSISTSTREA static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicBandTrack, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicBandTrack; return S_OK; } @@ -604,9 +604,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicBandTrack (LPCGUID lpcGUID, LPVOID *ppobj track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicBandTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicBandTrack; track->ref = 0; /* will be inited by QueryInterface */ list_init (&track->Bands); - + return IDirectMusicBandTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 569fb7f..495ea3d 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -309,9 +309,9 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, } TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); - + ref_desc.dwValidData |= DMUS_OBJ_CLASS; - memcpy(&ref_desc.guidClass, &ref.guidClassID, sizeof(ref.guidClassID)); + ref_desc.guidClass = ref.guidClassID; TRACE_(dmfile)("** DM Reference Begin of Load ***\n"); TRACE_(dmfile)("With Desc:\n");

1 0

Marcus Meissner : winedump: Check return value of fetch_block (Coverity).
by Alexandre Julliard 20 Feb '08

20 Feb '08

Module: wine Branch: master Commit: 8063d6572bfd1ad316187136ee94840ad84d1a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8063d6572bfd1ad316187136e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Feb 19 22:46:04 2008 +0100 winedump: Check return value of fetch_block (Coverity). --- tools/winedump/lnk.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index 53d2a55..de1e95a 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -425,6 +425,8 @@ void lnk_dump(void) offset = 0; hdr = fetch_block(); + if (!hdr) + return; printf("Header\n"); printf("------\n\n");

1 0

Detlef Riekenberg : ddraw/tests: Avoid endless loop, when T&L is not supported.
by Alexandre Julliard 20 Feb '08

20 Feb '08

Module: wine Branch: master Commit: 1eb52667ac16c56a220171472a2ea09c7306d436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb52667ac16c56a220171472… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 19 20:21:12 2008 +0100 ddraw/tests: Avoid endless loop, when T&L is not supported. --- dlls/ddraw/tests/d3d.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index e51f476..678b1f0 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -358,6 +358,12 @@ static void LightTest(void) rc = IDirect3DDevice7_GetCaps(lpD3DDevice, &caps); ok(rc == D3D_OK, "IDirect3DDevice7_GetCaps failed with %x\n", rc); + if ( caps.dwMaxActiveLights == (DWORD) -1) { + /* Some cards without T&L Support return -1 (Examples: Vodoo banshee, RivaTNT / NV4) */ + skip("T&L not supported\n"); + return; + } + for(i = 1; i <= caps.dwMaxActiveLights; i++) { rc = IDirect3DDevice7_LightEnable(lpD3DDevice, i, TRUE); ok(rc == D3D_OK, "Enabling light %u failed with %x\n", i, rc);

1 0

Chris Morgan : Merge branch 'master' of git://winehq.org/git/appdb
by Chris Morgan 20 Feb '08

20 Feb '08

Module: appdb Branch: master Commit: eebb80cfc79b6d7f9192cfab821f7fc0f6adb99f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=eebb80cfc79b6d7f9192cfab… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Tue Feb 19 22:26:01 2008 -0500 Merge branch 'master' of git://winehq.org/git/appdb ---

1 0

Jeff Zaroyko : Increase readability by using slightly softer colours
by Chris Morgan 20 Feb '08

20 Feb '08

Module: appdb Branch: master Commit: 155f631a4be7e042d643f064877a3473c80987cd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=155f631a4be7e042d643f064… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Wed Feb 20 13:57:35 2008 +1100 Increase readability by using slightly softer colours --- application.css | 3 +++ include/note.php | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/application.css b/application.css index 0746379..4425bf0 100644 --- a/application.css +++ b/application.css @@ -54,6 +54,9 @@ tr.gold { background-color: #fff600; } tr.silver { background-color: silver; } tr.bronze { background-color: #fcba0a; } tr.garbage { background-color: #999966; } +tr.warning { background-color: #ff3333; } /* novascotia salmon */ +tr.howto { background-color: green; } +tr.defaultnote { background-color: #0066CC; } /* mid-light blue */ /* classes for the version info pane */ /* version info pane is the right hand pane at the top of the version page */ diff --git a/include/note.php b/include/note.php index 0e640b9..4dac990 100644 --- a/include/note.php +++ b/include/note.php @@ -201,12 +201,12 @@ class Note { switch($this->sTitle) { case 'WARNING': - $sColor = 'red'; + $sClass = 'warning'; $sTitle = 'Warning'; break; case 'HOWTO': - $sColor = 'green'; + $sClass = 'howto'; $sTitle = 'HOWTO'; break; @@ -216,7 +216,7 @@ class Note { else $sTitle = 'Note'; - $sColor = 'blue'; + $sClass = 'defaultnote'; } $oVersion = new version($this->iVersionId); @@ -224,7 +224,7 @@ class Note { $shOutput = html_frame_start("","98%",'',0); $shOutput .= "<table width=\"100%\" border=\"0\" cellspacing=\"0\">\n"; - $shOutput .= "<tr bgcolor=\"".$sColor."\" align=\"center\" valign=\"top\"><td><b>".$sTitle."</b></td></tr>\n"; + $shOutput .= "<tr class=\"".$sClass."\" align=\"center\" valign=\"top\"><td><b>".$sTitle."</b></td></tr>\n"; $shOutput .= "<tr><td class=\"note\">\n"; $shOutput .= $this->shDescription; $shOutput .= "</td></tr>\n";

1 0

Michael Stefaniuc : ddraw: Add missing unlock on error path. Found by Smatch.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 01cba076249afcf799ec967ce6b9e7a794798df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01cba076249afcf799ec967ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 19 19:50:04 2008 +0100 ddraw: Add missing unlock on error path. Found by Smatch. --- dlls/ddraw/texture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index 5d5bd52..224f8d6 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -369,7 +369,11 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, { PALETTEENTRY palent[256]; - if (pal == NULL) return DDERR_NOPALETTEATTACHED; + if (pal == NULL) + { + LeaveCriticalSection(&ddraw_cs); + return DDERR_NOPALETTEATTACHED; + } IDirectDrawPalette_GetEntries(pal_src, 0, 0, 256, palent); IDirectDrawPalette_SetEntries(pal, 0, 0, 256, palent); }

1 0