June 2013 - Wine-commits - list.winehq.org

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

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

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

Akihiro Sagawa : kernel32: Add more GlobalReAlloc/LocalReAlloc tests.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 1451aa58a61580e59aea6a44854be9d00e574145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1451aa58a61580e59aea6a448… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 1 22:01:35 2013 +0900 kernel32: Add more GlobalReAlloc/LocalReAlloc tests. --- dlls/kernel32/tests/heap.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 634e14d..866abb8 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -86,6 +86,7 @@ static void test_heap(void) HGLOBAL gbl; HGLOBAL hsecond; SIZE_T size, size2; + const SIZE_T max_size = 1024, init_size = 10; /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); @@ -245,6 +246,36 @@ static void test_heap(void) "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } + /* GMEM_FIXED block expands in place only without flags */ + for (size = 1; size <= max_size; size <<= 1) { + gbl = GlobalAlloc(GMEM_FIXED, init_size); + SetLastError(MAGIC_DEAD); + hsecond = GlobalReAlloc(gbl, size + init_size, 0); + if (hsecond != gbl) { + todo_wine + ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + GlobalFree(hsecond); + } + else { + ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + GlobalFree(gbl); + } + } + + /* GMEM_FIXED block can be relocated with GMEM_MOVEABLE */ + for (size = 1; size <= max_size; size <<= 1) { + gbl = GlobalAlloc(GMEM_FIXED, init_size); + SetLastError(MAGIC_DEAD); + hsecond = GlobalReAlloc(gbl, size + init_size, GMEM_MOVEABLE); + ok(hsecond != NULL, + "got %p with %x (expected non-NULL) @%ld\n", hsecond, GetLastError(), size); + mem = GlobalLock(hsecond); + ok(mem == hsecond, "got %p (expected %p) @%ld\n", mem, hsecond, size); + GlobalFree(hsecond); + } + gbl = GlobalAlloc(GMEM_DDESHARE, 100); res = GlobalUnlock(gbl); @@ -382,6 +413,36 @@ static void test_heap(void) "returned %d with %d (expected '0' with ERROR_INVALID_HANDLE)\n", res, GetLastError()); + /* LMEM_FIXED block expands in place only without flags */ + for (size = 1; size <= max_size; size <<= 1) { + gbl = LocalAlloc(LMEM_FIXED, init_size); + SetLastError(MAGIC_DEAD); + hsecond = LocalReAlloc(gbl, size + init_size, 0); + if (hsecond != gbl) { + todo_wine + ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + LocalFree(hsecond); + } + else { + ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + LocalFree(gbl); + } + } + + /* LMEM_FIXED memory can be relocated with LMEM_MOVEABLE */ + for (size = 1; size <= max_size; size <<= 1) { + gbl = LocalAlloc(LMEM_FIXED, init_size); + SetLastError(MAGIC_DEAD); + hsecond = LocalReAlloc(gbl, size + init_size, LMEM_MOVEABLE); + ok(hsecond != NULL, + "got %p with %x (expected non-NULL) @%ld\n", hsecond, GetLastError(), size); + mem = LocalLock(hsecond); + ok(mem == hsecond, "got %p (expected %p) @%ld\n", mem, hsecond, size); + LocalFree(hsecond); + } + /* trying to unlock pointer from LocalAlloc */ gbl = LocalAlloc(LMEM_FIXED, 100); SetLastError(0xdeadbeef);

1 0

Akihiro Sagawa : ole32: Use LMEM_MOVEABLE when reallocating memory.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 884ead472b0333aabd8597b02d554b14bcd5bff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=884ead472b0333aabd8597b02… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 1 22:01:37 2013 +0900 ole32: Use LMEM_MOVEABLE when reallocating memory. --- dlls/ole32/ifs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 2e70e44..8ec6bd8 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -78,7 +78,7 @@ static int SetSpyedBlockTableLength ( DWORD NewLength ) LPVOID *NewSpyedBlocks; if (!Malloc32.SpyedBlocks) NewSpyedBlocks = LocalAlloc(LMEM_ZEROINIT, NewLength * sizeof(PVOID)); - else NewSpyedBlocks = LocalReAlloc(Malloc32.SpyedBlocks, NewLength * sizeof(PVOID), LMEM_ZEROINIT); + else NewSpyedBlocks = LocalReAlloc(Malloc32.SpyedBlocks, NewLength * sizeof(PVOID), LMEM_ZEROINIT | LMEM_MOVEABLE); if (NewSpyedBlocks) { Malloc32.SpyedBlocks = NewSpyedBlocks; Malloc32.SpyedBlockTableLength = NewLength;

1 0

Akihiro Sagawa : progman: Use LMEM_MOVEABLE when reallocating memory.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 4874b806f3c77e629f615d1fd048d6b2f739c429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4874b806f3c77e629f615d1fd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 1 22:01:39 2013 +0900 progman: Use LMEM_MOVEABLE when reallocating memory. --- programs/progman/grpfile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index 12d90ae..d49dde3 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -122,7 +122,7 @@ static BOOL GRPFILE_ReadFileToBuffer(LPCSTR path, HLOCAL *phBuffer, { size += len; hNewBuffer = LocalReAlloc(hBuffer, size + MALLOCHUNK + 1, - LMEM_FIXED); + LMEM_MOVEABLE); if (!hNewBuffer) { LocalFree(hBuffer);

1 0

Akihiro Sagawa : kernel32: Don't move fixed memory area in GlobalReAlloc.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 9ab603b0333dceb2373e78afceb0bf3d4b4bb502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab603b0333dceb2373e78afc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 1 22:01:41 2013 +0900 kernel32: Don't move fixed memory area in GlobalReAlloc. --- dlls/kernel32/heap.c | 2 ++ dlls/kernel32/tests/heap.c | 28 ++++++---------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index e0b86e5..51bd235 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -646,6 +646,8 @@ HGLOBAL WINAPI GlobalReAlloc( if(ISPOINTER(hmem)) { /* reallocate fixed memory */ + if (!(flags & GMEM_MOVEABLE)) + heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; hnew=HeapReAlloc(GetProcessHeap(), heap_flags, hmem, size); } else diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 866abb8..e36336c 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -251,17 +251,9 @@ static void test_heap(void) gbl = GlobalAlloc(GMEM_FIXED, init_size); SetLastError(MAGIC_DEAD); hsecond = GlobalReAlloc(gbl, size + init_size, 0); - if (hsecond != gbl) { - todo_wine - ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), - "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); - GlobalFree(hsecond); - } - else { - ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), - "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); - GlobalFree(gbl); - } + ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + GlobalFree(gbl); } /* GMEM_FIXED block can be relocated with GMEM_MOVEABLE */ @@ -418,17 +410,9 @@ static void test_heap(void) gbl = LocalAlloc(LMEM_FIXED, init_size); SetLastError(MAGIC_DEAD); hsecond = LocalReAlloc(gbl, size + init_size, 0); - if (hsecond != gbl) { - todo_wine - ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), - "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); - LocalFree(hsecond); - } - else { - ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), - "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); - LocalFree(gbl); - } + ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + LocalFree(gbl); } /* LMEM_FIXED memory can be relocated with LMEM_MOVEABLE */

