wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Nikolay Sivov : shell32: Some cleanup for IExplorerBrowser.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 842798f8465c8c5c0af2cd16b2407c8b6f4902ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=842798f8465c8c5c0af2cd16b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 1 13:53:19 2013 +0400 shell32: Some cleanup for IExplorerBrowser. --- dlls/shell32/ebrowser.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index f7242e9..bb697d2 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -1214,7 +1214,7 @@ static HRESULT WINAPI IExplorerBrowser_fnBrowseToObject(IExplorerBrowser *iface, TRACE("%p (%p, 0x%x)\n", This, punk, uFlags); if(!punk) - return IExplorerBrowser_fnBrowseToIDList(iface, NULL, uFlags); + return IExplorerBrowser_BrowseToIDList(iface, NULL, uFlags); hr = SHGetIDListFromObject(punk, &pidl); if(SUCCEEDED(hr)) @@ -1292,21 +1292,21 @@ static HRESULT WINAPI IShellBrowser_fnQueryInterface(IShellBrowser *iface, { ExplorerBrowserImpl *This = impl_from_IShellBrowser(iface); TRACE("%p\n", This); - return IUnknown_QueryInterface((IUnknown*) This, riid, ppvObject); + return IExplorerBrowser_QueryInterface(&This->IExplorerBrowser_iface, riid, ppvObject); } static ULONG WINAPI IShellBrowser_fnAddRef(IShellBrowser *iface) { ExplorerBrowserImpl *This = impl_from_IShellBrowser(iface); TRACE("%p\n", This); - return IUnknown_AddRef((IUnknown*) This); + return IExplorerBrowser_AddRef(&This->IExplorerBrowser_iface); } static ULONG WINAPI IShellBrowser_fnRelease(IShellBrowser *iface) { ExplorerBrowserImpl *This = impl_from_IShellBrowser(iface); TRACE("%p\n", This); - return IUnknown_Release((IUnknown*) This); + return IExplorerBrowser_Release(&This->IExplorerBrowser_iface); } static HRESULT WINAPI IShellBrowser_fnGetWindow(IShellBrowser *iface, HWND *phwnd) @@ -1396,7 +1396,7 @@ static HRESULT WINAPI IShellBrowser_fnBrowseObject(IShellBrowser *iface, ExplorerBrowserImpl *This = impl_from_IShellBrowser(iface); TRACE("%p (%p, %x)\n", This, pidl, wFlags); - return IExplorerBrowser_fnBrowseToIDList((IExplorerBrowser*)This, pidl, wFlags); + return IExplorerBrowser_BrowseToIDList(&This->IExplorerBrowser_iface, pidl, wFlags); } static HRESULT WINAPI IShellBrowser_fnGetViewStateStream(IShellBrowser *iface, @@ -1500,21 +1500,21 @@ static HRESULT WINAPI ICommDlgBrowser3_fnQueryInterface(ICommDlgBrowser3 *iface, { ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); TRACE("%p\n", This); - return IUnknown_QueryInterface((IUnknown*) This, riid, ppvObject); + return IExplorerBrowser_QueryInterface(&This->IExplorerBrowser_iface, riid, ppvObject); } static ULONG WINAPI ICommDlgBrowser3_fnAddRef(ICommDlgBrowser3 *iface) { ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); TRACE("%p\n", This); - return IUnknown_AddRef((IUnknown*) This); + return IExplorerBrowser_AddRef(&This->IExplorerBrowser_iface); } static ULONG WINAPI ICommDlgBrowser3_fnRelease(ICommDlgBrowser3 *iface) { ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); TRACE("%p\n", This); - return IUnknown_Release((IUnknown*) This); + return IExplorerBrowser_Release(&This->IExplorerBrowser_iface); } static HRESULT WINAPI ICommDlgBrowser3_fnOnDefaultCommand(ICommDlgBrowser3 *iface, @@ -1549,7 +1549,7 @@ static HRESULT WINAPI ICommDlgBrowser3_fnOnDefaultCommand(ICommDlgBrowser3 *ifac /* Handle folders by browsing to them. */ if(_ILIsFolder(pidl_child) || _ILIsDrive(pidl_child) || _ILIsSpecialFolder(pidl_child)) { - IExplorerBrowser_BrowseToIDList((IExplorerBrowser*)This, pidl_child, SBSP_RELATIVE); + IExplorerBrowser_BrowseToIDList(&This->IExplorerBrowser_iface, pidl_child, SBSP_RELATIVE); ret = S_OK; } GlobalUnlock(medium.u.hGlobal); @@ -1694,21 +1694,21 @@ static HRESULT WINAPI IObjectWithSite_fnQueryInterface(IObjectWithSite *iface, { ExplorerBrowserImpl *This = impl_from_IObjectWithSite(iface); TRACE("%p\n", This); - return IUnknown_QueryInterface((IUnknown*)This, riid, ppvObject); + return IExplorerBrowser_QueryInterface(&This->IExplorerBrowser_iface, riid, ppvObject); } static ULONG WINAPI IObjectWithSite_fnAddRef(IObjectWithSite *iface) { ExplorerBrowserImpl *This = impl_from_IObjectWithSite(iface); TRACE("%p\n", This); - return IUnknown_AddRef((IUnknown*)This); + return IExplorerBrowser_AddRef(&This->IExplorerBrowser_iface); } static ULONG WINAPI IObjectWithSite_fnRelease(IObjectWithSite *iface) { ExplorerBrowserImpl *This = impl_from_IObjectWithSite(iface); TRACE("%p\n", This); - return IUnknown_Release((IUnknown*)This); + return IExplorerBrowser_Release(&This->IExplorerBrowser_iface); } static HRESULT WINAPI IObjectWithSite_fnSetSite(IObjectWithSite *iface, IUnknown *punk_site) @@ -1784,14 +1784,14 @@ static ULONG WINAPI NSTCEvents_fnAddRef(INameSpaceTreeControlEvents *iface) { ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); TRACE("%p\n", This); - return IUnknown_AddRef((IUnknown*)This); + return IExplorerBrowser_AddRef(&This->IExplorerBrowser_iface); } static ULONG WINAPI NSTCEvents_fnRelease(INameSpaceTreeControlEvents *iface) { ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); TRACE("%p\n", This); - return IUnknown_Release((IUnknown*)This); + return IExplorerBrowser_Release(&This->IExplorerBrowser_iface); } static HRESULT WINAPI NSTCEvents_fnOnItemClick(INameSpaceTreeControlEvents *iface, @@ -1843,7 +1843,7 @@ static HRESULT WINAPI NSTCEvents_fnOnSelectionChanged(INameSpaceTreeControlEvent hr = IShellItemArray_GetItemAt(psiaSelection, 0, &psi); if(SUCCEEDED(hr)) { - hr = IExplorerBrowser_BrowseToObject((IExplorerBrowser*)This, + hr = IExplorerBrowser_BrowseToObject(&This->IExplorerBrowser_iface, (IUnknown*)psi, SBSP_DEFBROWSER); IShellItem_Release(psi); } @@ -1996,21 +1996,21 @@ static HRESULT WINAPI IInputObject_fnQueryInterface(IInputObject *iface, { ExplorerBrowserImpl *This = impl_from_IInputObject(iface); TRACE("%p\n", This); - return IUnknown_QueryInterface((IUnknown*)This, riid, ppvObject); + return IExplorerBrowser_QueryInterface(&This->IExplorerBrowser_iface, riid, ppvObject); } static ULONG WINAPI IInputObject_fnAddRef(IInputObject *iface) { ExplorerBrowserImpl *This = impl_from_IInputObject(iface); TRACE("%p\n", This); - return IUnknown_AddRef((IUnknown*)This); + return IExplorerBrowser_AddRef(&This->IExplorerBrowser_iface); } static ULONG WINAPI IInputObject_fnRelease(IInputObject *iface) { ExplorerBrowserImpl *This = impl_from_IInputObject(iface); TRACE("%p\n", This); - return IUnknown_Release((IUnknown*)This); + return IExplorerBrowser_Release(&This->IExplorerBrowser_iface); } static HRESULT WINAPI IInputObject_fnUIActivateIO(IInputObject *iface, BOOL fActivate, MSG *pMsg) @@ -2071,8 +2071,8 @@ HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, voi list_init(&eb->event_clients); list_init(&eb->travellog); - ret = IExplorerBrowser_QueryInterface((IExplorerBrowser*)eb, riid, ppv); - IExplorerBrowser_Release((IExplorerBrowser*)eb); + ret = IExplorerBrowser_QueryInterface(&eb->IExplorerBrowser_iface, riid, ppv); + IExplorerBrowser_Release(&eb->IExplorerBrowser_iface); TRACE("--(%p)\n", ppv); return ret;

1 0

Nikolay Sivov : shell32: Fix some tests failures on Win8.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 7a5ca2d3d45a447f18dba26898538b01ba480e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5ca2d3d45a447f18dba2689… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 1 13:38:51 2013 +0400 shell32: Fix some tests failures on Win8. --- dlls/shell32/ebrowser.c | 5 +-- dlls/shell32/tests/ebrowser.c | 64 +++++++++++++++++++++++++++-------------- 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 90be5f8..f7242e9 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -1414,9 +1414,8 @@ static HRESULT WINAPI IShellBrowser_fnGetControlWindow(IShellBrowser *iface, UINT id, HWND *phwnd) { ExplorerBrowserImpl *This = impl_from_IShellBrowser(iface); - TRACE("%p (%d, %p)\n", This, id, phwnd); - - /* Not implemented. */ + TRACE("(%p)->(%d, %p)\n", This, id, phwnd); + if (phwnd) *phwnd = NULL; return E_NOTIMPL; } diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 8149f8f..c56dffb 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -61,6 +61,14 @@ DEFINE_GUID(IID_UnknownInterface7, 0x68A4FDBA, 0xA48A, 0x4A86, 0xA3,0x29, 0x1 DEFINE_GUID(IID_UnknownInterface8, 0xD3B1CAF5, 0xEC4F, 0x4B2E, 0xBC,0xB0, 0x60,0xD7,0x15,0xC9,0x3C,0xB2); DEFINE_GUID(IID_UnknownInterface9, 0x9536CA39, 0x1ACB, 0x4AE6, 0xAD,0x27, 0x24,0x03,0xD0,0x4C,0xA2,0x8F); DEFINE_GUID(IID_UnknownInterface10, 0xB722BE00, 0x4E68, 0x101B, 0xA2,0xBC, 0x00,0xAA,0x00,0x40,0x47,0x70); +DEFINE_GUID(IID_UnknownInterface11, 0x691ecf9f, 0x6b9c, 0x4311, 0xa1,0x7b, 0xad,0x15,0x4c,0x30,0xe9,0x1f); +DEFINE_GUID(IID_UnknownInterface12, 0x7e3159f5, 0x21ca, 0x4ec2, 0x8f,0xbe, 0x66,0x2d,0x08,0x2c,0xa3,0xeb); +DEFINE_GUID(IID_UnknownInterface13, 0xa36a3ace, 0x8332, 0x45ce, 0xaa,0x29, 0x50,0x3c,0xb7,0x6b,0x25,0x87); +DEFINE_GUID(IID_UnknownInterface14, 0x16770868, 0x239c, 0x445b, 0xa0,0x1d, 0xf2,0x6c,0x7f,0xbb,0xf2,0x6c); +DEFINE_GUID(IID_UnknownInterface15, 0x05a89298, 0x6246, 0x4c63, 0xbb,0x0d, 0x9b,0xda,0xf1,0x40,0xbf,0x3b); +DEFINE_GUID(IID_UnknownInterface16, 0x35094a87, 0x8bb1, 0x4237, 0x96,0xc6, 0xc4,0x17,0xee,0xbd,0xb0,0x78); +DEFINE_GUID(IID_UnknownInterface17, 0xa36a3ace, 0x8332, 0x45ce, 0xaa,0x29, 0x50,0x3c,0xb7,0x6b,0x25,0x87); +DEFINE_GUID(IID_UnknownInterface18, 0x3d5d8c60, 0x21e4, 0x4b03, 0x83,0xb8, 0xc7,0x3f,0x8c,0x94,0x00,0x78); static HWND hwnd; @@ -113,11 +121,19 @@ static void process_msgs(void) } } -static void dbg_print_guid(const GUID *guid) { - WCHAR buf[MAX_PATH]; +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + if(!riid) + return "(null)"; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); - StringFromGUID2(guid, buf, MAX_PATH); - printf("guid:[%s]\n", wine_dbgstr_wn(buf, lstrlenW(buf))); + return buf; } /********************************************************************* @@ -215,8 +231,7 @@ static inline IExplorerPaneVisibilityImpl *impl_from_IExplorerPaneVisibility(IEx static HRESULT WINAPI IExplorerPaneVisibility_fnQueryInterface(IExplorerPaneVisibility *iface, REFIID riid, LPVOID *ppvObj) { - ok(0, "Not called.\n"); - trace("REFIID:"); dbg_print_guid(riid); + ok(0, "unexpected, %s\n", debugstr_guid(riid)); *ppvObj = NULL; return E_NOINTERFACE; } @@ -260,7 +275,7 @@ static HRESULT WINAPI IExplorerPaneVisibility_fnGetPaneState(IExplorerPaneVisibi else if(IsEqualGUID(&EP_AdvQueryPane, ep)) This->aqp++; else { - trace("Unknown explorer pane: "); dbg_print_guid(ep); + trace("Unknown explorer pane: %s\n", debugstr_guid(ep)); This->unk++; } @@ -305,8 +320,7 @@ static inline ICommDlgBrowser3Impl *impl_from_ICommDlgBrowser3(ICommDlgBrowser3 static HRESULT WINAPI ICommDlgBrowser3_fnQueryInterface(ICommDlgBrowser3 *iface, REFIID riid, LPVOID *ppvObj) { - ok(0, "Not called.\n"); - trace("riid:"); dbg_print_guid(riid); + ok(0, "unexpected %s\n", debugstr_guid(riid)); *ppvObj = NULL; return E_NOINTERFACE; } @@ -476,8 +490,7 @@ static HRESULT WINAPI IServiceProvider_fnQueryInterface(IServiceProvider *iface, return E_NOINTERFACE; } - ok(0, "Unexpected interface requested.\n"); - trace("riid: "); dbg_print_guid(riid); + ok(0, "Unexpected interface requested, %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -521,12 +534,7 @@ static HRESULT WINAPI IServiceProvider_fnQueryService(IServiceProvider *iface, } } - ok(was_in_list, "-- Unknown service requested --\n"); - if(!was_in_list) - { - trace("guidService: "); dbg_print_guid(guidService); - trace("riid: "); dbg_print_guid(riid); - } + ok(was_in_list, "unknown service, serviceID: %s, riid: %s\n", debugstr_guid(guidService), debugstr_guid(riid)); /* Give back an interface, if any. */ if(punk) @@ -617,22 +625,25 @@ static void test_SB_misc(void) } /* Some unimplemented methods */ - retHwnd = (HWND)0xDEADBEEF; + retHwnd = (HWND)0xdeadbeef; hr = IShellBrowser_GetControlWindow(psb, FCW_TOOLBAR, &retHwnd); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); - ok(retHwnd == (HWND)0xDEADBEEF, "HWND overwritten\n"); + ok(retHwnd == NULL || broken(retHwnd == (HWND)0xdeadbeef), "got %p\n", retHwnd); + retHwnd = (HWND)0xdeadbeef; hr = IShellBrowser_GetControlWindow(psb, FCW_STATUS, &retHwnd); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); - ok(retHwnd == (HWND)0xDEADBEEF, "HWND overwritten\n"); + ok(retHwnd == NULL || broken(retHwnd == (HWND)0xdeadbeef), "got %p\n", retHwnd); + retHwnd = (HWND)0xdeadbeef; hr = IShellBrowser_GetControlWindow(psb, FCW_TREE, &retHwnd); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); - ok(retHwnd == (HWND)0xDEADBEEF, "HWND overwritten\n"); + ok(retHwnd == NULL || broken(retHwnd == (HWND)0xdeadbeef), "got %p\n", retHwnd); + retHwnd = (HWND)0xdeadbeef; hr = IShellBrowser_GetControlWindow(psb, FCW_PROGRESS, &retHwnd); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); - ok(retHwnd == (HWND)0xDEADBEEF, "HWND overwritten\n"); + ok(retHwnd == NULL || broken(retHwnd == (HWND)0xdeadbeef), "got %p\n", retHwnd); /* ::InsertMenuSB */ hr = IShellBrowser_InsertMenusSB(psb, NULL, NULL); @@ -927,6 +938,15 @@ static void test_SetSite(void) { &IID_UnknownInterface4, &IID_IUnknown, 0, NULL }, { &IID_UnknownInterface6, &IID_UnknownInterface7, 0, NULL }, { &IID_IBrowserWithActivationNotification, &IID_IBrowserWithActivationNotification, 0, NULL }, + /* Win 8 */ + { &IID_ICommDlgBrowser, &IID_UnknownInterface11, 0, NULL }, + { &IID_ICommDlgBrowser, &IID_UnknownInterface12, 0, NULL }, + { &IID_UnknownInterface13, &IID_IUnknown, 0, NULL }, + { &IID_UnknownInterface14, &IID_UnknownInterface14, 0, NULL }, + { &IID_UnknownInterface15, &IID_UnknownInterface15, 0, NULL }, + { &IID_UnknownInterface16, &IID_UnknownInterface16, 0, NULL }, + { &IID_UnknownInterface17, &IID_UnknownInterface17, 0, NULL }, + { &IID_UnknownInterface18, &IID_UnknownInterface18, 0, NULL }, /* Other services requested in Vista, Windows 2008 but not in Windows 7 */ { &IID_IBrowserSettings_Vista, &IID_IBrowserSettings_Vista, 0, NULL },

