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

Alexander Nicolaysen Sørnes : Only show accepted versions on the front page
by Chris Morgan May 13, 2008

May 13, 2008

Module: appdb Branch: master Commit: 80fd412592f1be0e1658313cd2c19bfce76110d4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=80fd412592f1be0e1658313c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon May 12 21:44:07 2008 +0200 Only show accepted versions on the front page --- include/util.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/util.php b/include/util.php index 5f4ce4d..719e0f9 100644 --- a/include/util.php +++ b/include/util.php @@ -304,6 +304,7 @@ function outputTopXRowAppsFromRating($sRating, $iNumApps) FROM appVotes, appVersion WHERE appVersion.rating = '?' AND appVersion.versionId = appVotes.versionId + AND appVersion.state = 'accepted' GROUP BY appVotes.versionId ORDER BY c DESC LIMIT ?";

1 0

Jeff Zaroyko : fix spelling mistake on the screenshot queue page
by Chris Morgan May 13, 2008

May 13, 2008

Module: appdb Branch: master Commit: 2633cfe72804919b7d34a567ac82c2a055f15706 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2633cfe72804919b7d34a567… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Mon May 12 10:34:29 2008 +1000 fix spelling mistake on the screenshot queue page --- include/screenshot.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index 9556085..26e1a7f 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -708,7 +708,7 @@ class screenshot $oAppData = new appData($this->iScreenshotId, null, $this); $oAppData->outputEditorGeneric(); - echo '<tr valign=top><td class=color0><b>Submited screenshot</b></td>',"\n"; + echo '<tr valign=top><td class=color0><b>Submitted screenshot</b></td>',"\n"; echo '<td>'; $imgSRC = '<img width="'.$this->get_thumbnail_width().'" height="'. $this->get_thumbnail_height().'" src="'.BASE.

1 0

Alexander Nicolaysen Sørnes : Fix SQL on adminMaintainers page
by Chris Morgan May 13, 2008

May 13, 2008

Module: appdb Branch: master Commit: 6c3a3c416413a2ec9138126aaad22fdf76b27354 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6c3a3c416413a2ec9138126a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon May 12 20:53:23 2008 +0200 Fix SQL on adminMaintainers page --- admin/adminMaintainers.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/admin/adminMaintainers.php b/admin/adminMaintainers.php index 873ac56..c2588df 100644 --- a/admin/adminMaintainers.php +++ b/admin/adminMaintainers.php @@ -22,7 +22,7 @@ if (isset($aClean['sSub'])) { // get available maintainers $sQuery = "SELECT * FROM appMaintainers, user_list where appMaintainers.userId = user_list.userid"; - $sQuery.= " AND queued='false' ORDER BY realname;"; + $sQuery.= " AND state='accepted' ORDER BY realname;"; $hResult = query_parameters($sQuery); if(!$hResult || !query_num_rows($hResult))

1 0

Alexander Nicolaysen Sørnes : maintainer : Add missing quotes in some HTML tags
by Chris Morgan May 13, 2008

May 13, 2008

Module: appdb Branch: master Commit: 2989bdb1600505a066ef07159bb8e9da274b4a2d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2989bdb1600505a066ef0715… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon May 12 21:41:46 2008 +0200 maintainer: Add missing quotes in some HTML tags --- include/maintainer.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index e856270..9a7e633 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -730,14 +730,14 @@ class maintainer } $iSuperMaintainer = $aClean['iVersionId'] ? 0 : 1; - echo "<input type=hidden name='iAppId' value={$aClean['iAppId']}>"; - echo "<input type=hidden name='iVersionId' value='{$aClean['iVersionId']}'>"; - echo "<input type=hidden name='iSuperMaintainer' value=$iSuperMaintainer>"; + echo "<input type='hidden' name='iAppId' value='{$aClean['iAppId']}'>"; + echo "<input type='hidden' name='iVersionId' value='{$aClean['iVersionId']}'>"; + echo "<input type='hidden' name='iSuperMaintainer' value='$iSuperMaintainer'>"; if($iSuperMaintainer) - echo '<tr valign=top><td class=color0><b>Why you want to and should<br>be an application super maintainer</b></td><td><textarea name="sMaintainReason" rows=15 cols=70></textarea></td></tr>',"\n"; + echo '<tr valign="top"><td class="color0"><b>Why you want to and should<br>be an application super maintainer</b></td><td><textarea name="sMaintainReason" rows="15" cols="70"></textarea></td></tr>',"\n"; else - echo '<tr valign=top><td class=color0><b>Why you want to and should<br>be an application maintainer</b></td><td><textarea name="sMaintainReason" rows=15 cols=70></textarea></td></tr>',"\n"; + echo '<tr valign="top"><td class="color0"><b>Why you want to and should<br>be an application maintainer</b></td><td><textarea name="sMaintainReason" rows="15" cols="70"></textarea></td></tr>',"\n"; echo '</table>',"\n"; } else

