November 2016 - Wine-Commits

Akihiro Sagawa : strmbase: Add null pointer checks to BaseControlVideoImpls.
by Alexandre Julliard Nov. 21, 2016

Nov. 21, 2016

Module: wine Branch: master Commit: 0638213243d0799734a75c182a81f886257d0970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0638213243d0799734a75c182… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Nov 20 15:33:21 2016 +0900 strmbase: Add null pointer checks to BaseControlVideoImpls. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/video.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index ec3a076..be65886 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -95,6 +95,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_AvgTimePerFrame(IBasicVideo *iface, REFT VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); + if (!pAvgTimePerFrame) + return E_POINTER; if (!This->pPin->pConnectedTo) return VFW_E_NOT_CONNECTED; @@ -112,6 +114,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_BitRate(IBasicVideo *iface, LONG *pBitRa TRACE("(%p/%p)->(%p)\n", This, iface, pBitRate); + if (!pBitRate) + return E_POINTER; if (!This->pPin->pConnectedTo) return VFW_E_NOT_CONNECTED; @@ -127,6 +131,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_BitErrorRate(IBasicVideo *iface, LONG *p TRACE("(%p/%p)->(%p)\n", This, iface, pBitErrorRate); + if (!pBitErrorRate) + return E_POINTER; if (!This->pPin->pConnectedTo) return VFW_E_NOT_CONNECTED; @@ -141,6 +147,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_VideoWidth(IBasicVideo *iface, LONG *pVi BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoWidth); + if (!pVideoWidth) + return E_POINTER; vih = This->pFuncsTable->pfnGetVideoFormat(This); *pVideoWidth = vih->bmiHeader.biWidth; @@ -154,6 +162,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_VideoHeight(IBasicVideo *iface, LONG *pV BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoHeight); + if (!pVideoHeight) + return E_POINTER; vih = This->pFuncsTable->pfnGetVideoFormat(This); *pVideoHeight = abs(vih->bmiHeader.biHeight); @@ -180,6 +190,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_SourceLeft(IBasicVideo *iface, LONG *pSo BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceLeft); + if (!pSourceLeft) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pSourceLeft = SourceRect.left; @@ -205,6 +217,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_SourceWidth(IBasicVideo *iface, LONG *pS BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceWidth); + if (!pSourceWidth) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pSourceWidth = SourceRect.right - SourceRect.left; @@ -230,6 +244,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_SourceTop(IBasicVideo *iface, LONG *pSou BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceTop); + if (!pSourceTop) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pSourceTop = SourceRect.top; @@ -255,6 +271,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_SourceHeight(IBasicVideo *iface, LONG *p BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceHeight); + if (!pSourceHeight) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pSourceHeight = SourceRect.bottom - SourceRect.top; @@ -281,6 +299,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationLeft(IBasicVideo *iface, LONG BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationLeft); + if (!pDestinationLeft) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pDestinationLeft = DestRect.left; @@ -306,6 +326,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationWidth(IBasicVideo *iface, LON BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationWidth); + if (!pDestinationWidth) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pDestinationWidth = DestRect.right - DestRect.left; @@ -331,6 +353,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationTop(IBasicVideo *iface, LONG BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationTop); + if (!pDestinationTop) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pDestinationTop = DestRect.top; @@ -356,6 +380,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationHeight(IBasicVideo *iface, LO BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationHeight); + if (!pDestinationHeight) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pDestinationHeight = DestRect.right - DestRect.left; @@ -381,6 +407,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetSourcePosition(IBasicVideo *iface, LONG * BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p, %p, %p, %p)\n", This, iface, pLeft, pTop, pWidth, pHeight); + if (!pLeft || !pTop || !pWidth || !pHeight) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pLeft = SourceRect.left; @@ -418,6 +446,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetDestinationPosition(IBasicVideo *iface, L BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p, %p, %p, %p)\n", This, iface, pLeft, pTop, pWidth, pHeight); + if (!pLeft || !pTop || !pWidth || !pHeight) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pLeft = DestRect.left; @@ -442,6 +472,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetVideoSize(IBasicVideo *iface, LONG *pWidt BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p, %p)\n", This, iface, pWidth, pHeight); + if (!pWidth || !pHeight) + return E_POINTER; vih = This->pFuncsTable->pfnGetVideoFormat(This); *pHeight = vih->bmiHeader.biHeight; @@ -455,6 +487,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetVideoPaletteEntries(IBasicVideo *iface, L BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%d, %d, %p, %p)\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); + if (!pRetrieved || !pPalette) + return E_POINTER; if (pRetrieved) *pRetrieved = 0; @@ -464,6 +498,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetVideoPaletteEntries(IBasicVideo *iface, L HRESULT WINAPI BaseControlVideoImpl_GetCurrentImage(IBasicVideo *iface, LONG *pBufferSize, LONG *pDIBImage) { BaseControlVideo *This = impl_from_IBasicVideo(iface); + if (!pBufferSize || !pDIBImage) + return E_POINTER; return This->pFuncsTable->pfnGetStaticImage(This, pBufferSize, pDIBImage); }

1 0

Fabian Maurer : dmloader: Better error reporting in IDirectMusicLoaderImpl_SetObject.
by Alexandre Julliard Nov. 21, 2016

Nov. 21, 2016

Module: wine Branch: master Commit: ca0f6c0d51c2fe2909a3c40c4491c79f64eb21a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0f6c0d51c2fe2909a3c40c4… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Nov 21 00:31:01 2016 +0100 dmloader: Better error reporting in IDirectMusicLoaderImpl_SetObject. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 967b093..0822891 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -422,7 +422,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* attach stream */ hr = IDirectMusicLoaderFileStream_Attach (pStream, wszFileName, iface); if (FAILED(hr)) { - ERR(": could not attach stream to file\n"); + ERR(": could not attach stream to file %s, make sure it exists\n", debugstr_w(wszFileName)); IStream_Release (pStream); return DMUS_E_LOADER_FAILEDOPEN; }

1 0

Carlos Garnacho : winex11: Always use the client pointer for raw events.
by Alexandre Julliard Nov. 21, 2016

Nov. 21, 2016

Module: wine Branch: master Commit: 64c27d62b528a72924499c7c587c0780882ccff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c27d62b528a72924499c7c5… Author: Carlos Garnacho <carlosg(a)gnome.org> Date: Fri Nov 18 12:43:18 2016 +0100 winex11: Always use the client pointer for raw events. Use XI2's client pointer, it will be the master pointer affected by X core calls, and even if it doesn't currently have relative X/Y capabilities, it will gain those as soon as a slave device with such capabilities is used. Signed-off-by: Carlos Garnacho <carlosg(a)gnome.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index a120fae..186899f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -132,6 +132,7 @@ static Cursor create_cursor( HANDLE handle ); static BOOL xinput2_available; static BOOL broken_rawevents; #define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(XIGetClientPointer); MAKE_FUNCPTR(XIFreeDeviceInfo); MAKE_FUNCPTR(XIQueryDevice); MAKE_FUNCPTR(XIQueryVersion); @@ -255,7 +256,7 @@ static void enable_xinput2(void) XIEventMask mask; XIDeviceInfo *devices; unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; - int i, j, count; + int i; if (!xinput2_available) return; @@ -272,29 +273,8 @@ static void enable_xinput2(void) if (data->xi2_state == xi_unavailable) return; if (data->xi2_devices) pXIFreeDeviceInfo( data->xi2_devices ); + if (!pXIGetClientPointer( data->display, None, &data->xi2_core_pointer )) return; data->xi2_devices = devices = pXIQueryDevice( data->display, XIAllDevices, &data->xi2_device_count ); - for (i = 0; i < data->xi2_device_count; ++i) - { - if (devices[i].use != XIMasterPointer) continue; - for (j = count = 0; j < devices[i].num_classes; j++) - { - XIValuatorClassInfo *class = (XIValuatorClassInfo *)devices[i].classes[j]; - - if (devices[i].classes[j]->type != XIValuatorClass) continue; - TRACE( "Device %u (%s) num %u %f,%f res %u mode %u label %s\n", - devices[i].deviceid, debugstr_a(devices[i].name), - class->number, class->min, class->max, class->resolution, class->mode, - XGetAtomName( data->display, class->label )); - if (class->label == x11drv_atom( Rel_X ) || class->label == x11drv_atom( Rel_Y )) count++; - /* workaround for drivers that don't provide labels */ - if (!class->label && class->number <= 1 && class->mode == XIModeRelative) count++; - } - if (count < 2) continue; - TRACE( "Using %u (%s) as core pointer\n", - devices[i].deviceid, debugstr_a(devices[i].name) ); - data->xi2_core_pointer = devices[i].deviceid; - break; - } mask.mask = mask_bits; mask.mask_len = sizeof(mask_bits); @@ -1729,6 +1709,7 @@ void X11DRV_XInput2_Init(void) return; \ } + LOAD_FUNCPTR(XIGetClientPointer); LOAD_FUNCPTR(XIFreeDeviceInfo); LOAD_FUNCPTR(XIQueryDevice); LOAD_FUNCPTR(XIQueryVersion);

1 0

Daniel Lehman : opengl32: Set last error on invalid share in wglCreateContextAttribsARB.
by Alexandre Julliard Nov. 21, 2016

Nov. 21, 2016

Module: wine Branch: master Commit: 37ee3870a2f94d3960d989dd0cc454b8e1ec7aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ee3870a2f94d3960d989dd0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Nov 19 08:07:14 2016 -0800 opengl32: Set last error on invalid share in wglCreateContextAttribsARB. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 5 +++-- dlls/opengl32/wgl.c | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 5a0e786..7552d44 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -898,12 +898,13 @@ static void test_opengl3(HDC hdc) { HGLRC gl3Ctx; DWORD error; + SetLastError(0xdeadbeef); gl3Ctx = pwglCreateContextAttribsARB(hdc, (HGLRC)0xdeadbeef, 0); ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); error = GetLastError(); /* The Nvidia implementation seems to return hresults instead of win32 error codes */ - todo_wine ok(error == ERROR_INVALID_OPERATION || - error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); + ok(error == ERROR_INVALID_OPERATION || + error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); wglDeleteContext(gl3Ctx); } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 8e61348..863dea2 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -280,7 +280,11 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib return 0; } if (!funcs->ext.p_wglCreateContextAttribsARB) return 0; - if (share && !(share_ptr = get_handle_ptr( share, HANDLE_CONTEXT ))) return 0; + if (share && !(share_ptr = get_handle_ptr( share, HANDLE_CONTEXT ))) + { + SetLastError( ERROR_INVALID_OPERATION ); + return 0; + } if ((drv_ctx = funcs->ext.p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->u.context->drv_ctx : NULL, attribs ))) {

1 0

Daniel Lehman : opengl32: Set last error on invalid hdc to wglCreateContextAttribsARB.
by Alexandre Julliard Nov. 21, 2016

Nov. 21, 2016

Module: wine Branch: master Commit: ed4271fae953732d262357aa99a7dd8d673aede0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4271fae953732d262357aa9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Nov 19 08:07:13 2016 -0800 opengl32: Set last error on invalid hdc to wglCreateContextAttribsARB. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 7 ++++--- dlls/opengl32/wgl.c | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 3f203ab..5a0e786 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -884,12 +884,13 @@ static void test_opengl3(HDC hdc) { HGLRC gl3Ctx; DWORD error; + SetLastError(0xdeadbeef); gl3Ctx = pwglCreateContextAttribsARB((HDC)0xdeadbeef, 0, 0); ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid HDC passed\n"); error = GetLastError(); - todo_wine ok(error == ERROR_DC_NOT_FOUND || - broken(error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_DATA)), /* Nvidia Vista + Win7 */ - "Expected ERROR_DC_NOT_FOUND, got error=%x\n", error); + ok(error == ERROR_DC_NOT_FOUND || + broken(error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_DATA)), /* Nvidia Vista + Win7 */ + "Expected ERROR_DC_NOT_FOUND, got error=%x\n", error); wglDeleteContext(gl3Ctx); } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 932b217..8e61348 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -274,7 +274,12 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib struct opengl_context *context; struct opengl_funcs *funcs = get_dc_funcs( hdc ); - if (!funcs || !funcs->ext.p_wglCreateContextAttribsARB) return 0; + if (!funcs) + { + SetLastError( ERROR_DC_NOT_FOUND ); + return 0; + } + if (!funcs->ext.p_wglCreateContextAttribsARB) return 0; if (share && !(share_ptr = get_handle_ptr( share, HANDLE_CONTEXT ))) return 0; if ((drv_ctx = funcs->ext.p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->u.context->drv_ctx : NULL, attribs )))

1 0

Jeremy Newman : reformat screenshots
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: b0efea10f49b7da27d90c9e4b89168e6ef0bb634 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b0efea10f49b7da27d90c9e4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 15:35:53 2016 -0600 reformat screenshots * do not use a popup window, use jquery dialog * remove .gif, use font awesome icon * write the beginnings of a screenshot viewer (needs work) --- images/xmag_32.png | Bin 1964 -> 0 bytes include/screenshot.php | 122 ++++++++++++++----------------------------------- screenshots.php | 2 +- styles.css | 24 +++++++++- utils.js | 16 ++++++- 5 files changed, 73 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=b0efea10f49b7da27d90…

1 0

Jeremy Newman : remove openWin, no longer used
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 4453a761313826324432953a655a3a40a57fb271 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4453a761313826324432953a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 15:38:31 2016 -0600 remove openWin, no longer used --- utils.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/utils.js b/utils.js index 61f0fb8..204428e 100644 --- a/utils.js +++ b/utils.js @@ -62,7 +62,6 @@ $(document).ready(function() $(this).addClass('cursor-pointer'); $(this).click(function(e) { - document.location = sURL; }); }); @@ -109,20 +108,4 @@ $.fn.toggleClick = function(){ }); }; -// open Window (FIXME: replace with an inline screenshot viewer) -function openWin(fileToOpen,nameOfWindow,width,height) { - myWindow = window.open("",nameOfWindow,"menubar=no,scrollbars=yes,status=no,width="+width+",height="+height); - myWindow.document.open(); - myWindow.document.write('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">'); - myWindow.document.write('<html><head><title>Screenshot Viewer</title>') - myWindow.document.write('<style type="text/css">'); - myWindow.document.write('body { margin: 0; padding: 0; background-color: lightgrey; }'); - myWindow.document.write('img { border: 0; }'); - myWindow.document.write('p { display: inline; }'); - myWindow.document.write('</style></head><body>'); - myWindow.document.write('<a onclick="self.close();" href=""><img src="'+ fileToOpen +'" alt="Screenshot"></a>'); - myWindow.document.write('</body></html>'); - myWindow.document.close(); -} - // done \ No newline at end of file