1 0

André Hentschel : winetest: Set font in resources.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 70a7c6d3d160ac470fb411cf351c891859aea09c URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a7c6d3d160ac470fb411cf3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 1 00:11:23 2013 +0200 winetest: Set font in resources. --- programs/winetest/winetest.rc | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index ff9ca7b..a9dcc18 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -27,9 +27,10 @@ IDD_TAG DIALOG 0, 0, 150, 65 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "No tag supplied" +FONT 8, "MS Shell Dlg" BEGIN CTEXT "Please supply a tag for your report. You can use letters, digits, dashes and periods." - IDC_STATIC, 10, 5, 130, 30 + IDC_STATIC, 5, 5, 130, 30 EDITTEXT IDC_TAG, 35, 30, 80, 10, ES_AUTOHSCROLL DEFPUSHBUTTON "Start", IDOK, 25, 45, 40, 14 PUSHBUTTON "Abort", IDABORT, 85, 45, 40, 14 @@ -38,9 +39,10 @@ END IDD_EMAIL DIALOG 0, 0, 150, 65 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "No email supplied" +FONT 8, "MS Shell Dlg" BEGIN CTEXT "Please supply an email address to enable developers to contact you about your report." - IDC_STATIC, 10, 5, 130, 30 + IDC_STATIC, 5, 5, 130, 30 EDITTEXT IDC_EMAIL, 10, 30, 130, 10, ES_AUTOHSCROLL DEFPUSHBUTTON "Start", IDOK, 25, 45, 40, 14 PUSHBUTTON "Abort", IDABORT, 85, 45, 40, 14 @@ -49,21 +51,22 @@ END IDD_STATUS DIALOG 0, 0, 160, 150 STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX CAPTION "Wine Test Shell" +FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Extracting:", IDC_ST0, 10, 5, 140, 10 + LTEXT "Extracting:", IDC_ST0, 5, 5, 140, 10 CONTROL "PB0", IDC_PB0, PROGRESS_CLASSA, 0, 5, 15, 150, 10 - LTEXT "Running:", IDC_ST1, 10, 30, 140, 10 + LTEXT "Running:", IDC_ST1, 5, 30, 140, 10 CONTROL "PB1", IDC_PB1, PROGRESS_CLASSA, 0, 5, 40, 150, 10 - LTEXT "Network transfer:", IDC_ST2, 10, 55, 140, 10 + LTEXT "Network transfer:", IDC_ST2, 5, 55, 140, 10 CONTROL "PB2", IDC_PB2, PROGRESS_CLASSA, 0, 5, 65, 150, 10 - LTEXT "Tag:", IDC_STATIC, 10, 89, 100, 10 + LTEXT "Tag:", IDC_STATIC, 5, 89, 100, 10 EDITTEXT IDC_TAG, 25, 88, 125, 10, ES_READONLY - LTEXT "Working directory:", IDC_STATIC, 10, 100, 100, 10 + LTEXT "Working directory:", IDC_STATIC, 5, 100, 100, 10 EDITTEXT IDC_DIR, 71, 99, 79, 10, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Output file:", IDC_STATIC, 10, 111, 100, 10 + LTEXT "Output file:", IDC_STATIC, 5, 111, 100, 10 EDITTEXT IDC_OUT, 46, 110, 104, 10, ES_READONLY | ES_AUTOHSCROLL @@ -78,9 +81,10 @@ END IDD_ABOUT DIALOG 0, 0, 150, 60 STYLE WS_POPUP CAPTION "About Wine Test Shell" +FONT 8, "MS Shell Dlg" BEGIN CTEXT "This program extracts and runs a series of tests which check Wine's conformance to the Windows API.", - IDC_STATIC, 10, 5, 130, 30 + IDC_STATIC, 5, 5, 130, 30 DEFPUSHBUTTON "Close", IDCANCEL, 55, 40, 40, 14 END