1 0

Alexander Nicolaysen Sørnes : Fix code for getting random apps with screenshots on front page
by Chris Morgan May 13, 2008

May 13, 2008

Module: appdb Branch: master Commit: ef64981a1bb6a9e7e402cd590ec04d46c58713b0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ef64981a1bb6a9e7e402cd59… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon May 12 21:45:42 2008 +0200 Fix code for getting random apps with screenshots on front page --- include/util.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/util.php b/include/util.php index 719e0f9..e878ae6 100644 --- a/include/util.php +++ b/include/util.php @@ -325,8 +325,9 @@ function outputTopXRowAppsFromRating($sRating, $iNumApps) FROM appVersion, appData WHERE appVersion.rating = '$sRating' AND appVersion.versionId = appData.versionId + AND appVersion.state = 'accepted' AND appData.type = 'screenshot' - AND appData.queued = 'false'"; + AND appData.state = 'accepted'"; /* make sure we exclude any apps we've already output */ foreach($aVersionId as $key=>$value)

1 0

ByeongSik Jeon : imm32: Add the missing is_himc_ime_unicode() check.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 6e74a865e371763b75330de61371387d5961b053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e74a865e371763b75330de61… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri May 9 21:27:19 2008 +0900 imm32: Add the missing is_himc_ime_unicode() check. --- dlls/imm32/imm.c | 139 +++++++++++++++++++++++++++--------------------------- 1 files changed, 70 insertions(+), 69 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 8a8fabd..2a6c525 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -991,7 +991,9 @@ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) LONG WINAPI ImmGetCompositionStringA( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) { - CHAR *buf; + BOOL isString = FALSE; + LPBYTE buffer = NULL; + CHAR *buf = NULL; LONG rc = 0; InputContextData *data = (InputContextData*)hIMC; LPCOMPOSITIONSTRING compstr; @@ -1013,68 +1015,43 @@ LONG WINAPI ImmGetCompositionStringA( case GCS_RESULTSTR: if (compstr->dwResultStrLen > 0 && compstr->dwResultStrOffset > 0) { - LPWSTR ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); - - TRACE("GCS_RESULTSTR %p %i\n",ResultStr, - compstr->dwResultStrLen); - - buf = HeapAlloc( GetProcessHeap(), 0, compstr->dwResultStrLen * 3 ); - rc = WideCharToMultiByte(CP_ACP, 0, ResultStr, - compstr->dwResultStrLen , buf, - compstr->dwResultStrLen * 3, NULL, NULL); - if (dwBufLen >= rc) - memcpy(lpBuf,buf,rc); - - HeapFree( GetProcessHeap(), 0, buf ); + isString = TRUE; + buffer = compdata + compstr->dwResultStrOffset; + rc = compstr->dwResultStrLen; + TRACE("GCS_RESULTSTR %p %i\n", buffer, rc); } break; case GCS_COMPSTR: if (compstr->dwCompStrLen > 0 && compstr->dwCompStrOffset > 0) { - LPWSTR CompString = (LPWSTR)(compdata + compstr->dwCompStrOffset); - - TRACE("GCS_COMPSTR %p %i\n", CompString, compstr->dwCompStrLen); - - buf = HeapAlloc( GetProcessHeap(), 0, compstr->dwCompStrLen * 3 ); - rc = WideCharToMultiByte(CP_ACP, 0, CompString, - compstr->dwCompStrLen, buf, - compstr->dwCompStrLen * 3, NULL, NULL); - if (dwBufLen >= rc) - memcpy(lpBuf,buf,rc); - HeapFree( GetProcessHeap(), 0, buf ); + isString = TRUE; + buffer = compdata + compstr->dwCompStrOffset; + rc = compstr->dwCompStrLen; + TRACE("GCS_COMPSTR %p %i\n", buffer, rc); } break; case GCS_COMPATTR: if (compstr->dwCompAttrLen > 0 && compstr->dwCompAttrOffset > 0) { - LPWSTR Compattr = (LPWSTR)(compdata + compstr->dwCompAttrOffset); - TRACE("GCS_COMPATTR %p %i\n", Compattr , compstr->dwCompAttrLen); - + buffer = compdata + compstr->dwCompAttrOffset; rc = compstr->dwCompAttrLen; - if (dwBufLen >= rc) - memcpy(lpBuf,Compattr,rc); + TRACE("GCS_COMPATTR %p %i\n", buffer, rc); } break; case GCS_COMPCLAUSE: if (compstr->dwCompClauseLen > 0 && compstr->dwCompClauseOffset > 0) { - LPWSTR Compclause = (LPWSTR)(compdata + compstr->dwCompClauseOffset); - TRACE("GCS_COMPCLAUSE %p %i\n", Compclause, compstr->dwCompClauseLen); - + buffer = compdata + compstr->dwCompClauseOffset; rc = compstr->dwCompClauseLen; - if (dwBufLen >= compstr->dwCompClauseLen) - memcpy(lpBuf,Compclause,rc); + TRACE("GCS_COMPCLAUSE %p %i\n", buffer, rc); } break; case GCS_RESULTCLAUSE: if (compstr->dwResultClauseLen > 0 && compstr->dwResultClauseOffset > 0) { - LPWSTR Resultclause = (LPWSTR)(compdata + compstr->dwResultClauseOffset); - TRACE("GCS_RESULTCLAUSE %p %i\n", Resultclause, compstr->dwResultClauseLen); - + buffer = compdata + compstr->dwResultClauseOffset; rc = compstr->dwResultClauseLen; - if (dwBufLen >= compstr->dwResultClauseLen) - memcpy(lpBuf,Resultclause,rc); + TRACE("GCS_RESULTCLAUSE %p %i\n", buffer, rc); } break; case GCS_CURSORPOS: @@ -1090,6 +1067,19 @@ LONG WINAPI ImmGetCompositionStringA( break; } + if ( isString && buffer && is_himc_ime_unicode(data)) + { + INT len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)buffer, rc, NULL, 0, NULL, NULL); + buf = HeapAlloc( GetProcessHeap(), 0, len ); + if ( buf ) + rc = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)buffer, rc, buf, len, NULL, NULL); + buffer = (LPBYTE)buf; + } + + if ( lpBuf && buffer && dwBufLen >= rc) + memcpy(lpBuf, buffer, rc); + + HeapFree( GetProcessHeap(), 0, buf ); ImmUnlockIMCC(data->IMC.hCompStr); return rc; @@ -1102,6 +1092,9 @@ LONG WINAPI ImmGetCompositionStringW( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) { + BOOL isString = FALSE; + LPBYTE buffer = NULL; + WCHAR *buf = NULL; LONG rc = 0; InputContextData *data = (InputContextData*)hIMC; LPCOMPOSITIONSTRING compstr; @@ -1123,62 +1116,53 @@ LONG WINAPI ImmGetCompositionStringW( case GCS_RESULTSTR: if (compstr->dwResultStrLen > 0 && compstr->dwResultStrOffset > 0) { - LPWSTR ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); - rc = compstr->dwResultStrLen * sizeof(WCHAR); - - if (dwBufLen >= rc) - memcpy(lpBuf,ResultStr,rc); + isString = TRUE; + buffer = compdata + compstr->dwResultStrOffset; + rc = compstr->dwResultStrLen; + TRACE("GCS_RESULTSTR %p %i\n", buffer, rc); } break; case GCS_RESULTREADSTR: if (compstr->dwResultReadStrLen > 0 && compstr->dwResultReadStrOffset > 0) { - LPWSTR ResultReadString = (LPWSTR)(compdata + compstr->dwResultReadStrOffset); - - rc = compstr->dwResultReadStrLen * sizeof(WCHAR); - if (dwBufLen >= rc) - memcpy(lpBuf,ResultReadString,rc); + isString = TRUE; + buffer = compdata + compstr->dwResultReadStrOffset; + rc = compstr->dwResultReadStrLen; + TRACE("GCS_RESULTREADSTR %p %i\n",buffer, rc); } break; case GCS_COMPSTR: if (compstr->dwCompStrLen > 0 && compstr->dwCompStrOffset > 0) { - LPWSTR CompString = (LPWSTR)(compdata + compstr->dwCompStrOffset); - rc = compstr->dwCompStrLen * sizeof(WCHAR); - if (dwBufLen >= rc) - memcpy(lpBuf,CompString,rc); + isString = TRUE; + buffer = compdata + compstr->dwCompStrOffset; + rc = compstr->dwCompStrLen; + TRACE("GCS_COMPSTR %p %i\n", buffer, rc); } break; case GCS_COMPATTR: if (compstr->dwCompAttrLen > 0 && compstr->dwCompAttrOffset > 0) { - - LPWSTR Compattr = (LPWSTR)(compdata + compstr->dwCompAttrOffset); - + buffer = compdata + compstr->dwCompAttrOffset; rc = compstr->dwCompAttrLen; - if (dwBufLen >= rc) - memcpy(lpBuf,Compattr,rc); + TRACE("GCS_COMPATTR %p %i\n", buffer, rc); } break; case GCS_COMPCLAUSE: if (compstr->dwCompClauseLen > 0 && compstr->dwCompClauseOffset > 0) { - LPWSTR Compclause = (LPWSTR)(compdata + compstr->dwCompClauseOffset); - + buffer = compdata + compstr->dwCompClauseOffset; rc = compstr->dwCompClauseLen; - if (dwBufLen >= compstr->dwCompClauseLen) - memcpy(lpBuf,Compclause,rc); + TRACE("GCS_COMPCLAUSE %p %i\n", buffer, rc); } break; case GCS_COMPREADSTR: if (compstr->dwCompReadStrLen > 0 && compstr->dwCompReadStrOffset > 0) { - LPWSTR CompReadString = (LPWSTR)(compdata + compstr->dwCompReadStrOffset); - - rc = compstr->dwCompReadStrLen * sizeof(WCHAR); - - if (dwBufLen >= rc) - memcpy(lpBuf,CompReadString,rc); + isString = TRUE; + buffer = compdata + compstr->dwCompReadStrOffset; + rc = compstr->dwCompReadStrLen; + TRACE("GCS_COMPREADSTR %p %i\n", buffer, rc); } break; case GCS_CURSORPOS: @@ -1194,6 +1178,23 @@ LONG WINAPI ImmGetCompositionStringW( break; } + if ( isString && buffer ) + { + if ( !is_himc_ime_unicode(data) ) + { + INT len = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)buffer, rc, NULL, 0 ); + buf = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + if ( buf ) + rc = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)buffer, rc, buf, len ); + buffer = (LPBYTE)buf; + } + rc *= sizeof(WCHAR); + } + + if ( lpBuf && buffer && dwBufLen >= rc ) + memcpy( lpBuf, buffer, rc ); + + HeapFree( GetProcessHeap(), 0, buf ); ImmUnlockIMCC(data->IMC.hCompStr); return rc;