1 0

Henri Verbeet : wined3d: Allow 32 bpc UINT formats in vertex declarations.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 51bbfa5ced84fccf4a0f2e0ec5b10865ca0087ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bbfa5ced84fccf4a0f2e0ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 09:19:33 2013 +0200 wined3d: Allow 32 bpc UINT formats in vertex declarations. --- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/utils.c | 9 ++++++++- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d2fd22c..91e5d1f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4692,6 +4692,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) position_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_func; position_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_func; position_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_func; + position_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_func; diffuse_funcs[WINED3D_FFP_EMIT_FLOAT1] = invalid_func; diffuse_funcs[WINED3D_FFP_EMIT_FLOAT2] = invalid_func; @@ -4710,6 +4711,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) diffuse_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_func; diffuse_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_func; diffuse_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_func; + diffuse_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_func; /* No 4 component entry points here */ specular_funcs[WINED3D_FFP_EMIT_FLOAT1] = invalid_func; @@ -4744,6 +4746,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) specular_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_func; specular_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_func; specular_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_func; + specular_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_func; /* Only 3 component entry points here. Test how others behave. Float4 normals are used * by one of our tests, trying to pass it to the pixel shader, which fails on Windows. @@ -4765,6 +4768,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) normal_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_func; normal_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_func; normal_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_func; + normal_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_func; multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT1] = (glMultiTexCoordFunc)GL_EXTCALL(glMultiTexCoord1fvARB); multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT2] = (glMultiTexCoordFunc)GL_EXTCALL(glMultiTexCoord2fvARB); @@ -4790,6 +4794,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_texcoord_func; multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_texcoord_func; } + multi_texcoord_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_texcoord_func; } static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8f27e61..7c4f188 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -120,6 +120,9 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_VERTEXDATA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_R16_UINT, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_R32_UINT, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, + {WINED3DFMT_R32G32_UINT, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, + {WINED3DFMT_R32G32B32_UINT, 32, 32, 32, 0, 0, 32, 64, 0, 12, 0, 0}, + {WINED3DFMT_R32G32B32A32_UINT, 32, 32, 32, 32, 0, 32, 64, 96, 16, 0, 0}, {WINED3DFMT_R16G16B16A16_SNORM, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, /* Vendor-specific formats */ {WINED3DFMT_ATI2N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -218,7 +221,11 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R10G10B10A2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT, 3, GL_FALSE, sizeof(short int)}, {WINED3DFMT_R10G10B10A2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, 3, GL_TRUE, sizeof(short int)}, {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_FLOAT, 2, GL_FALSE, sizeof(GLhalfNV)}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_FLOAT, 4, GL_FALSE, sizeof(GLhalfNV)} + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_FLOAT, 4, GL_FALSE, sizeof(GLhalfNV)}, + {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT, 1, GL_FALSE, sizeof(UINT)}, + {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT, 2, GL_FALSE, sizeof(UINT)}, + {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, 3, GL_FALSE, sizeof(UINT)}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT, 4, GL_FALSE, sizeof(UINT)}, }; struct wined3d_format_texture_info diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c088eb..7a4633b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -901,7 +901,8 @@ enum wined3d_ffp_emit_idx WINED3D_FFP_EMIT_DEC3N = 14, WINED3D_FFP_EMIT_FLOAT16_2 = 15, WINED3D_FFP_EMIT_FLOAT16_4 = 16, - WINED3D_FFP_EMIT_COUNT = 17 + WINED3D_FFP_EMIT_INVALID = 17, + WINED3D_FFP_EMIT_COUNT = 18 }; struct wined3d_bo_address

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(a)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