May 2018 - Wine-Commits - list.winehq.org

Daniel Lehman : advapi32/tests: Add tests for REG_NOTIFY_THREAD_AGNOSTIC.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: 19e96b567fad85a058824197c39a57c8d61901fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=19e96b567fad85a058824197… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Apr 29 15:42:35 2018 -0700 advapi32/tests: Add tests for REG_NOTIFY_THREAD_AGNOSTIC. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 81 ++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 1 + 2 files changed, 82 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 2f7566c..6d8f90a 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3464,9 +3464,28 @@ static void test_RegOpenCurrentUser(void) RegCloseKey(key); } +struct notify_data { + HKEY key; + DWORD flags; + HANDLE event; +}; + +static DWORD WINAPI notify_change_thread(void *arg) +{ + struct notify_data *data = arg; + LONG ret; + + ret = RegNotifyChangeKeyValue(data->key, TRUE, + REG_NOTIFY_CHANGE_NAME|data->flags, data->event, TRUE); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + return 0; +} + static void test_RegNotifyChangeKeyValue(void) { + struct notify_data data; HKEY key, subkey; + HANDLE thread; HANDLE event; DWORD dwret; LONG ret; @@ -3486,6 +3505,68 @@ static void test_RegNotifyChangeKeyValue(void) dwret = WaitForSingleObject(event, 0); ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + RegDeleteKeyA(key, "SubKey"); + RegCloseKey(key); + + /* test same thread with REG_NOTIFY_THREAD_AGNOSTIC */ + ret = RegOpenKeyA(hkey_main, "TestKey", &key); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ret = RegNotifyChangeKeyValue(key, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_THREAD_AGNOSTIC, + event, TRUE); + if (ret == ERROR_INVALID_PARAMETER) + { + win_skip("REG_NOTIFY_THREAD_AGNOSTIC is not supported\n"); + RegCloseKey(key); + CloseHandle(event); + return; + } + + ret = RegCreateKeyA(key, "SubKey", &subkey); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + dwret = WaitForSingleObject(event, 0); + ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + + RegDeleteKeyA(key, "SubKey"); + RegCloseKey(key); + + /* test different thread without REG_NOTIFY_THREAD_AGNOSTIC */ + ret = RegOpenKeyA(hkey_main, "TestKey", &key); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + data.key = key; + data.flags = 0; + data.event = event; + thread = CreateThread(NULL, 0, notify_change_thread, &data, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + /* the thread exiting causes event to signal on Windows + this is worked around on Windows using REG_NOTIFY_THREAD_AGNOSTIC + Wine already behaves as if the flag is set */ + dwret = WaitForSingleObject(event, 0); + todo_wine + ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + RegCloseKey(key); + + /* test different thread with REG_NOTIFY_THREAD_AGNOSTIC */ + ret = RegOpenKeyA(hkey_main, "TestKey", &key); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + data.flags = REG_NOTIFY_THREAD_AGNOSTIC; + thread = CreateThread(NULL, 0, notify_change_thread, &data, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + dwret = WaitForSingleObject(event, 0); + ok(dwret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", dwret); + + ret = RegCreateKeyA(key, "SubKey", &subkey); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + dwret = WaitForSingleObject(event, 0); + ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + + RegDeleteKeyA(key, "SubKey"); RegDeleteKeyA(key, ""); RegCloseKey(key); CloseHandle(event); diff --git a/include/winnt.h b/include/winnt.h index 16d96d8..ba10be7 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5368,6 +5368,7 @@ typedef struct _TAPE_GET_MEDIA_PARAMETERS { #define REG_NOTIFY_CHANGE_ATTRIBUTES 0x02 #define REG_NOTIFY_CHANGE_LAST_SET 0x04 #define REG_NOTIFY_CHANGE_SECURITY 0x08 +#define REG_NOTIFY_THREAD_AGNOSTIC 0x10000000 #define KEY_QUERY_VALUE 0x00000001 #define KEY_SET_VALUE 0x00000002

1 0

Zebediah Figura : winedbg: Add support for starting on a user-supplied port.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: 3849270aa74f4fdb47f09eeb3442e40ea4f44520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3849270aa74f4fdb47f09eeb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 2 19:32:50 2018 -0500 winedbg: Add support for starting on a user-supplied port. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 34 ++++++++++++++++++++++++++-------- programs/winedbg/winedbg.man.in | 4 ++++ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 376bf37..3909cb5 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2468,10 +2468,10 @@ static BOOL gdb_exec(const char* wine_path, unsigned port, unsigned flags) return TRUE; } -static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned flags) +static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned flags, unsigned port) { int sock; - struct sockaddr_in s_addrs; + struct sockaddr_in s_addrs = {0}; socklen_t s_len = sizeof(s_addrs); struct pollfd pollfd; IMAGEHLP_MODULE64 imh_mod; @@ -2485,6 +2485,12 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl return FALSE; } + s_addrs.sin_family = AF_INET; + s_addrs.sin_addr.s_addr = INADDR_ANY; + s_addrs.sin_port = htons(port); + if (bind(sock, (struct sockaddr *)&s_addrs, sizeof(s_addrs)) == -1) + goto cleanup; + if (listen(sock, 1) == -1 || getsockname(sock, (struct sockaddr*)&s_addrs, &s_len) == -1) goto cleanup; @@ -2553,7 +2559,7 @@ cleanup: return ret; } -static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags) +static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags, unsigned port) { DEBUG_EVENT de; int i; @@ -2586,7 +2592,7 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags) * and the only one of this type */ assert(gdbctx->process == NULL && de.dwProcessId == dbg_curr_pid); /* gdbctx->dwProcessId = pid; */ - if (!gdb_startup(gdbctx, &de, flags)) return FALSE; + if (!gdb_startup(gdbctx, &de, flags, port)) return FALSE; assert(!gdbctx->in_trap); } else @@ -2599,13 +2605,13 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags) return TRUE; } -static int gdb_remote(unsigned flags) +static int gdb_remote(unsigned flags, unsigned port) { struct pollfd pollfd; struct gdb_context gdbctx; BOOL doLoop; - for (doLoop = gdb_init_context(&gdbctx, flags); doLoop;) + for (doLoop = gdb_init_context(&gdbctx, flags, port); doLoop;) { pollfd.fd = gdbctx.sock; pollfd.events = POLLIN; @@ -2647,7 +2653,8 @@ static int gdb_remote(unsigned flags) int gdb_main(int argc, char* argv[]) { #ifdef HAVE_POLL - unsigned gdb_flags = 0; + unsigned gdb_flags = 0, port = 0; + char *port_end; argc--; argv++; while (argc > 0 && argv[0][0] == '-') @@ -2664,11 +2671,22 @@ int gdb_main(int argc, char* argv[]) argc--; argv++; continue; } + if (strcmp(argv[0], "--port") == 0 && argc > 1) + { + port = strtoul(argv[1], &port_end, 10); + if (*port_end) + { + fprintf(stderr, "Invalid port: %s\n", argv[1]); + return -1; + } + argc -= 2; argv += 2; + continue; + } return -1; } if (dbg_active_attach(argc, argv) == start_ok || dbg_active_launch(argc, argv) == start_ok) - return gdb_remote(gdb_flags); + return gdb_remote(gdb_flags, port); #else fprintf(stderr, "GdbProxy mode not supported on this platform\n"); #endif diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index ea4dc28..6f38bc0 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -73,6 +73,10 @@ When in \fBgdb\fR proxy mode, the following options are available: started. Relevant information for starting \fBgdb\fR is printed on screen. This is somehow useful when not directly using \fBgdb\fR but some graphical front-ends, like \fBddd\fR or \fBkgbd\fR. +.IP \fB--port\fR\ \fIport\fR +Start the \fBgdb\fR server on the given port. If this option is not +specified, a randomly chosen port will be used. If \fB--no-start\fR is +specified, the port used will be printed on startup. .IP \fB--with-xterm\fR This will run \fBgdb\fR in its own xterm instead of using the current Unix console for textual display.

1 0

Zebediah Figura : ntoskrnl/tests: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: 09a39230c2b16dff4e38f8be2d21bb694918ca7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=09a39230c2b16dff4e38f8be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 2 21:26:17 2018 -0500 ntoskrnl/tests: Use WINAPIV calling convention for variadic functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 84cfff7..06b365f 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -61,7 +61,7 @@ static void kvprintf(const char *format, __ms_va_list ap) ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, strlen(buffer), &offset, NULL); } -static void kprintf(const char *format, ...) +static void WINAPIV kprintf(const char *format, ...) { __ms_va_list valist; @@ -70,7 +70,7 @@ static void kprintf(const char *format, ...) __ms_va_end(valist); } -static void ok_(const char *file, int line, int condition, const char *msg, ...) +static void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) { const char *current_file; __ms_va_list args;

1 0

Jeremy Newman : new layout for the home page
by Jeremy Newman May 3, 2018

May 3, 2018

Module: website Branch: master Commit: 0aa359a9eb5cd2e76f287d4bcee5af466f87052e URL: https://source.winehq.org/git/website.git/?a=commit;h=0aa359a9eb5cd2e76f287… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu May 3 10:26:46 2018 -0500 new layout for the home page * get rid of the 3 bubble areas, they never lined up properly * add the screenshot widget from the appdb * add a more prominent link to the appdb * misc cleanup --- css/styles.css | 185 +++++++++++++++++++++++---------------------- js/utils.js | 17 ----- templates/en/home.template | 96 ++++++++++++++++++----- 3 files changed, 174 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=0aa359a9eb5cd2e76…

1 0

Kyle Auble : Toss out vestigial Flash player
by Jeremy Newman May 3, 2018

May 3, 2018

Module: website Branch: master Commit: d02fa2cff045a325047e3a98b6b6c8b4602cd5e1 URL: https://source.winehq.org/git/website.git/?a=commit;h=d02fa2cff045a325047e3… Author: Kyle Auble <kyle.auble(a)zoho.com> Date: Wed May 2 19:59:11 2018 -0400 Toss out vestigial Flash player Signed-off-by: Kyle Auble <kyle.auble(a)zoho.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- player.swf | Bin 91377 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/player.swf b/player.swf deleted file mode 100644 index 94b3ac8..0000000 Binary files a/player.swf and /dev/null differ

1 0

Alexandre Julliard : Switch to the new tabs design.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: bugzilla Branch: master Commit: 14cd90e1396a1c0b85e686c9c89ab5784e938cd5 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=14cd90e1396a1c0b85e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 2 21:30:37 2018 +0200 Switch to the new tabs design. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- images/tab_h.png | Bin 584 -> 0 bytes images/tab_s.png | Bin 614 -> 0 bytes images/tab_u.png | Bin 616 -> 0 bytes styles.css | 25 +++++++++++-------------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/images/tab_h.png b/images/tab_h.png deleted file mode 100644 index 59620cd..0000000 Binary files a/images/tab_h.png and /dev/null differ diff --git a/images/tab_s.png b/images/tab_s.png deleted file mode 100644 index 54d367b..0000000 Binary files a/images/tab_s.png and /dev/null differ diff --git a/images/tab_u.png b/images/tab_u.png deleted file mode 100644 index ff84b7a..0000000 Binary files a/images/tab_u.png and /dev/null differ diff --git a/styles.css b/styles.css index 409a4e9..25e4ae3 100644 --- a/styles.css +++ b/styles.css @@ -59,13 +59,10 @@ BODY { /* top tabs */ #tabs { - position: absolute; - z-index: 6; - top: 0px; - right: 10px; - margin: 0px; - padding: 0px; + float: right; + margin-right: 1em; } +#tabs .tabs-menu { display: none; } #tabs UL { list-style: none; padding: 0; @@ -73,22 +70,22 @@ BODY { } #tabs LI { float: left; - width: 112px; height: 28px; margin: 0px 2px 0px 2px; padding: 0; text-align: center; - background-image: url('images/tab_u.png'); - background-repeat: no-repeat; + background-color: #848484; + border-bottom-right-radius: 6px; + border-bottom-left-radius: 6px; } -#tabs LI.s { background-image: url('images/tab_s.png'); } +#tabs LI.s { background-color: #cf3939; } #tabs LI.s A { font-weight: bold; } -#tabs LI:hover { background-image: url('images/tab_h.png'); } -#tabs A { +#tabs LI:hover { background-color: #832c2c; } +#tabs LI A { display: block; - width: 108px; + min-width: 110px; height: 23px; - padding-top: 3px; + padding: 3px 5px 3px 5px; font-size: 16px; color: white; text-decoration: none; }

1 0

Alexandre Julliard : Switch to the dl.winehq.org images.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: bugzilla Branch: master Commit: 7e429f6ad0848bd72f3b651c0c38ec7d7d7d84a6 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=7e429f6ad0848bd72f3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 2 21:07:14 2018 +0200 Switch to the dl.winehq.org images. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- images/bg.jpg | Bin 86167 -> 0 bytes images/cw_logo_sm.png | Bin 4383 -> 0 bytes images/winehq_logo_16.png | Bin 917 -> 0 bytes images/winehq_logo_glass_sm.png | Bin 14291 -> 0 bytes images/winehq_logo_text.png | Bin 6870 -> 0 bytes styles.css | 2 +- template/en/default/global/banner.html.tmpl | 4 ++-- template/en/default/global/footer.html.tmpl | 2 +- template/en/default/global/header.html.tmpl | 4 ++-- template/en/default/search/search-plugin.xml.tmpl | 2 +- 10 files changed, 7 insertions(+), 7 deletions(-) diff --git a/images/bg.jpg b/images/bg.jpg deleted file mode 100644 index 16bb0b5..0000000 Binary files a/images/bg.jpg and /dev/null differ diff --git a/images/cw_logo_sm.png b/images/cw_logo_sm.png deleted file mode 100644 index 3099535..0000000 Binary files a/images/cw_logo_sm.png and /dev/null differ diff --git a/images/winehq_logo_16.png b/images/winehq_logo_16.png deleted file mode 100644 index 83d2c4c..0000000 Binary files a/images/winehq_logo_16.png and /dev/null differ diff --git a/images/winehq_logo_glass_sm.png b/images/winehq_logo_glass_sm.png deleted file mode 100644 index 949334b..0000000 Binary files a/images/winehq_logo_glass_sm.png and /dev/null differ diff --git a/images/winehq_logo_text.png b/images/winehq_logo_text.png deleted file mode 100644 index 29b6ecb..0000000 Binary files a/images/winehq_logo_text.png and /dev/null differ diff --git a/styles.css b/styles.css index 86bc79f..f191d5c 100644 --- a/styles.css +++ b/styles.css @@ -2,7 +2,7 @@ BODY { background-color: #000000; color: #000000; - background-image: url('images/bg.jpg'); + background-image: url('https://dl.winehq.org/share/images/bg.jpg'); background-repeat: no-repeat; font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; margin: 0; diff --git a/template/en/default/global/banner.html.tmpl b/template/en/default/global/banner.html.tmpl index 1b2ba6d..1578286 100644 --- a/template/en/default/global/banner.html.tmpl +++ b/template/en/default/global/banner.html.tmpl @@ -10,8 +10,8 @@  -<div id="logo_glass"><a href="/"><img src="images/winehq_logo_glass_sm.png" alt=""></a></div> -<div id="logo_text"><a href="/"><img src="images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> +<div id="logo_glass"><a href="/"><img src="https://dl.winehq.org/share/images/winehq_logo_glass_sm.png" alt=""></a></div> +<div id="logo_text"><a href="/"><img src="https://dl.winehq.org/share/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> <div id="logo_blurb"> Bug Tracking Database diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl index b996468..5d97ea7 100644 --- a/template/en/default/global/footer.html.tmpl +++ b/template/en/default/global/footer.html.tmpl @@ -41,7 +41,7 @@ <div id="cwfooter"> Hosted By - <a href="http://www.codeweavers.com/"><img src="images/cw_logo_sm.png" alt="CodeWeavers" + <a href="http://www.codeweavers.com/"><img src="https://dl.winehq.org/share/images/cw_logo_sm.png" alt="CodeWeavers" title="CodeWeavers - Run Windows applications and games on Mac and Linux"></a> </div> diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index cd85496..2e3e28e 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -214,8 +214,8 @@ <link rel="stylesheet" href="styles.css" type="text/css" media="screen"> <script language="JavaScript" src="jquery.js" type="text/javascript"></script> <script language="JavaScript" src="utils.js" type="text/javascript"></script> - <link rel="icon" type="image/png" href="images/winehq_logo_16.png"> - <link rel="shortcut icon" type="image/png" href="images/winehq_logo_16.png"> + <link rel="icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> + <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> [% Hook.process("additional_header") %] </head> diff --git a/template/en/default/search/search-plugin.xml.tmpl b/template/en/default/search/search-plugin.xml.tmpl index a5511fd..bc27490 100644 --- a/template/en/default/search/search-plugin.xml.tmpl +++ b/template/en/default/search/search-plugin.xml.tmpl @@ -10,6 +10,6 @@ <ShortName>WineHQ Bugzilla</ShortName> <Description>WineHQ Bugzilla Quick Search</Description> <InputEncoding>UTF-8</InputEncoding> -<Image height="16" width="16" type="image/png">[% urlbase FILTER xml %]/images/winehq_logo_16.png</Image> +<Image height="16" width="16" type="image/png">https://dl.winehq.org/share/images/winehq_logo_16.png</Image> <Url type="text/html" method="GET" template="[% urlbase FILTER xml %]buglist.cgi?quicksearch={searchTerms}"/> </OpenSearchDescription>

1 0

Alexandre Julliard : Switch to the new sidebar design.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: bugzilla Branch: master Commit: d221c8a3e1198f36ab9b7d316cbc2583ba183427 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=d221c8a3e1198f36ab9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 11:23:21 2018 +0200 Switch to the new sidebar design. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- images/side_menu_bg.png | Bin 226 -> 0 bytes images/side_menu_bot.png | Bin 564 -> 0 bytes images/side_menu_top.png | Bin 3287 -> 0 bytes styles.css | 53 ++++++++++++++------------ template/en/default/global/menu_end.html.tmpl | 1 - 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/images/side_menu_bg.png b/images/side_menu_bg.png deleted file mode 100644 index c8cbcc0..0000000 Binary files a/images/side_menu_bg.png and /dev/null differ diff --git a/images/side_menu_bot.png b/images/side_menu_bot.png deleted file mode 100644 index 8bc9b5d..0000000 Binary files a/images/side_menu_bot.png and /dev/null differ diff --git a/images/side_menu_top.png b/images/side_menu_top.png deleted file mode 100644 index 047c4c0..0000000 Binary files a/images/side_menu_top.png and /dev/null differ diff --git a/styles.css b/styles.css index 25e4ae3..86bc79f 100644 --- a/styles.css +++ b/styles.css @@ -95,42 +95,47 @@ BODY { z-index: 6; top: 200px; left: 0px; - margin: 0px; - padding: 0px; - width: 156px; } #sidebar UL { + line-height: 1.5em; list-style: none; - width: 156px; padding: 0; - margin: 0 0 10px 0; + margin: 0; } #sidebar LI { - width: 156px; - margin: 0; - padding: 5px 0 0 0; - background-image: url('images/side_menu_bg.png'); - background-repeat: repeat-y; font-size: 10px; color: white; - } -#sidebar LI P { margin: 0; padding: 0 15px 5px 15px; } -#sidebar LI.top { - height: 33px; margin: 0; padding: 0; - background-image: url('images/side_menu_top.png'); - background-repeat: no-repeat; - font-weight: bold; - font-size: 10px; } -#sidebar LI.top P { margin: 0; padding: 10px 0 0 5px; } -#sidebar LI.bot { - height: 16px; - margin: 0; +#sidebar p { margin: 5px 5px 5px 10px; } +#sidebar > ul { + border: none; + margin: 0 0 1em 0 !important; padding: 0; - background-image: url('images/side_menu_bot.png'); - background-repeat: no-repeat; + float: none; + width: 160px; + overflow: hidden; + background: rgba(149,73,58,0.98); + background: linear-gradient(to right, rgba(149,73,58,0.7) 0%, + rgba(149,73,58,0.95) 10%, + rgba(149,73,58,1) 80%, + rgba(126,44,29,1) 97%, + rgba(110,29,14,1) 99%, + rgba(110,29,14,1) 100%); + border: 2px solid #6e1d0e; + border-left: none; + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; + } +#sidebar > ul > li.top { + background: #732010; + margin: 0; + padding: 0.3em 1em 0.3em 0; + font-size: 91%; + font-weight: bold; + white-space: nowrap; + border-top-right-radius: 5px; } #sidebar A { font-size: 10px; color: white; text-decoration: none; } #sidebar A:hover { font-size: 10px; text-decoration: underline; } diff --git a/template/en/default/global/menu_end.html.tmpl b/template/en/default/global/menu_end.html.tmpl index b945697..1f0984b 100644 --- a/template/en/default/global/menu_end.html.tmpl +++ b/template/en/default/global/menu_end.html.tmpl @@ -1,3 +1,2 @@ - <li class="bot"></li> </ul>

1 0

Alexandre Julliard : htaccess: Comment out broken mod_version.c code.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: bugzilla Branch: master Commit: fbff5e20342dd74b2bc2bffe80b9e0a90d913015 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=fbff5e20342dd74b2bc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 2 22:50:51 2018 +0200 htaccess: Comment out broken mod_version.c code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .htaccess | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.htaccess b/.htaccess index 22e6658..a367dfa 100644 --- a/.htaccess +++ b/.htaccess @@ -1,16 +1,16 @@ # Don't allow people to retrieve non-cgi executable files or our private data <FilesMatch (\.pm|\.pl|\.tmpl|localconfig.*)$> - <IfModule mod_version.c> - <IfVersion < 2.4> - Deny from all - </IfVersion> - <IfVersion >= 2.4> - Require all denied - </IfVersion> - </IfModule> - <IfModule !mod_version.c> +# <IfModule mod_version.c> +# <IfVersion < 2.4> +# Deny from all +# </IfVersion> +# <IfVersion >= 2.4> +# Require all denied +# </IfVersion> +# </IfModule> +# <IfModule !mod_version.c> Deny from all - </IfModule> +# </IfModule> </FilesMatch> Options -Indexes

1 0

Jeremy Newman : remove unused image
by Jeremy Newman May 2, 2018

May 2, 2018

Module: website Branch: master Commit: b575714e4f7bbcf5937a3d1193569bcf70264979 URL: https://source.winehq.org/git/website.git/?a=commit;h=b575714e4f7bbcf5937a3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 2 15:51:10 2018 -0500 remove unused image --- images/feed.gif | Bin 652 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/feed.gif b/images/feed.gif deleted file mode 100644 index b0e4adf..0000000 Binary files a/images/feed.gif and /dev/null differ

1 0