1 0

ByeongSik Jeon : imm32: Add the all GCS_* value check.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 33a5ab522f7522ef5d81ca4a345d0d1533a1705e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a5ab522f7522ef5d81ca4a3… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri May 9 21:28:04 2008 +0900 imm32: Add the all GCS_* value check. --- dlls/imm32/imm.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2a6c525..94b7752 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1054,6 +1054,48 @@ LONG WINAPI ImmGetCompositionStringA( TRACE("GCS_RESULTCLAUSE %p %i\n", buffer, rc); } break; + case GCS_RESULTREADSTR: + if (compstr->dwResultReadStrLen > 0 && compstr->dwResultReadStrOffset > 0) + { + isString = TRUE; + buffer = compdata + compstr->dwResultReadStrOffset; + rc = compstr->dwResultReadStrLen; + TRACE("GCS_RESULTREADSTR %p %i\n",buffer, rc); + } + break; + case GCS_RESULTREADCLAUSE: + if (compstr->dwResultReadClauseLen > 0 && compstr->dwResultReadClauseOffset > 0) + { + buffer = compdata + compstr->dwResultReadClauseOffset; + rc = compstr->dwResultReadClauseLen; + TRACE("GCS_RESULTREADCLAUSE %p %i\n", buffer, rc); + } + break; + case GCS_COMPREADSTR: + if (compstr->dwCompReadStrLen > 0 && compstr->dwCompReadStrOffset > 0) + { + isString = TRUE; + buffer = compdata + compstr->dwCompReadStrOffset; + rc = compstr->dwCompReadStrLen; + TRACE("GCS_COMPREADSTR %p %i\n", buffer, rc); + } + break; + case GCS_COMPREADATTR: + if (compstr->dwCompReadAttrLen > 0 && compstr->dwCompReadAttrOffset > 0) + { + buffer = compdata + compstr->dwCompReadAttrOffset; + rc = compstr->dwCompReadAttrLen; + TRACE("GCS_COMPREADATTR %p %i\n", buffer, rc); + } + break; + case GCS_COMPREADCLAUSE: + if (compstr->dwCompReadClauseLen > 0 && compstr->dwCompReadClauseOffset > 0) + { + buffer = compdata + compstr->dwCompReadClauseOffset; + rc = compstr->dwCompReadClauseLen; + TRACE("GCS_COMPREADCLAUSE %p %i\n", buffer, rc); + } + break; case GCS_CURSORPOS: TRACE("GCS_CURSORPOS\n"); rc = compstr->dwCursorPos; @@ -1165,6 +1207,38 @@ LONG WINAPI ImmGetCompositionStringW( TRACE("GCS_COMPREADSTR %p %i\n", buffer, rc); } break; + case GCS_COMPREADATTR: + if (compstr->dwCompReadAttrLen > 0 && compstr->dwCompReadAttrOffset > 0) + { + buffer = compdata + compstr->dwCompReadAttrOffset; + rc = compstr->dwCompReadAttrLen; + TRACE("GCS_COMPREADATTR %p %i\n", buffer, rc); + } + break; + case GCS_COMPREADCLAUSE: + if (compstr->dwCompReadClauseLen > 0 && compstr->dwCompReadClauseOffset > 0) + { + buffer = compdata + compstr->dwCompReadClauseOffset; + rc = compstr->dwCompReadClauseLen; + TRACE("GCS_COMPREADCLAUSE %p %i\n", buffer, rc); + } + break; + case GCS_RESULTREADCLAUSE: + if (compstr->dwResultReadClauseLen > 0 && compstr->dwResultReadClauseOffset > 0) + { + buffer = compdata + compstr->dwResultReadClauseOffset; + rc = compstr->dwResultReadClauseLen; + TRACE("GCS_RESULTREADCLAUSE %p %i\n", buffer, rc); + } + break; + case GCS_RESULTCLAUSE: + if (compstr->dwResultClauseLen > 0 && compstr->dwResultClauseOffset > 0) + { + buffer = compdata + compstr->dwResultClauseOffset; + rc = compstr->dwResultClauseLen; + TRACE("GCS_RESULTCLAUSE %p %i\n", buffer, rc); + } + break; case GCS_CURSORPOS: TRACE("GCS_CURSORPOS\n"); rc = compstr->dwCursorPos;

