January 2009 - Wine-commits

Alexandre Julliard : advapi32: Reimplemented QueryServiceConfig2W in services.exe.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: b608a43df7429794fed77ae80804f08226497891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b608a43df7429794fed77ae80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 20:18:24 2009 +0100 advapi32: Reimplemented QueryServiceConfig2W in services.exe. --- dlls/advapi32/service.c | 60 +++++++++++++++++++++++----------------------- include/wine/svcctl.idl | 10 ++++++- programs/services/rpc.c | 49 ++++++++++++++++++++++++++++++++----- 3 files changed, 80 insertions(+), 39 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index cf58e2c..dd056b2 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -292,6 +292,7 @@ static DWORD map_exception_code(DWORD exception_code) switch (exception_code) { case RPC_X_NULL_REF_POINTER: + return ERROR_INVALID_ADDRESS; case RPC_X_ENUM_VALUE_OUT_OF_RANGE: case RPC_X_BYTE_COUNT_TOO_SMALL: return ERROR_INVALID_PARAMETER; @@ -1654,9 +1655,7 @@ cleanup: BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffer, DWORD size, LPDWORD needed) { - DWORD sz, type; - HKEY hKey; - LONG r; + DWORD err; struct sc_service *hsvc; if(dwLevel != SERVICE_CONFIG_DESCRIPTION) { @@ -1670,7 +1669,8 @@ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe SetLastError(ERROR_INVALID_LEVEL); return FALSE; } - if(!needed || (!buffer && size)) { + + if(!buffer && size) { SetLastError(ERROR_INVALID_ADDRESS); return FALSE; } @@ -1683,36 +1683,36 @@ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - hKey = hsvc->hkey; - switch(dwLevel) { - case SERVICE_CONFIG_DESCRIPTION: { - static const WCHAR szDescription[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; - LPSERVICE_DESCRIPTIONW config = (LPSERVICE_DESCRIPTIONW) buffer; - LPBYTE strbuf = NULL; - *needed = sizeof (SERVICE_DESCRIPTIONW); - sz = size - *needed; - if(config && (*needed <= size)) - strbuf = (LPBYTE) (config + 1); - r = RegQueryValueExW( hKey, szDescription, 0, &type, strbuf, &sz ); - if((r == ERROR_SUCCESS) && ( type != REG_SZ)) { - FIXME("SERVICE_CONFIG_DESCRIPTION: don't know how to handle type %d\n", type); - return FALSE; - } - *needed += sz; - if(config) { - if(r == ERROR_SUCCESS) - config->lpDescription = (LPWSTR) (config + 1); - else - config->lpDescription = NULL; - } + __TRY + { + err = svcctl_QueryServiceConfig2W(hsvc->hdr.server_handle, dwLevel, buffer, size, needed); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY + + if (err != ERROR_SUCCESS) + { + SetLastError( err ); + return FALSE; + } + + switch (dwLevel) + { + case SERVICE_CONFIG_DESCRIPTION: + if (buffer) + { + SERVICE_DESCRIPTIONW *descr = (SERVICE_DESCRIPTIONW *)buffer; + if (descr->lpDescription) /* make it an absolute pointer */ + descr->lpDescription = (WCHAR *)(buffer + (ULONG_PTR)descr->lpDescription); + break; } - break; } - if(*needed > size) - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return (*needed <= size); + return TRUE; } /****************************************************************************** diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index 66abd30..d04da08 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -296,8 +296,14 @@ typedef [switch_type(DWORD)] union /* Not compatible with Windows function 0x26 */ DWORD svcctl_QueryServiceConfig2A(/* FIXME */); - /* Not compatible with Windows function 0x27 */ - DWORD svcctl_QueryServiceConfig2W(/* FIXME */); + /* Untested with Windows function 0x27 */ + DWORD svcctl_QueryServiceConfig2W( + [in] SC_RPC_HANDLE hService, + [in] DWORD InfoLevel, + [out,size_is(cbBufSize)] BYTE lpBuffer[], + [in] DWORD cbBufSize, + [out] LPDWORD pcbBytesNeeded + ); /* Untested with Windows function 0x28 */ DWORD svcctl_QueryServiceStatusEx( diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 830ed9c..b6014aa 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -646,6 +646,48 @@ DWORD svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, SERVICE return err; } +DWORD svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, + BYTE *buffer, DWORD size, LPDWORD needed ) +{ + struct sc_service_handle *service; + DWORD err; + + if ((err = validate_service_handle(hService, SERVICE_QUERY_STATUS, &service)) != 0) + return err; + + switch (level) + { + case SERVICE_CONFIG_DESCRIPTION: + { + SERVICE_DESCRIPTIONW *descr = (SERVICE_DESCRIPTIONW *)buffer; + + service_lock_shared(service->service_entry); + *needed = sizeof(*descr); + if (service->service_entry->description) + *needed += (strlenW(service->service_entry->description) + 1) * sizeof(WCHAR); + if (size >= *needed) + { + if (service->service_entry->description) + { + /* store a buffer offset instead of a pointer */ + descr->lpDescription = (WCHAR *)((BYTE *)(descr + 1) - buffer); + strcpyW( (WCHAR *)(descr + 1), service->service_entry->description ); + } + else descr->lpDescription = NULL; + } + else err = ERROR_INSUFFICIENT_BUFFER; + service_unlock(service->service_entry); + } + break; + + default: + WINE_FIXME("level %u not implemented\n", level); + err = ERROR_INVALID_LEVEL; + break; + } + return err; +} + DWORD svcctl_QueryServiceStatusEx( SC_RPC_HANDLE hService, SC_STATUS_TYPE InfoLevel, @@ -1141,13 +1183,6 @@ DWORD svcctl_QueryServiceConfig2A( return ERROR_CALL_NOT_IMPLEMENTED; } -DWORD svcctl_QueryServiceConfig2W( - void) -{ - WINE_FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; -} - DWORD RPC_Init(void) {

1 0

Ricardo Filipe : translation
by Jeremy Newman 19 Jan '09

19 Jan '09

Module: website Branch: master Commit: e3367f2b47b8806e3277d9b441e6b86e89f6b25c URL: http://source.winehq.org/git/website.git/?a=commit;h=e3367f2b47b8806e3277d9… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Mon Jan 19 14:24:28 2009 -0600 translation --- templates/pt/acknowledgement.template | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/pt/acknowledgement.template b/templates/pt/acknowledgement.template index 17e64ed..947eb39 100644 --- a/templates/pt/acknowledgement.template +++ b/templates/pt/acknowledgement.template @@ -202,13 +202,13 @@ terem staff pago a trabalhar em problemas difíceis... nós somos.</p> <tr><td>Martin Wilck</td> <td>Winsock</td> <td>2002-2003</td></tr> <tr><td>Alexander Yaworsky</td> <td>advapi32</td> <td>2004-2006</td></tr> </table> -<p>A complete list of -<a href="http://source.winehq.org/git/?p=wine.git;a=blob_plain;f=AUTHORS">authors</a> can be -found in the source code repository.</p> +<p>Uma lista completa de +<a href="http://source.winehq.org/git/?p=wine.git;a=blob_plain;f=AUTHORS">autores</a> +pode ser encontrada no repositório de código.</p> <hr /> <div class="link-container"> - <p class="left-link"><a href="{$root}/wine_features">Previous</a>: Wine's Features</p> - <p class="right-link">World Wine News: <a href="{$root}/wwn">Next</a></p> + <p class="left-link"><a href="{$root}/wine_features">Anterior</a>: Características do Wine</p> + <p class="right-link">World Wine News: <a href="{$root}/wwn">Seguinte</a></p> </div>

1 0

ricardo filipe : Website: add portuguese translation for acknowledgement. template
by Jeremy Newman 19 Jan '09

19 Jan '09

Module: website Branch: master Commit: fceb43c2aaf6b8d97145afe0a5f9af9ccfbcf3ab URL: http://source.winehq.org/git/website.git/?a=commit;h=fceb43c2aaf6b8d97145af… Author: ricardo filipe <ricardo_barbano(a)hotmail.com> Date: Sat Jan 17 19:43:48 2009 +0000 Website: add portuguese translation for acknowledgement.template _________________________________________________________________ Drag n’ drop—Get easy photo sharing with Windows Live™ Photos. http://www.microsoft.com/windows/windowslive/photos.aspx >From 519c862dda07ceae52dd629fd726225dfb89bc38 Mon Sep 17 00:00:00 2001 From: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Sat, 17 Jan 2009 19:40:06 +0000 Subject: Website: add portuguese translation for acknowledgement.template --- templates/pt/acknowledgement.template | 214 +++++++++++++++++++++++++++++++++ 1 files changed, 214 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=fceb43c2aaf6b8d971…

1 0

ricardo filipe : add portuguese translation for contributing.template
by Jeremy Newman 19 Jan '09

19 Jan '09

Module: website Branch: master Commit: a23a4d58d102a97ff834f5e5839f315165dd2550 URL: http://source.winehq.org/git/website.git/?a=commit;h=a23a4d58d102a97ff834f5… Author: ricardo filipe <ricardo_barbano(a)hotmail.com> Date: Mon Jan 19 01:05:06 2009 +0000 add portuguese translation for contributing.template _________________________________________________________________ Invite your mail contacts to join your friends list with Windows Live Spaces. It's easy! http://spaces.live.com/spacesapi.aspx?wx_action=create&wx_url=/friends.aspx… >From c33b5639d827e7455afa8be65cbff2e1587435d9 Mon Sep 17 00:00:00 2001 From: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Sun, 18 Jan 2009 03:20:36 +0000 Subject: website: add portuguese translation for contributing.template --- templates/pt/contributing.template | 390 ++++++++++++++++++++++++++++++++++++ 1 files changed, 390 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=a23a4d58d102a97ff8…

1 0

ricardo filipe : contributing.template: comment the 0.9 and 1.0 tasklists
by Jeremy Newman 19 Jan '09

19 Jan '09

Module: website Branch: master Commit: 1590b2da6f8bc847b4c2fd76f20557eca70893d3 URL: http://source.winehq.org/git/website.git/?a=commit;h=1590b2da6f8bc847b4c2fd… Author: ricardo filipe <ricardo_barbano(a)hotmail.com> Date: Mon Jan 19 01:15:01 2009 +0000 contributing.template: comment the 0.9 and 1.0 tasklists the 0.9 and 1.0 tasklists in the contributing templates shouldn't be shown to users. i'm leaving them commented for future reference of other version tasklists. _________________________________________________________________ Drag n’ drop—Get easy photo sharing with Windows Live™ Photos. http://www.microsoft.com/windows/windowslive/photos.aspx >From 671f8a40511ac61a9aa2470ed11793c7523b8e44 Mon Sep 17 00:00:00 2001 From: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Sun, 18 Jan 2009 03:31:00 +0000 Subject: contributing.template: comment 0.9 and 1.0 tasklists --- templates/en/contributing.template | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/templates/en/contributing.template b/templates/en/contributing.template index b2b15d9..3aee073 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -168,6 +168,7 @@ <li>normally include a rational for why such development is desirable</li> </ul> </li> + </ul> <h3 id="conf_tests">Conformance tests</h3>

1 0

Daniel Scharrer : Website: fix old news URLS
by Jeremy Newman 19 Jan '09

19 Jan '09

Module: website Branch: master Commit: e44df8472c85bbff2f42ad6c1cc10f645974582e URL: http://source.winehq.org/git/website.git/?a=commit;h=e44df8472c85bbff2f42ad… Author: Daniel Scharrer <dscharrer(a)gmail.com> Date: Sat Jan 17 00:26:27 2009 +0100 Website: fix old news URLS >From 604450bb13bd2f2d086f7556951171459bbade2a Mon Sep 17 00:00:00 2001 From: Daniel Scharrer <dscharrer(a)gmail.com> Date: Sat, 17 Jan 2009 00:19:17 +0100 Subject: Website: fix old news URLS --- site | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/site b/site index 69da02c..5a7bd46 100644 --- a/site +++ b/site @@ -98,6 +98,13 @@ if (defined("PAGE") and PAGE == "home") $html->redirect("{$config->base_url}announce/{$_GET['announce']}"); exit(); } + + // fix old news URLS + if (isset($_GET['news']) and (intval($_GET['news']) > 0)) + { + $html->redirect("{$config->base_url}news/{$_GET['news']}"); + exit(); + } } // loag page content

1 0

Daniel Scharrer : Website: plugins/news.php: fix double slashes in URLs
by Jeremy Newman 19 Jan '09

19 Jan '09

Module: website Branch: master Commit: 72e4e1002c727884459d6f91eb94b21190a1c050 URL: http://source.winehq.org/git/website.git/?a=commit;h=72e4e1002c727884459d6f… Author: Daniel Scharrer <dscharrer(a)gmail.com> Date: Sat Jan 17 01:13:58 2009 +0100 Website: plugins/news.php: fix double slashes in URLs >From 7994ff0cffadf76fe8073e515e632c8e084a59f2 Mon Sep 17 00:00:00 2001 From: Daniel Scharrer <dscharrer(a)gmail.com> Date: Sat, 17 Jan 2009 00:49:04 +0100 Subject: Website: plugins/news.php: fix double slashes in URLs --- include/plugins/news.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index 2606b4e..b1d7703 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -94,8 +94,8 @@ switch (true) $rss = array( 'rss_date' => date("r", $top_date), 'rss_title' => $config->site_name.' News', - 'rss_link' => "{$config->base_url}/news/rss", - 'rss_img' => "{$config->base_url}/images/classic_top_logo.png", + 'rss_link' => "{$config->base_url}news/rss", + 'rss_img' => "{$config->base_url}images/classic_top_logo.png", 'rss_desc' => 'News and information about Wine', 'rss_crt' => '(C) '.$config->site_name.' '.date("Y", time()), 'rss_rows' => $rss_rows @@ -108,7 +108,7 @@ switch (true) // default view default: // load rss link - $html->rss_link = "{$config->base_url}/news/rss/"; + $html->rss_link = "{$config->base_url}news/rss/"; // max count for posts per page $amax = (PAGE == "home" ? 10 : 25);

1 0

Gerald Pfeifer : comctl32: Simplify twelve functions by removing unused parameters.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: e985ca06cfef3a35ad6f263e212ab8117e5b1f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e985ca06cfef3a35ad6f263e2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 17 06:11:29 2009 +0100 comctl32: Simplify twelve functions by removing unused parameters. --- dlls/comctl32/toolbar.c | 50 +++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index a233b39..edf15df 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3720,7 +3720,7 @@ TOOLBAR_HideButton (HWND hwnd, WPARAM wParam, LPARAM lParam) static inline LRESULT -TOOLBAR_HitTest (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_HitTest (HWND hwnd, LPARAM lParam) { return TOOLBAR_InternalHitTest (hwnd, (LPPOINT)lParam); } @@ -3820,7 +3820,7 @@ TOOLBAR_InsertButtonT(HWND hwnd, WPARAM wParam, LPARAM lParam, BOOL fUnicode) static LRESULT -TOOLBAR_IsButtonChecked (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_IsButtonChecked (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); INT nIndex; @@ -3834,7 +3834,7 @@ TOOLBAR_IsButtonChecked (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_IsButtonEnabled (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_IsButtonEnabled (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); INT nIndex; @@ -3848,7 +3848,7 @@ TOOLBAR_IsButtonEnabled (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_IsButtonHidden (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_IsButtonHidden (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); INT nIndex; @@ -3862,7 +3862,7 @@ TOOLBAR_IsButtonHidden (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_IsButtonHighlighted (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_IsButtonHighlighted (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); INT nIndex; @@ -3890,7 +3890,7 @@ TOOLBAR_IsButtonIndeterminate (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_IsButtonPressed (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_IsButtonPressed (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); INT nIndex; @@ -4522,7 +4522,7 @@ TOOLBAR_SetButtonInfoW (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_SetButtonSize (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetButtonSize (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); INT cx = (short)LOWORD(lParam), cy = (short)HIWORD(lParam); @@ -4812,7 +4812,7 @@ TOOLBAR_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam) } TOOLBAR_CalcToolbar(hwnd); if (infoPtr->nButtonWidth < oldButtonWidth) - TOOLBAR_SetButtonSize(hwnd, 0, MAKELONG(oldButtonWidth, infoPtr->nButtonHeight)); + TOOLBAR_SetButtonSize(hwnd, MAKELONG(oldButtonWidth, infoPtr->nButtonHeight)); TRACE("hwnd %p, new himl=%p, id = %d, count=%d, bitmap w=%d, h=%d\n", hwnd, infoPtr->himlDef, id, infoPtr->nNumBitmaps, @@ -4889,7 +4889,7 @@ TOOLBAR_SetInsertMarkColor (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_SetMaxTextRows (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetMaxTextRows (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -4912,7 +4912,7 @@ TOOLBAR_SetMaxTextRows (HWND hwnd, WPARAM wParam, LPARAM lParam) * See blueprints in comments above TOOLBAR_MeasureButton for more info. */ static LRESULT -TOOLBAR_SetPadding (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetPadding (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); DWORD oldPad; @@ -4927,7 +4927,7 @@ TOOLBAR_SetPadding (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_SetParent (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetParent (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); HWND hwndOldNotify; @@ -5096,7 +5096,7 @@ TOOLBAR_SetState (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_SetStyle (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetStyle (HWND hwnd, LPARAM lParam) { SetWindowLongW(hwnd, GWL_STYLE, lParam); @@ -6377,7 +6377,7 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm static inline LRESULT -TOOLBAR_Notify (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_Notify (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); LPNMHDR lpnmh = (LPNMHDR)lParam; @@ -6784,7 +6784,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_HideButton (hwnd, wParam, lParam); case TB_HITTEST: - return TOOLBAR_HitTest (hwnd, wParam, lParam); + return TOOLBAR_HitTest (hwnd, lParam); case TB_INDETERMINATE: return TOOLBAR_Indeterminate (hwnd, wParam, lParam); @@ -6798,22 +6798,22 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case TB_INSERTMARKHITTEST: */ /* 4.71 */ case TB_ISBUTTONCHECKED: - return TOOLBAR_IsButtonChecked (hwnd, wParam, lParam); + return TOOLBAR_IsButtonChecked (hwnd, wParam); case TB_ISBUTTONENABLED: - return TOOLBAR_IsButtonEnabled (hwnd, wParam, lParam); + return TOOLBAR_IsButtonEnabled (hwnd, wParam); case TB_ISBUTTONHIDDEN: - return TOOLBAR_IsButtonHidden (hwnd, wParam, lParam); + return TOOLBAR_IsButtonHidden (hwnd, wParam); case TB_ISBUTTONHIGHLIGHTED: - return TOOLBAR_IsButtonHighlighted (hwnd, wParam, lParam); + return TOOLBAR_IsButtonHighlighted (hwnd, wParam); case TB_ISBUTTONINDETERMINATE: return TOOLBAR_IsButtonIndeterminate (hwnd, wParam, lParam); case TB_ISBUTTONPRESSED: - return TOOLBAR_IsButtonPressed (hwnd, wParam, lParam); + return TOOLBAR_IsButtonPressed (hwnd, wParam); case TB_LOADIMAGES: return TOOLBAR_LoadImages (hwnd, wParam, lParam); @@ -6853,7 +6853,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetButtonInfoW (hwnd, wParam, lParam); case TB_SETBUTTONSIZE: - return TOOLBAR_SetButtonSize (hwnd, wParam, lParam); + return TOOLBAR_SetButtonSize (hwnd, lParam); case TB_SETBUTTONWIDTH: return TOOLBAR_SetButtonWidth (hwnd, wParam, lParam); @@ -6889,13 +6889,13 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetInsertMarkColor (hwnd, wParam, lParam); case TB_SETMAXTEXTROWS: - return TOOLBAR_SetMaxTextRows (hwnd, wParam, lParam); + return TOOLBAR_SetMaxTextRows (hwnd, wParam); case TB_SETPADDING: - return TOOLBAR_SetPadding (hwnd, wParam, lParam); + return TOOLBAR_SetPadding (hwnd, lParam); case TB_SETPARENT: - return TOOLBAR_SetParent (hwnd, wParam, lParam); + return TOOLBAR_SetParent (hwnd, wParam); case TB_SETROWS: return TOOLBAR_SetRows (hwnd, wParam, lParam); @@ -6904,7 +6904,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetState (hwnd, wParam, lParam); case TB_SETSTYLE: - return TOOLBAR_SetStyle (hwnd, wParam, lParam); + return TOOLBAR_SetStyle (hwnd, lParam); case TB_SETTOOLTIPS: return TOOLBAR_SetToolTips (hwnd, wParam, lParam); @@ -7003,7 +7003,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_NCPaint (hwnd, wParam, lParam); case WM_NOTIFY: - return TOOLBAR_Notify (hwnd, wParam, lParam); + return TOOLBAR_Notify (hwnd, lParam); case WM_NOTIFYFORMAT: return TOOLBAR_NotifyFormat (infoPtr, wParam, lParam);

1 0

Nikolay Sivov : mshtml: Added ISupportErrorInfo for IHTMLDocument.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: bf2e1f08d3b19ed3627669eeae9051f3408ed996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2e1f08d3b19ed3627669eea… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jan 19 02:03:03 2009 +0300 mshtml: Added ISupportErrorInfo for IHTMLDocument. --- dlls/mshtml/htmldoc.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 4 +++- dlls/mshtml/tests/htmldoc.c | 26 ++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8e5981b..32da2e0 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -129,6 +129,9 @@ static HRESULT WINAPI HTMLDocument_QueryInterface(IHTMLDocument2 *iface, REFIID }else if(IsEqualGUID(&DIID_DispHTMLDocument, riid)) { TRACE("(%p)->(DIID_DispHTMLDocument %p)\n", This, ppvObject); *ppvObject = HTMLDOC(This); + }else if(IsEqualGUID(&IID_ISupportErrorInfo, riid)) { + TRACE("(%p)->(IID_ISupportErrorInfo %p)\n", This, ppvObject); + *ppvObject = SUPPERRINFO(This); }else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppvObject); return E_NOINTERFACE; @@ -1572,6 +1575,39 @@ static const IHTMLDocument2Vtbl HTMLDocumentVtbl = { HTMLDocument_createStyleSheet }; +#define SUPPINFO_THIS(iface) DEFINE_THIS(HTMLDocument, SupportErrorInfo, iface) + +static HRESULT WINAPI SupportErrorInfo_QueryInterface(ISupportErrorInfo *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = SUPPINFO_THIS(iface); + return IHTMLDocument_QueryInterface(HTMLDOC(This), riid, ppv); +} + +static ULONG WINAPI SupportErrorInfo_AddRef(ISupportErrorInfo *iface) +{ + HTMLDocument *This = SUPPINFO_THIS(iface); + return IHTMLDocument_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI SupportErrorInfo_Release(ISupportErrorInfo *iface) +{ + HTMLDocument *This = SUPPINFO_THIS(iface); + return IHTMLDocument_Release(HTMLDOC(This)); +} + +static HRESULT WINAPI SupportErrorInfo_InterfaceSupportsErrorInfo(ISupportErrorInfo *iface, REFIID riid) +{ + FIXME("(%p)->(%s)\n", iface, debugstr_guid(riid)); + return S_FALSE; +} + +static const ISupportErrorInfoVtbl SupportErrorInfoVtbl = { + SupportErrorInfo_QueryInterface, + SupportErrorInfo_AddRef, + SupportErrorInfo_Release, + SupportErrorInfo_InterfaceSupportsErrorInfo +}; + #define DISPEX_THIS(iface) DEFINE_THIS(HTMLDocument, IDispatchEx, iface) static HRESULT WINAPI DocDispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -1742,6 +1778,7 @@ static HRESULT alloc_doc(HTMLDocument **ret) doc = heap_alloc_zero(sizeof(HTMLDocument)); doc->lpHTMLDocument2Vtbl = &HTMLDocumentVtbl; doc->lpIDispatchExVtbl = &DocDispatchExVtbl; + doc->lpSupportErrorInfoVtbl = &SupportErrorInfoVtbl; doc->ref = 1; doc->readystate = READYSTATE_UNINITIALIZED; doc->scriptmode = SCRIPTMODE_GECKO; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 148c997..d884ca3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -238,7 +238,7 @@ struct HTMLDocument { const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; const ICustomDocVtbl *lpCustomDocVtbl; const IDispatchExVtbl *lpIDispatchExVtbl; - + const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl; LONG ref; NSContainer *nscontainer; @@ -474,6 +474,8 @@ typedef struct { #define DISPATCHEX(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl) +#define SUPPERRINFO(x) ((ISupportErrorInfo*) &(x)->lpSupportErrorInfoVtbl) + #define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc))) #define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ed69725..c870989 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4135,6 +4135,31 @@ static void gecko_installer_workaround(BOOL disable) RegCloseKey(hkey); } +static void test_HTMLDoc_ISupportErrorInfo(void) +{ + HRESULT hres; + IUnknown *unk; + ISupportErrorInfo *sinfo; + LONG ref; + + hres = create_document(&unk); + if(FAILED(hres)) + return; + + hres = IUnknown_QueryInterface(unk, &IID_ISupportErrorInfo, (void**)&sinfo); + ok(hres == S_OK, "got %x\n", hres); + ok(sinfo != NULL, "got %p\n", sinfo); + if(sinfo) + { + hres = ISupportErrorInfo_InterfaceSupportsErrorInfo(sinfo, &IID_IErrorInfo); + ok(hres == S_FALSE, "Expected S_OK, got %x\n", hres); + } + + IUnknown_Release(sinfo); + ref = IUnknown_Release(unk); + ok(ref == 0, "ref=%d, expected 0\n", ref); +} + START_TEST(htmldoc) { gecko_installer_workaround(TRUE); @@ -4151,6 +4176,7 @@ START_TEST(htmldoc) test_editing_mode(FALSE); test_editing_mode(TRUE); } + test_HTMLDoc_ISupportErrorInfo(); DestroyWindow(container_hwnd); CoUninitialize();

1 0

Alexandre Julliard : wintrust/tests: Clean up temp files after test.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: e098f427b4b33e1591c9c796fd44dd3650becac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e098f427b4b33e1591c9c796f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 15:45:33 2009 +0100 wintrust/tests: Clean up temp files after test. --- dlls/wintrust/tests/crypt.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 624f2c4..c2339a5 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -605,15 +605,17 @@ static void test_catalog_properties(CHAR *catfile, int attributes, int members) attributes = 2; members = 1; + MultiByteToWideChar(CP_ACP, 0, catalog, -1, catalogW, MAX_PATH); } else - strcpy(catalog, catfile); + { + MultiByteToWideChar(CP_ACP, 0, catfile, -1, catalogW, MAX_PATH); + catalog[0] = 0; + } hcat = pCryptCATOpen(NULL, 0, 0, 0, 0); ok(hcat == INVALID_HANDLE_VALUE, "CryptCATOpen succeeded\n"); - MultiByteToWideChar(CP_ACP, 0, catalog, -1, catalogW, MAX_PATH); - hcat = pCryptCATOpen(catalogW, 0, 0, 0, 0); ok(hcat != INVALID_HANDLE_VALUE, "CryptCATOpen failed %u\n", GetLastError()); @@ -658,6 +660,7 @@ static void test_catalog_properties(CHAR *catfile, int attributes, int members) ret = pCryptCATClose(hcat); ok(ret, "CryptCATClose failed\n"); + if (catalog[0]) DeleteFileA( catalog ); } static void test_create_catalog_file(void)

1 0