1 0

André Hentschel : winetest: Report number of failures in more places.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 010399a3f75e08f5bae92ad22f65b633f21b5483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=010399a3f75e08f5bae92ad22… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 1 00:09:43 2013 +0200 winetest: Report number of failures in more places. --- programs/winetest/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index f4ebee6..135e18e 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1072,7 +1072,7 @@ run_tests (char *logname, char *outdir) } report (R_DELTA, 0, "Running: Done"); - report (R_STATUS, "Cleaning up"); + report (R_STATUS, "Cleaning up - %u failures", failures); CloseHandle( logfile ); logfile = 0; if (!outdir) @@ -1353,7 +1353,7 @@ int main( int argc, char *argv[] ) if (!send_file (logname) && !DeleteFileA(logname)) report (R_WARNING, "Can't remove logfile: %u", GetLastError()); } else run_tests (logname, outdir); - report (R_STATUS, "Finished"); + report (R_STATUS, "Finished - %u failures", failures); } if (poweroff) {

1 0

André Hentschel : winecfg: Add more room for the license.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 09fb0ca5eed93c16ebc33b965e0c72f7a34edb7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09fb0ca5eed93c16ebc33b965… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 31 23:15:31 2013 +0200 winecfg: Add more room for the license. --- programs/winecfg/winecfg.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 1f06c77..f856de1 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -130,7 +130,7 @@ BEGIN LTEXT "",IDC_ABT_PANEL_TEXT,160,43,140,8 CONTROL "",IDC_ABT_WEB_LINK,"SysLink", LWS_TRANSPARENT, 105,53,106,8 LTEXT "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", - IDC_ABT_LICENSE_TEXT,105,64,145,60 + IDC_ABT_LICENSE_TEXT,105,64,145,66 GROUPBOX "Windows registration information", IDC_STATIC, 15, 155, 230, 55 LTEXT "&Owner:", IDC_STATIC, 22, 171, 40, 20 EDITTEXT IDC_ABT_OWNER, 75, 171, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::AddVarDesc.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 205671f355ccb33914fa48a5d247b438f44d8677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=205671f355ccb33914fa48a5d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 31 15:06:34 2013 -0500 oleaut32: Implement ICreateTypeInfo::AddVarDesc. --- dlls/oleaut32/typelib.c | 56 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d52d461..77c68ab 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1734,7 +1734,12 @@ static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeInfoImpl **typeinfos, return NULL; } -static TLBVarDesc *TLBVarDesc_Constructor(UINT n) +static void TLBVarDesc_Constructor(TLBVarDesc *var_desc) +{ + list_init(&var_desc->custdata_list); +} + +static TLBVarDesc *TLBVarDesc_Alloc(UINT n) { TLBVarDesc *ret; @@ -1743,7 +1748,7 @@ static TLBVarDesc *TLBVarDesc_Constructor(UINT n) return NULL; while(n){ - list_init(&ret[n-1].custdata_list); + TLBVarDesc_Constructor(&ret[n-1]); --n; } @@ -2451,7 +2456,7 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, TRACE_(typelib)("\n"); - ptvd = *pptvd = TLBVarDesc_Constructor(cVars); + ptvd = *pptvd = TLBVarDesc_Alloc(cVars); MSFT_ReadLEDWords(&infolen,sizeof(INT), pcx, offset); MSFT_ReadLEDWords(&recoffset,sizeof(INT), pcx, offset + infolen + ((cFuncs+cVars)*2+cFuncs + 1)*sizeof(INT)); @@ -3876,7 +3881,7 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign unsigned short i; WORD *pType; - pVarDesc = pTI->vardescs = TLBVarDesc_Constructor(cVars); + pVarDesc = pTI->vardescs = TLBVarDesc_Alloc(cVars); for(pItem = (SLTG_Variable *)pFirstItem, i = 0; i < cVars; pItem = (SLTG_Variable *)(pBlk + pItem->next), i++, ++pVarDesc) { @@ -9113,8 +9118,47 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, UINT index, VARDESC *varDesc) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %p - stub\n", This, index, varDesc); - return E_NOTIMPL; + TLBVarDesc *var_desc; + + TRACE("%p %u %p\n", This, index, varDesc); + + if (This->vardescs){ + UINT i; + + This->vardescs = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->vardescs, + sizeof(TLBVarDesc) * (This->cVars + 1)); + + if (index < This->cVars) { + memmove(This->vardescs + index + 1, This->vardescs + index, + (This->cVars - index) * sizeof(TLBVarDesc)); + var_desc = This->vardescs + index; + } else + var_desc = This->vardescs + This->cVars; + + /* move custdata lists to the new memory location */ + for(i = 0; i < This->cVars + 1; ++i){ + if(index != i){ + TLBVarDesc *var = &This->vardescs[i]; + if(var->custdata_list.prev == var->custdata_list.next) + list_init(&var->custdata_list); + else{ + var->custdata_list.prev->next = &var->custdata_list; + var->custdata_list.next->prev = &var->custdata_list; + } + } + } + } else + var_desc = This->vardescs = heap_alloc(sizeof(TLBVarDesc)); + + memset(var_desc, 0, sizeof(TLBVarDesc)); + TLBVarDesc_Constructor(var_desc); + var_desc->vardesc = *varDesc; + + ++This->cVars; + + This->needs_layout = TRUE; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames(ICreateTypeInfo2 *iface,

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetVarDocString.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 4b2201b11c0900cd5113881ce19adb0684e86975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b2201b11c0900cd5113881ce… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 31 15:06:31 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetVarDocString. --- dlls/oleaut32/typelib.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 098100d..d52d461 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9196,8 +9196,19 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarDocString(ICreateTypeInfo2 *iface UINT index, LPOLESTR docString) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(docString)); - return E_NOTIMPL; + TLBVarDesc *var_desc = &This->vardescs[index]; + + TRACE("%p %u %s\n", This, index, wine_dbgstr_w(docString)); + + if(!docString) + return E_INVALIDARG; + + if(index >= This->cVars) + return TYPE_E_ELEMENTNOTFOUND; + + var_desc->HelpString = TLB_append_str(&This->pTypeLib->string_list, docString); + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext(ICreateTypeInfo2 *iface,

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetVarHelpContext.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 5ae88daf6334ec47a1689971dd8f182574416340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae88daf6334ec47a1689971d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 31 15:06:14 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetVarHelpContext. --- dlls/oleaut32/typelib.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b6f2e92..098100d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9220,8 +9220,16 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext(ICreateTypeInfo2 *ifa UINT index, DWORD helpContext) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %d - stub\n", This, index, helpContext); - return E_NOTIMPL; + TLBVarDesc *var_desc = &This->vardescs[index]; + + TRACE("%p %u %d\n", This, index, helpContext); + + if(index >= This->cVars) + return TYPE_E_ELEMENTNOTFOUND; + + var_desc->HelpContext = helpContext; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetMops(ICreateTypeInfo2 *iface,

1 0

Alexandre Julliard : Don' t specify protocol in URLs in order to support https.
by Alexandre Julliard 01 Jun '13

01 Jun '13

Module: appdb Branch: master Commit: ba01f07dad57ab3653131027ad4635e9c20ba71c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ba01f07dad57ab3653131027… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 1 15:09:06 2013 +0200 Don't specify protocol in URLs in order to support https. --- help/appdb_faq.help | 2 +- help/generic.help | 10 +++++----- help/maintainer_guidelines.help | 2 +- include/header.php | 14 +++++++------- include/testData.php | 4 ++-- index.php | 2 +- utils.js | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/help/appdb_faq.help b/help/appdb_faq.help index bc66693..f063867 100644 --- a/help/appdb_faq.help +++ b/help/appdb_faq.help @@ -38,7 +38,7 @@ allowing many unmodified Windows binaries to run on x86-based Unixes, including <a href="http://wwws.sun.com/software/solaris/">Solaris</a>.</p> <p>More information can be found at the -<a href="http://www.winehq.org/site/docs/wine-faq/index" style="cursor: help">Wine FAQ</a>.<p> +<a href="//www.winehq.org/site/docs/wine-faq/index" style="cursor: help">Wine FAQ</a>.<p> </blockquote> <p><b>Q: What are the benefits of this Application Database?</b></p> diff --git a/help/generic.help b/help/generic.help index 64afbb2..f42054a 100644 --- a/help/generic.help +++ b/help/generic.help @@ -8,10 +8,10 @@ for a certain program hasn't been created.</center> <li> Make sure your Wine release is recent.<p> <ul> - <li><a href="http://www.winehq.org/site/download"> Official WineHQ builds</a> + <li><a href="//www.winehq.org/site/download"> Official WineHQ builds</a> for all the popular platforms and distributions, hosted by <a href="http://sourceforge.net/project/showfiles.php?group_id=6241">SourceForge.net</a>.</li> - <li>Consult <a href="http://www.winehq.org/site/git">the git instructions</a> for information on obtaining the latest source. + <li>Consult <a href="//www.winehq.org/site/git">the git instructions</a> for information on obtaining the latest source. <p>For how to build and install Wine via source consult the README or for building Wine on a 64bit GNU/Linux read over the <a href="http://wiki.winehq.org/WineOn64bit">WineOn64bit wiki entry</a>.</li> </ul> @@ -42,11 +42,11 @@ dll overrides.<p> <li><p> For sound problems, run ‘winecfg’ and look at the audio tab.</li> <li><p> In case of persisting failure, you may want to read over the -<a href="http://www.winehq.org/site/documentation">Wine Documentation</a> +<a href="//www.winehq.org/site/documentation">Wine Documentation</a> and you may also want to read the -<a href="http://www.winehq.org/site/docs/wine-faq/index">Wine FAQ</a>.</li> +<a href="//www.winehq.org/site/docs/wine-faq/index">Wine FAQ</a>.</li> -<li><p> The Wine <a href="http://www.winehq.org/site/getting_help">'Getting Help'</a> page shows the current methods of getting help with Wine.</li> +<li><p> The Wine <a href="//www.winehq.org/site/getting_help">'Getting Help'</a> page shows the current methods of getting help with Wine.</li> <li><p> If you have more questions, please contact us at <a href="mailto:appdb@winehq.org">appdb(a)winehq.org</a>.</li> diff --git a/help/maintainer_guidelines.help b/help/maintainer_guidelines.help index 6293057..10cc74c 100644 --- a/help/maintainer_guidelines.help +++ b/help/maintainer_guidelines.help @@ -16,7 +16,7 @@ You are expected to: <ul> <li>Keep the application comments clean, all stale data should be removed</li> <li>Be an active user of that application and version</li> -<li>Keep up-to-date with all Wine releases, if there are regressions they should filed as bugs in <a href="http://bugs.winehq.org">Bugzilla</a> if there are not bugs already filed.</li> +<li>Keep up-to-date with all Wine releases, if there are regressions they should filed as bugs in <a href="//bugs.winehq.org">Bugzilla</a> if there are not bugs already filed.</li> </ul> You will: diff --git a/include/header.php b/include/header.php index 2eeb779..73cafda 100644 --- a/include/header.php +++ b/include/header.php @@ -21,7 +21,7 @@ <link rel="stylesheet" href="<?php echo BASE; ?>apidb.css" type="text/css"> <link rel="stylesheet" href="<?php echo BASE; ?>application.css" type="text/css"> <script type="text/javascript" - src="http://ajax.googleapis.com/ajax/libs/prototype/1.6.0.2/prototype.js"></script> + src="//ajax.googleapis.com/ajax/libs/prototype/1.6.0.2/prototype.js"></script> <script src="<?php echo BASE; ?>scripts.js" type="text/javascript"></script> <link rel="icon" type="image/png" href="<?php echo BASE; ?>images/winehq_logo_16.png"> <link rel="shortcut icon" type="image/png" href="<?php echo BASE; ?>images/winehq_logo_16.png"> @@ -35,22 +35,22 @@ <div id="logo_blurb"><?php echo preg_replace("/^ - /", "", $title); ?></div> <div id="search_box"> - <form action="http://www.winehq.org/search" id="cse-search-box" style="margin: 0; padding: 0;"> + <form action="//www.winehq.org/search" id="cse-search-box" style="margin: 0; padding: 0;"> <input type="hidden" name="cx" value="partner-pub-0971840239976722:w9sqbcsxtyf"> <input type="hidden" name="cof" value="FORID:10"> <input type="hidden" name="ie" value="UTF-8"> <span style="color: #ffffff;">Search:</span> <input type="text" name="q" size="20"> </form> - <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en"></script> + <script type="text/javascript" src="//www.google.com/coop/cse/brand?form=cse-search-box&lang=en"></script> </div> <div id="tabs"> <ul> - <li><a href="http://www.winehq.org/">WineHQ</a></li> + <li><a href="//www.winehq.org/">WineHQ</a></li> <li><a href="http://wiki.winehq.org/">Wiki</a></li> - <li class="s"><a href="http://appdb.winehq.org/">AppDB</a></li> - <li><a href="http://bugs.winehq.org/">Bugzilla</a></li> - <li><a href="http://forums.winehq.org/">Forums</a></li> + <li class="s"><a href="//appdb.winehq.org/">AppDB</a></li> + <li><a href="//bugs.winehq.org/">Bugzilla</a></li> + <li><a href="//forum.winehq.org/">Forums</a></li> </ul> </div> diff --git a/include/testData.php b/include/testData.php index 5b6f1cb..a3413db 100644 --- a/include/testData.php +++ b/include/testData.php @@ -915,7 +915,7 @@ class testData{ echo '<tr><td class=color1><b>Tested release</b></td><td class=color0>',"\n"; echo make_bugzilla_version_list("sTestedRelease", $this->sTestedRelease); // Give the user some information about our available versions - echo "<span>Version not listed? Your Wine is too old, <a href=\"http://winehq.org/download\">upgrade!</a></span>"; + echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span>"; echo '</td></tr>',"\n"; // Installs @@ -1516,7 +1516,7 @@ class testData{ echo "what was working on a particular release of Wine.</p>\n"; echo "<p><b>Please DO NOT include crash or Wine debug output.\n"; echo " Instead report the crash as a bug in the Wine bugzilla at \n"; - echo "<a href=\"http://bugs.winehq.org\">http://bugs.winehq.org</a>.\n"; + echo "<a href=\"//bugs.winehq.org\">bugs.winehq.org</a>.\n"; echo "We ask that you use bugzilla because developers do not monitor the AppDB \n"; echo "for bugs.</b></p>\n"; echo "<p>Please be as detailed as you can but do not paste large \n"; diff --git a/index.php b/index.php index 147045f..5e22008 100644 --- a/index.php +++ b/index.php @@ -163,7 +163,7 @@ echo "<tr>\n"; echo "<td style='padding:10px;'>\n"; echo '<a href="http://getfirefox.com/" title="Get Firefox - Web browsing redefined."><img - src="http://www.mozilla.org/products/firefox/buttons/getfirefox_large2.png" + src="//www.mozilla.org/products/firefox/buttons/getfirefox_large2.png" width="178" height="60" border="0" alt="Get Firefox"></a>'."\n"; echo "</td>\n"; echo "<td style='padding:10px;'>\n"; diff --git a/utils.js b/utils.js index 8d95972..24d5806 100644 --- a/utils.js +++ b/utils.js @@ -14,7 +14,7 @@ function include_dom (script_filename) { } // load and execute jquery IE6 PNG fix -include_dom("jquery.pngfix.js"); +include_dom("/jquery.pngfix.js"); jQuery(function($) { $("img[@src$=png]").pngfix(); /* all img tags with .png extension */ $("#tabs li").pngfix(); /* top tabs li backgrounds */

1 0

Alexandre Julliard : Don' t specify protocol in URLs in order to support https.
by Alexandre Julliard 01 Jun '13

01 Jun '13

Module: bugzilla Branch: master Commit: d842f24757ef84580117fb62090b1dc4f8f969da URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=d842f24757ef84580117f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 1 14:08:57 2013 +0200 Don't specify protocol in URLs in order to support https. --- template/en/default/account/create.html.tmpl | 2 +- .../en/default/bug/create/user-message.html.tmpl | 2 +- template/en/default/bug/edit.html.tmpl | 6 +++--- template/en/default/global/banner.html.tmpl | 12 ++++++------ template/en/default/index.html.tmpl | 6 +++--- template/en/default/list/table.html.tmpl | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl index 1e7130c..6117548 100644 --- a/template/en/default/account/create.html.tmpl +++ b/template/en/default/account/create.html.tmpl @@ -53,7 +53,7 @@ <h4>Remember...</h4> <ul> <li>Avoid posting requests such as, "please fix this, I really need it to work"</li> - <li>Use the <a href="http://forum.winehq.org">forum</a> or <a href="irc://irc.freenode.net/#winehq">IRC channel</a> for troubleshooting advice or general help.</li> + <li>Use the <a href="//forum.winehq.org">forum</a> or <a href="irc://irc.freenode.net/#winehq">IRC channel</a> for troubleshooting advice or general help.</li> <li>Describe the problem's symptoms, not your guesses</li> </ul> diff --git a/template/en/default/bug/create/user-message.html.tmpl b/template/en/default/bug/create/user-message.html.tmpl index 6ae3d66..7daaa6f 100644 --- a/template/en/default/bug/create/user-message.html.tmpl +++ b/template/en/default/bug/create/user-message.html.tmpl @@ -37,4 +37,4 @@ <li><a href="query.cgi">search</a> for the [% terms.bug %] to avoid submitting a duplicate report</li> <li>run a <a href="http://wiki.winehq.org/RegressionTesting">regression test</a> <b>before</b> submitting a bug report about a regression</li> </ul> -<h4>If in doubt - visit the <a href="http://forum.winehq.org">forum</a> or <a href="irc://irc.freenode.net/#winehq">IRC</a> to ask for help.</h4> +<h4>If in doubt - visit the <a href="//forum.winehq.org">forum</a> or <a href="irc://irc.freenode.net/#winehq">IRC</a> to ask for help.</h4> diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 8576189..f218e42 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -331,7 +331,7 @@ <b>AppDB</b>: </td> <td> - <a href="http://appdb.winehq.org/viewbugs.php?bug_id=[% bug.bug_id FILTER html %]">Show + <a href="//appdb.winehq.org/viewbugs.php?bug_id=[% bug.bug_id FILTER html %]">Show Apps affected by this bug</a> </td> </tr> @@ -926,12 +926,12 @@ <tr> [% IF field.name == 'cf_regression_sha1sum' && bug.${field.name} %] [% PROCESS bug/field.html.tmpl value = bug.${field.name} - desc_url = "http://source.winehq.org/git/wine.git/commit/${bug.cf_regression_sha1sum}" + desc_url = "//source.winehq.org/git/wine.git/commit/${bug.cf_regression_sha1sum}" editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] [% ELSIF field.name == 'cf_fixedby_sha1sum' && bug.${field.name} %] [% PROCESS bug/field.html.tmpl value = bug.${field.name} - desc_url = "http://source.winehq.org/git/wine.git/commit/${bug.cf_fixedby_sha1sum}" + desc_url = "//source.winehq.org/git/wine.git/commit/${bug.cf_fixedby_sha1sum}" editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] [% ELSE %] diff --git a/template/en/default/global/banner.html.tmpl b/template/en/default/global/banner.html.tmpl index 5f6f29b..7b41aff 100644 --- a/template/en/default/global/banner.html.tmpl +++ b/template/en/default/global/banner.html.tmpl @@ -33,22 +33,22 @@ </div> <div id="search_box"> - <form action="http://www.winehq.org/search" id="cse-search-box" style="margin: 0; padding: 0;"> + <form action="//www.winehq.org/search" id="cse-search-box" style="margin: 0; padding: 0;"> <input type="hidden" name="cx" value="partner-pub-0971840239976722:w9sqbcsxtyf"> <input type="hidden" name="cof" value="FORID:10"> <input type="hidden" name="ie" value="UTF-8"> <span style="color: #ffffff;">Search:</span> <input type="text" name="q" size="20"> </form> - <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en"></script> + <script type="text/javascript" src="//www.google.com/coop/cse/brand?form=cse-search-box&lang=en"></script> </div> <div id="tabs"> <ul> - <li><a href="http://www.winehq.org/">WineHQ</a></li> + <li><a href="//www.winehq.org/">WineHQ</a></li> <li><a href="http://wiki.winehq.org/">Wiki</a></li> - <li><a href="http://appdb.winehq.org/">AppDB</a></li> - <li class="s"><a href="http://bugs.winehq.org/">Bugzilla</a></li> - <li><a href="http://forums.winehq.org/">Forums</a></li> + <li><a href="//appdb.winehq.org/">AppDB</a></li> + <li class="s"><a href="//bugs.winehq.org/">Bugzilla</a></li> + <li><a href="//forum.winehq.org/">Forums</a></li> </ul> </div> diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 88b535e..da520e7 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -186,15 +186,15 @@ YAHOO.util.Event.onDOMReady(onLoadActions); <p>The bugs we are currently working on are organized into Task lists.</p> <ol class="wine_index_list"> - <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NE…">Wine 1.6</a><br> + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.6.0&order=bugs.bug_severity">Wine 1.6</a><br> These bugs are scheduled to be fixed before Wine 1.6 is released. </li> - <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NE…">Regressions</a><br> + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords=regression&keywords_type=anywords">Regressions</a><br> Bugs introduced as result of a regression. </li> - <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NE…">With download</a><br> + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords">With download</a><br> Bugs in downloadable Applications. </li> diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index be4aca6..db5e3af 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -212,10 +212,10 @@ [%- bug.$column.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%] </a> [% ELSIF column == 'cf_regression_sha1sum' && bug.cf_regression_sha1sum %] - <a href="http://source.winehq.org/git/wine.git/commit/[% bug.cf_regression_sha1sum FILTER html %]"> + <a href="//source.winehq.org/git/wine.git/commit/[% bug.cf_regression_sha1sum FILTER html %]"> [% bug.cf_regression_sha1sum.truncate(16) FILTER html %]</a> [% ELSIF column == 'cf_fixedby_sha1sum' && bug.cf_fixedby_sha1sum %] - <a href="http://source.winehq.org/git/wine.git/commit/[% bug.cf_fixedby_sha1sum FILTER html %]"> + <a href="//source.winehq.org/git/wine.git/commit/[% bug.cf_fixedby_sha1sum FILTER html %]"> [% bug.cf_fixedby_sha1sum.truncate(16) FILTER html %]</a> [% ELSE %] [%- display_value(column, bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2013