February 2017 - Wine-Commits

Michael Müller : msvideo.dll16: Check if any 16 bit thunks have been allocated before accessing pointer.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: ea7cc6fc553ba25fe8acfc6d5a694c54cdbf9c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7cc6fc553ba25fe8acfc6d5… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 3 09:36:45 2017 +0100 msvideo.dll16: Check if any 16 bit thunks have been allocated before accessing pointer. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvideo.dll16/msvideo16.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 28f126c..d390020 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -771,6 +771,9 @@ static struct msvideo_thunk* MSVIDEO_HasThunk(HIC16 hic) { struct msvideo_thunk* thunk; + if (!MSVIDEO_Thunks) + return NULL; + for (thunk = MSVIDEO_Thunks; thunk < &MSVIDEO_Thunks[MAX_THUNKS]; thunk++) { if (thunk->hIC16 == hic) return thunk;

1 0

Ken Thomases : winemac: Reattach OpenGL contexts to a view after it has been hidden and unhidden.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: 2128125cbfe2893e65b1093b583b15084261f265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2128125cbfe2893e65b1093b5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 2 15:16:27 2017 -0600 winemac: Reattach OpenGL contexts to a view after it has been hidden and unhidden. Hiding a view seems to semi-detach any attached OpenGL contexts such that rendering no longer works. There's no GL surface for the view. Calling -[NSOpenGLContext update] is not sufficient to reattach the context. So, fully detach the contexts and reattach them. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.h | 2 ++ dlls/winemac.drv/cocoa_opengl.m | 15 +++++++++++++-- dlls/winemac.drv/cocoa_window.m | 35 ++++++++++++++++++++++++++++------- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.h b/dlls/winemac.drv/cocoa_opengl.h index e7e1686..bcd257f 100644 --- a/dlls/winemac.drv/cocoa_opengl.h +++ b/dlls/winemac.drv/cocoa_opengl.h @@ -25,12 +25,14 @@ { NSView* latentView; BOOL needsUpdate; + BOOL needsReattach; BOOL shouldClearToBlack; GLint backing_size[2]; } @property BOOL needsUpdate; +(a)property BOOL needsReattach; @property BOOL shouldClearToBlack; @end diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index debeb78..5a097a1 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -35,7 +35,7 @@ @implementation WineOpenGLContext -(a)synthesize latentView, needsUpdate, shouldClearToBlack; +(a)synthesize latentView, needsUpdate, needsReattach, shouldClearToBlack; - (void) dealloc { @@ -215,6 +215,7 @@ [self setLatentView:nil]; } needsUpdate = FALSE; + needsReattach = FALSE; } @end @@ -279,6 +280,7 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v, CGRect if (context.needsUpdate) { context.needsUpdate = FALSE; + context.needsReattach = FALSE; if (context.view) [context setView:[[context class] dummyView]]; [context wine_updateBackingSize:&r.size]; @@ -328,7 +330,9 @@ void macdrv_update_opengl_context(macdrv_opengl_context c) if (context.needsUpdate) { + BOOL reattach = context.needsReattach; context.needsUpdate = FALSE; + context.needsReattach = FALSE; if (context.latentView) { [context setView:context.latentView]; @@ -339,7 +343,14 @@ void macdrv_update_opengl_context(macdrv_opengl_context c) } else { - [context update]; + if (reattach) + { + NSView* view = [[context.view retain] autorelease]; + [context clearDrawableLeavingSurfaceOnScreen]; + context.view = view; + } + else + [context update]; [context resetSurfaceIfBackingSizeChanged]; } } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 57587d9..118bf3c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -500,10 +500,19 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [(WineWindow*)[self window] updateForGLSubviews]; } - - (void) updateGLContexts + - (void) updateGLContexts:(BOOL)reattach { for (WineOpenGLContext* context in glContexts) + { context.needsUpdate = TRUE; + if (reattach) + context.needsReattach = TRUE; + } + } + + - (void) updateGLContexts + { + [self updateGLContexts:NO]; } - (BOOL) hasGLContext @@ -605,6 +614,23 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return NO; } + - (void) viewDidHide + { + [super viewDidHide]; + if ([self hasGLContext]) + [self invalidateHasGLDescendant]; + } + + - (void) viewDidUnhide + { + [super viewDidUnhide]; + if ([self hasGLContext]) + { + [self updateGLContexts:YES]; + [self invalidateHasGLDescendant]; + } + } + - (void) completeText:(NSString*)text { macdrv_event* event; @@ -651,12 +677,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [super willRemoveSubview:subview]; } - - (void) setHidden:(BOOL)hidden - { - [super setHidden:hidden]; - [self invalidateHasGLDescendant]; - } - /* * ---------- NSTextInputClient methods ---------- */ @@ -3432,6 +3452,7 @@ void macdrv_set_view_hidden(macdrv_view v, int hidden) OnMainThreadAsync(^{ [view setHidden:hidden]; + [(WineWindow*)view.window updateForGLSubviews]; }); [pool release];

1 0

Alistair Leslie-Hughes : include: Add dhcpcsdk.h.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: c84e6fb3e50946fa235d69e0275ea6ace77a013b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84e6fb3e50946fa235d69e02… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 2 06:53:17 2017 +0000 include: Add dhcpcsdk.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dhcpcsdk.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 401b02b..9f615cd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -313,6 +313,7 @@ HEADER_SRCS = \ devguid.h \ devpkey.h \ devpropdef.h \ + dhcpcsdk.h \ difxapi.h \ digitalv.h \ dinput.h \ diff --git a/include/dhcpcsdk.h b/include/dhcpcsdk.h new file mode 100644 index 0000000..93c7af6 --- /dev/null +++ b/include/dhcpcsdk.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library 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. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _DHCPCSDK_ +#define _DHCPCSDK_ + +typedef struct _DHCPAPI_PARAMS +{ + ULONG Flags; + ULONG OptionId; + BOOL IsVendor; + BYTE *Data; + DWORD nBytesData; +} DHCPAPI_PARAMS, *PDHCPAPI_PARAMS, *LPDHCPAPI_PARAMS; + +typedef struct _DHCPAPI_PARAMS DHCPCAPI_PARAMS, *PDHCPCAPI_PARAMS, *LPDHCPCAPI_PARAMS; + +typedef struct _DHCPCAPI_PARAMS_ARARAY +{ + ULONG nParams; + LPDHCPCAPI_PARAMS Params; +} DHCPCAPI_PARAMS_ARRAY, *PDHCPCAPI_PARAMS_ARRAY, *LPDHCPCAPI_PARAMS_ARRAY; + +typedef struct _DHCPCAPI_CLASSID +{ + ULONG Flags; + BYTE *Data; + ULONG nBytesData; +} DHCPCAPI_CLASSID, *PDHCPCAPI_CLASSID, *LPDHCPCAPI_CLASSID; + + +DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, DHCPCAPI_CLASSID *classid, + DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams, + BYTE *buffer, DWORD *size, WCHAR *requestidstr ); + +#endif

1 0

Fabian Maurer : user32: Don' t send WM_CHAR when a menu gets VK_ESCAPE and add tests.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: 115bbf424cc0f5ea325e3052aed8ad8106045294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=115bbf424cc0f5ea325e3052a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Feb 2 16:33:54 2017 +0100 user32: Don't send WM_CHAR when a menu gets VK_ESCAPE and add tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 2 +- dlls/user32/tests/msg.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 59fcd9c..827bee7 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3077,7 +3077,6 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, break; } - TranslateMessage( &msg ); mt.pt = msg.pt; if ( (msg.hwnd==menu->hWnd) || (msg.message!=WM_TIMER) ) @@ -3206,6 +3205,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, } default: + TranslateMessage( &msg ); break; } break; /* WM_KEYDOWN */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 45b5222..c608c11 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1675,6 +1675,10 @@ static const struct message WmTrackPopupMenu[] = { { 0 } }; +static const struct message WmTrackPopupMenuEsc[] = { + { 0 } +}; + static const struct message WmTrackPopupMenuCapture[] = { { HCBT_CREATEWND, hook }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, @@ -15637,6 +15641,7 @@ static LRESULT WINAPI cancel_init_proc(HWND hwnd, UINT message, WPARAM wParam, L static void test_TrackPopupMenu(void) { + MSG msg; HWND hwnd; BOOL ret; @@ -15659,6 +15664,20 @@ static void test_TrackPopupMenu(void) ok_sequence(WmTrackPopupMenu, "TrackPopupMenu", TRUE); ok(ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError()); + /* Test popup closing with an ESC-press */ + flush_events(); + PostMessageW(hwnd, WM_KEYDOWN, VK_ESCAPE, 0); + ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); + ok(ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError()); + PostQuitMessage(0); + flush_sequence(); + while ( PeekMessageA(&msg, 0, 0, 0, PM_REMOVE) ) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + ok_sequence(WmTrackPopupMenuEsc, "TrackPopupMenuEsc", FALSE); /* Shouldn't get any message */ + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_init_proc); flush_events();

1 0

Ken Thomases : winemac: Ignore clipboard updates provoked by our own call to GetClipboardData().
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: c95d2de3dd41d1da6fb96191dfb74b7a412ba362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95d2de3dd41d1da6fb96191d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 2 14:51:45 2017 -0600 winemac: Ignore clipboard updates provoked by our own call to GetClipboardData(). During a call to GetClipboardData(), the app may be asked to render the data for a promised format. This will cause us to receive WM_CLIPBOARDUPDATE. Almost always, the app will have just rendered the requested format and not made any other changes. Therefore, we don't need to rebuild the Mac pasteboard from the Win32 clipboard. Doing so can cause a race with the other Mac app which is querying the pasteboard (for a paste operation, for example). We basically delete the data we _just_ added and rebuild the list of available types. The symptom is that the other Mac app sees the available types change and maybe be incomplete. In theory, the Windows app could make other changes to the clipboard and this change would cause us to fail to convey them to the Mac pasteboard. I consider that very unlikely and the tradeoff to improve the common case is worth it. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 7115c3b..53f01d5 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -200,6 +200,7 @@ static BOOL is_clipboard_owner; static macdrv_window clipboard_cocoa_window; static UINT rendered_formats; static ULONG64 last_clipboard_update; +static DWORD last_get_seqno; static WINE_CLIPFORMAT **current_mac_formats; static unsigned int nb_current_mac_formats; static WCHAR clipboard_pipe_name[256]; @@ -1819,6 +1820,7 @@ static LRESULT CALLBACK clipboard_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM return TRUE; case WM_CLIPBOARDUPDATE: if (is_clipboard_owner) break; /* ignore our own changes */ + if ((LONG)(GetClipboardSequenceNumber() - last_get_seqno) <= 0) break; set_mac_pasteboard_types_from_win32_clipboard(); break; case WM_RENDERFORMAT: @@ -2220,6 +2222,8 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) } } + last_get_seqno = GetClipboardSequenceNumber(); + CloseClipboard(); return ret;

1 0

Jeremy Newman : instead of outputting debug, put in the console
by Jeremy Newman Feb. 3, 2017

Feb. 3, 2017

Module: appdb Branch: master Commit: 569f2eb2c95acb4ef4f04ba6673bedf66a40cb57 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=569f2eb2c95acb4ef4f04ba6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 11:16:31 2017 -0600 instead of outputting debug, put in the console --- admin/editAppFamily.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/admin/editAppFamily.php b/admin/editAppFamily.php index 6531fb4..a04b7a5 100644 --- a/admin/editAppFamily.php +++ b/admin/editAppFamily.php @@ -31,13 +31,16 @@ else $oApp = new Application($aClean['iAppId']); - + if(!$oApp) { util_show_error_page_and_exit('Application does not exist'); } - - if($_SESSION['current']->showDebuggingInfos()) { echo "<p align=center><b>appName:</b> $oApp->sName </p>"; } + + if($_SESSION['current']->showDebuggingInfos()) + { + appdb_debug("appName: {$oApp->sName}"); + } apidb_header("Edit Application Family");

1 0

Jeremy Newman : remove xinha, add wysiwyg class to load editor
by Jeremy Newman Feb. 3, 2017

Feb. 3, 2017

Module: appdb Branch: master Commit: 8f6be98e4e0fc51b60d6ff514404d404608f0d7e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8f6be98e4e0fc51b60d6ff51… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 11:06:11 2017 -0600 remove xinha, add wysiwyg class to load editor --- include/application.php | 4 +--- include/filter.php | 5 +---- include/note.php | 4 +--- include/testData.php | 8 +++----- include/version.php | 3 +-- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/include/application.php b/include/application.php index 376b459..75d13ee 100644 --- a/include/application.php +++ b/include/application.php @@ -565,8 +565,6 @@ class Application { /* output a html table and this applications values to the fields for editing */ public function outputEditor($sVendorName = "") { - HtmlAreaLoaderScript(array("app_editor")); - echo '<input type="hidden" name="iAppId" value="'.$this->iAppId.'">'; /* Used to distinguish between the first step of entering an application @@ -638,7 +636,7 @@ class Application { echo '<td><input size="75%" type="text" name="sAppKeywords" value="'.$this->sKeywords.'"></td></tr>',"\n"; echo '<tr valign=top><td class="color0"><b>Application description (In your own words)</b></td>',"\n"; - echo '<td><p><textarea cols="80" rows="20" id="app_editor" name="shAppDescription">'; + echo '<td><p><textarea cols="80" rows="20" id="app_editor" name="shAppDescription" class="wysiwyg">'; echo $this->sDescription.'</textarea></p></td></tr>',"\n"; diff --git a/include/filter.php b/include/filter.php index aa3fa6d..ec4c0b7 100644 --- a/include/filter.php +++ b/include/filter.php @@ -31,14 +31,11 @@ function filter_gpc() // Special cases for variables that don't fit our filtering scheme // don't filter the AppDB session cookie and MAX_FILE_SIZE - // and the DialogX values that xinha uses // NOTE: we must use === when comparing the return value of strpos // against a value, otherwise if strpos() returns false indicating that // the value wasn't found strpos(something) == 0 will still be true - if((strpos($aKeys[$i], "Dialog") === 0) || - (strpos($aKeys[$i], "XinhaColorPicker") === 0) || // Xinha variables - ($aKeys[$i] == "cx") || // google custom search variable + if(($aKeys[$i] == "cx") || // google custom search variable ($aKeys[$i] == "cof") || // google custom search variable ($aKeys[$i] == "q") || // google custom search variable ($aKeys[$i] == "g-recaptcha-response")) // google reCaptcha variable diff --git a/include/note.php b/include/note.php index 0e43cce..8a9dabd 100644 --- a/include/note.php +++ b/include/note.php @@ -382,8 +382,6 @@ class Note { $this->iAppId = $oVersion->iAppId; } - HtmlAreaLoaderScript(array("editor")); - echo html_frame_start("Edit Application Note", "90%","",0); echo html_table_begin("width='100%' border=0 align=left cellpadding=6 cellspacing=0 class='box-body'"); @@ -401,7 +399,7 @@ class Note { echo '</td></tr>'; echo '<tr><td class=color1>Description</td><td class=color0>', "\n"; echo '<p style="width:700px">', "\n"; - echo '<textarea cols="80" rows="20" id="editor" name="shNoteDesc">'.$this->shDescription.'</textarea>',"\n"; + echo '<textarea cols="80" rows="20" id="editor" name="shNoteDesc" class="wysiwyg">'.$this->shDescription.'</textarea>',"\n"; echo '</p>'; echo '</td></tr>'."\n"; diff --git a/include/testData.php b/include/testData.php index 18a04b4..8ba45c1 100644 --- a/include/testData.php +++ b/include/testData.php @@ -834,8 +834,6 @@ class testData{ if(!$this->sTestedDate) $this->sTestedDate = date('Y-m-d H:i:s'); - HtmlAreaLoaderScript(array("Test1", "Test2", "Test3")); - $sName = version::fullName($this->iVersionId); echo html_frame_start("Test Form - $sName", "90%", "", 0); @@ -843,15 +841,15 @@ class testData{ // What works echo '<tr valign=top><td class="color0"><b>What works</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test1" name="shWhatWorks">'; + echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test1" name="shWhatWorks" class="wysiwyg">'; echo $this->shWhatWorks.'</textarea></p></td></tr>',"\n"; // What Does not work echo '<tr valign=top><td class=color1><b>What does not work</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt">'; + echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt" class="wysiwyg">'; echo $this->shWhatDoesnt.'</textarea></p></td></tr>',"\n"; // What was not tested echo '<tr valign=top><td class=color0><b>What was not tested</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test3" name="shWhatNotTested">'; + echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test3" name="shWhatNotTested" class="wysiwyg">'; echo $this->shWhatNotTested.'</textarea></p></td></tr>',"\n"; // Date Tested echo '<tr valign=top><td class="color1"><b>Date tested </b></td>',"\n"; diff --git a/include/version.php b/include/version.php index 2e34d1a..b79954d 100644 --- a/include/version.php +++ b/include/version.php @@ -595,7 +595,6 @@ class version { /* otherwise, if $editParentAppliation is false, we leave them out */ public function outputEditor() { - HtmlAreaLoaderScript(array("version_editor")); echo html_frame_start("Version Form", "90%", "", 0); echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">'; @@ -669,7 +668,7 @@ class version { $oTableCell->SetClass("color0"); $oTableRow->AddCell($oTableCell); - $oTableRow->AddTextCell('<p><textarea cols="80" rows="20" id="version_editor" name="shVersionDescription">'. + $oTableRow->AddTextCell('<p><textarea cols="80" rows="20" id="version_editor" name="shVersionDescription" class="wysiwyg">'. $this->sDescription.'</textarea></p>'); $oTable->AddRow($oTableRow);

1 0

Jeremy Newman : moving css and js to own subdirs
by Jeremy Newman Feb. 3, 2017

Feb. 3, 2017

Module: appdb Branch: master Commit: f30bc6ddd2feb922bb749bd463993a23f52c806d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f30bc6ddd2feb922bb749bd4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 10:09:15 2017 -0600 moving css and js to own subdirs --- styles.css => css/styles.css | 0 include/header.php | 8 ++++---- utils.js => js/utils.js | 0 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/styles.css b/css/styles.css similarity index 100% rename from styles.css rename to css/styles.css diff --git a/include/header.php b/include/header.php index 61aff7b..57d4249 100644 --- a/include/header.php +++ b/include/header.php @@ -4,8 +4,8 @@ /*********************************/ // get file modification time for local CSS/JS to fix caching issues -$iCSStime = filemtime(BASE."styles.css"); -$iJStime = filemtime(BASE."utils.js"); +$iCSStime = filemtime(BASE."css/styles.css"); +$iJStime = filemtime(BASE."js/utils.js"); ?><!doctype html> <html lang="en"> @@ -23,12 +23,12 @@ $iJStime = filemtime(BASE."utils.js"); <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css"> <link rel="stylesheet" href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.min.css" type="text/css" media="all"> - <link rel="stylesheet" href="<?php echo BASE; ?>styles.css?f=<?php echo $iCSStime; ?>" type="text/css" media="all"> + <link rel="stylesheet" href="<?php echo BASE; ?>css/styles.css?f=<?php echo $iCSStime; ?>" type="text/css" media="all"> <script src="https://code.jquery.com/jquery-2.2.3.min.js" type="text/javascript"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script> <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script> - <script src="<?php echo BASE; ?>utils.js?f=<?php echo $iJStime; ?>"></script> + <script src="<?php echo BASE; ?>js/utils.js?f=<?php echo $iJStime; ?>"></script> <?php // additional header code if (!empty($sHeaderCode)) diff --git a/utils.js b/js/utils.js similarity index 100% rename from utils.js rename to js/utils.js

1 0

Jeremy Newman : pass sWebRoot based on BASE to js
by Jeremy Newman Feb. 3, 2017

Feb. 3, 2017

Module: appdb Branch: master Commit: 152d6fc1acb0829f6d2d3ec8524ec20f79cd8d19 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=152d6fc1acb0829f6d2d3ec8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 11:02:44 2017 -0600 pass sWebRoot based on BASE to js --- include/header.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/header.php b/include/header.php index 57d4249..b36aec9 100644 --- a/include/header.php +++ b/include/header.php @@ -28,12 +28,15 @@ $iJStime = filemtime(BASE."js/utils.js"); <script src="https://code.jquery.com/jquery-2.2.3.min.js" type="text/javascript"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script> <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script> + + <script>var sWebRoot = '<?php echo BASE; ?>';</script> <script src="<?php echo BASE; ?>js/utils.js?f=<?php echo $iJStime; ?>"></script> <?php // additional header code if (!empty($sHeaderCode)) echo " {$sHeaderCode}\n"; ?> + <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> <link title="AppDB" type="application/opensearchdescription+xml" rel="search" href="<?php echo BASE; ?>opensearch.xml"> </head>

1 0

Jeremy Newman : adding redactor HTML editor and with codemirror
by Jeremy Newman Feb. 3, 2017

Feb. 3, 2017

Module: appdb Branch: master Commit: 9cd734dceb24538f1da8d0c80aff6c032bf152ab URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9cd734dceb24538f1da8d0c8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 11:03:31 2017 -0600 adding redactor HTML editor and with codemirror --- css/codemirror.css | 40 ++++++++++++++++++++++++++++++++++++++++ css/redactor.css | 26 ++++++++++++++++++++++++++ js/codemirror.js | 10 ++++++++++ js/redactor.min.js | 7 +++++++ 4 files changed, 83 insertions(+) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=9cd734dceb24538f1da8…

1 0