1 0

Jeremy Newman : remove more unused functions
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 61f8d5424d45216d83c63968cfab0ae33ed2ff0b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=61f8d5424d45216d83c63968… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 14:00:47 2016 -0600 remove more unused functions Based on a patch from: "Andre Hentschel" <nerv(a)dawncrow.de> --- include/html.php | 78 -------------------------------------------------------- 1 file changed, 78 deletions(-) diff --git a/include/html.php b/include/html.php index 20b359c..943e879 100644 --- a/include/html.php +++ b/include/html.php @@ -109,7 +109,6 @@ function html_frame_end($text = "") return "</div>\n"; } - function html_select($name, $values, $default = null, $descs = null) { $str = "<select name='$name'>\n"; @@ -138,51 +137,6 @@ function html_back_link($howmany = 1, $url = "") return ' <a href="'.htmlentities($url).'" class="btn btn-default"><i class="fa fa-arrow-left"></i> Back</a> '."\n"; } - -function p() -{ - return "\n<p> </p>\n"; -} - -function add_br($text = "") -{ - $text = str_replace("\n","<br>\n",$text); - return $text; -} - -function make_dll_option_list($varname, $dllid = -1) -{ - $db = new ApiDB(); - - echo "<select name='$varname'>\n"; - //echo "<option value='ALL'>ALL\n"; - $list = $db->get_dll_names(); - while(list($name, $id) = each($list)) - { - if($dllid == $id) - echo "<option value=$id selected>$name ($id)\n"; - else - echo "<option value=$id>$name ($id)\n"; - } - echo "</select>\n"; -} - - -function make_inx_option_list($varname, $inx = null) -{ - $list = array("yes", "no", "stub", "unknown"); - echo "<select name='$varname'>\n"; - while(list($idx, $value) = each($list)) - { - if($value == $inx) - echo "<option value=$value selected>$value\n"; - else - echo "<option value=$value>$value\n"; - } - echo "</select>\n"; - -} - /* Displays a note box using bootstrap panel */ /* mode: default, primary, success, info, warning, danger */ function html_note($heading = '', $body = '', $footer = '', $mode = 'default') @@ -214,36 +168,4 @@ function html_radiobuttons($aIds, $aOptions, $sName, $sDefault = '', $bLineBreak return $shRet; } -function html_checkbox($sName, $sValue, $shText, $bChecked) -{ - if($bChecked) - $sSelected = ' checked="checked"'; - else - $sSelected = ''; - - return "<input type=\"checkbox\" name=\"$sName\" value=\"$sValue\"$sSelected /> $shText\n"; -} - -function html_checkboxes($sName, $aValues, $aTexts, $aSelected) -{ - $shRet = ''; - - for($i = 0; $i < sizeof($aValues); $i++) - $shRet .= html_checkbox($sName.$i, $aValues[$i], $aTexts[$i], $aSelected[$i]).'<br />'; - - return $shRet; -} - -function html_read_input_series($sName, $aInput, $iCount) -{ - $aRet = array(); - - for($i = 0; $i < $iCount; $i++) - { - $aRet[] = getInput($sName.$i, $aInput); - } - - return $aRet; -} - ?>

1 0

Jeremy Newman : update default bug and main website urls
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 5fd113cf9148109f82df50f900329ba9f63adfb6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5fd113cf9148109f82df50f9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 13:53:52 2016 -0600 update default bug and main website urls No, we are not going to drop the http syntax for // Emails also use these vars, and the website is always https now, so use the default of https:// --- include/config.php.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/config.php.sample b/include/config.php.sample index 303f278..53cba20 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -15,10 +15,10 @@ define("APPDB_SCREENSHOT_MAXWIDTH","1024"); // width of the screenshot's thumbna define("APPDB_SCREENSHOT_MAXHEIGHT","768"); // height of the screenshot's thumbnails define("APPDB_ROOT", "http://localhost/appdb/"); // path to AppDB define("APPDB_OWNER","WineHQ"); // with what product/company is this AppDB related ? -define("APPDB_OWNER_URL","http://www.winehq.org/"); // website of this product/company +define("APPDB_OWNER_URL","https://www.winehq.org/"); // website of this product/company define("APPDB_OWNER_EMAIL","appdb(a)winehq.org"); // e-mail of this product/company define("APPDB_SENDER_EMAIL","appdb-noreply(a)winehq.org"); // The e-mail address which appears as the sender in mails sent by the AppDB -define("BUGZILLA_ROOT","http://bugs.winehq.org/"); // path to bugzilla +define("BUGZILLA_ROOT","https://bugs.winehq.org/"); // path to bugzilla // AppDB developers: Use this define to disable email from being sent from the appdb during testing //if(!defined("DISABLE_EMAIL"))

1 0

Jeremy Newman : tweaks
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 0c715580706e9a27ffbd14beaf99176cb143bc6f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0c715580706e9a27ffbd14be… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 13:23:40 2016 -0600 tweaks --- votestats.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/votestats.php b/votestats.php index 938ff5a..fee042b 100644 --- a/votestats.php +++ b/votestats.php @@ -69,6 +69,7 @@ if(!empty($aClean['iCategoryId'])) /*******************************************************************/ /* add options for all of the categories that we are recursed into */ +echo "<br>\n"; echo "<b>Section:</b>"; echo '<select name="iCategoryId" class="form-control form-control-inline">'; @@ -116,8 +117,9 @@ if($subs) echo stripslashes($oSubcat->sName); } } -echo '</select>'; -echo ' <input type="submit" value="Refresh" class="btn btn-default">'; +echo "</select>\n"; +echo "<br>\n"; +echo '<button type="submit" class="btn btn-default"><i class="fa fa-refresh"></i> Refresh</button>'; echo '</form>'; /***************************************************/ @@ -164,7 +166,6 @@ if($hResult) echo html_frame_start(); $oTable = new Table(); - $oTable->setWidth("100%"); $oTable->SetClass("whq-table"); $oTableRow = new TableRow();

1 0