1 0

Petr Dlouhý : shdocvw: Partial implementation of WebBrowser_put_RegisterAsBrowser and WebBrowser_get_RegisterAsBrowser .
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 87b1cab13d6ff9d806e8114a87b139375e431d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b1cab13d6ff9d806e8114a8… Author: Petr Dlouhý <petr.dlouhy(a)email.cz> Date: Mon May 12 16:22:10 2008 +0200 shdocvw: Partial implementation of WebBrowser_put_RegisterAsBrowser and WebBrowser_get_RegisterAsBrowser. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/webbrowser.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 1257b76..c0aa3a9 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -139,6 +139,7 @@ struct WebBrowser { HWND shell_embedding_hwnd; + VARIANT_BOOL register_browser; VARIANT_BOOL visible; VARIANT_BOOL menu_bar; VARIANT_BOOL address_bar; diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index df8012b..1d1ca36 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -790,16 +790,22 @@ static HRESULT WINAPI WebBrowser_get_RegisterAsBrowser(IWebBrowser2 *iface, VARIANT_BOOL *pbRegister) { WebBrowser *This = WEBBROWSER_THIS(iface); + FIXME("(%p)->(%p)\n", This, pbRegister); - return E_NOTIMPL; + + *pbRegister = This->register_browser; + return S_OK; } static HRESULT WINAPI WebBrowser_put_RegisterAsBrowser(IWebBrowser2 *iface, VARIANT_BOOL bRegister) { WebBrowser *This = WEBBROWSER_THIS(iface); + FIXME("(%p)->(%x)\n", This, bRegister); - return E_NOTIMPL; + + This->register_browser = bRegister ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI WebBrowser_get_RegisterAsDropTarget(IWebBrowser2 *iface, @@ -999,6 +1005,7 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi DocHost_Init(&ret->doc_host, (IDispatch*)WEBBROWSER2(ret)); + ret->register_browser = VARIANT_FALSE; ret->visible = VARIANT_TRUE; ret->menu_bar = VARIANT_TRUE; ret->address_bar = VARIANT_TRUE;

1 0

Alexandre Julliard : winex11: Silence a harmless error.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 4d926e3ebc480a2edb7313af56e8395fe7f802a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d926e3ebc480a2edb7313af5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 19:58:35 2008 +0200 winex11: Silence a harmless error. --- dlls/winex11.drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index f92f943..04c2f2a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1425,10 +1425,11 @@ int X11DRV_GetPixelFormat(X11DRV_PDEVICE *physDev) { int tmp; TRACE("(%p)\n", physDev); + if (!physDev->current_pf) return 0; /* not set yet */ + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, physDev->current_pf, TRUE, &tmp); if(!fmt) { - /* This happens on HDCs on which SetPixelFormat wasn't called yet */ ERR("Unable to find a WineGLPixelFormat for iPixelFormat=%d\n", physDev->current_pf); return 0; }

1 0

Huw Davies : gdiplus: Stubs for GdipGetDC and GdipReleaseDC.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 6cfb469a6ccd4371d91a872c4576c65bc360ac77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cfb469a6ccd4371d91a872c4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 12 16:51:32 2008 +0100 gdiplus: Stubs for GdipGetDC and GdipReleaseDC. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 15 +++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2d6f210..0215124 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -255,7 +255,7 @@ @ stub GdipGetCustomLineCapStrokeJoin @ stub GdipGetCustomLineCapType @ stub GdipGetCustomLineCapWidthScale -@ stub GdipGetDC +@ stdcall GdipGetDC(ptr ptr) @ stdcall GdipGetDpiX(ptr ptr) @ stdcall GdipGetDpiY(ptr ptr) @ stub GdipGetEffectParameterSize @@ -472,7 +472,7 @@ @ stub GdipRecordMetafileI @ stub GdipRecordMetafileStream @ stub GdipRecordMetafileStreamI -@ stub GdipReleaseDC +@ stdcall GdipReleaseDC(ptr ptr) @ stdcall GdipRemovePropertyItem(ptr long) @ stub GdipResetClip @ stub GdipResetImageAttributes diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index db12324..e5475e4 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2427,3 +2427,18 @@ GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics *graphics, GDIPCONST G return ret; } + +GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) +{ + FIXME("(%p, %p): stub\n", graphics, hdc); + + *hdc = NULL; + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) +{ + FIXME("(%p, %p): stub\n", graphics, hdc); + + return NotImplemented; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index a8c1d65..d35d243 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -124,6 +124,7 @@ GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics*,GpBrush*,GDIPCONST GpRectF*,I GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics*,GpBrush*,GDIPCONST GpRect*,INT); GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); +GpStatus WINGDIPAPI GdipGetDC(GpGraphics*,HDC*); GpStatus WINGDIPAPI GdipGetImageDimension(GpImage*,REAL*,REAL*); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*); @@ -134,6 +135,7 @@ GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*); GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipMeasureString(GpGraphics*,GDIPCONST WCHAR*,INT, GDIPCONST GpFont*,GDIPCONST RectF*,GDIPCONST GpStringFormat*,RectF*,INT*,INT*); +GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics*,HDC); GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*);

1 0