February 2022 - Wine-Commits

Zhiyi Zhang : light.msstyles: Do not use transparent tab pane edges.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 080c934a4b696d12511ddcfd0834ffc763d50cde URL: https://source.winehq.org/git/wine.git/?a=commit;h=080c934a4b696d12511ddcfd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:15:18 2022 +0800 light.msstyles: Do not use transparent tab pane edges. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/blue_tab_pane_edge.bmp | Bin 9354 -> 7050 bytes dlls/light.msstyles/blue_tab_pane_edge.svg | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/light.msstyles/blue_tab_pane_edge.bmp b/dlls/light.msstyles/blue_tab_pane_edge.bmp index 0ee90aca9c5..0fe3e1cd2eb 100644 Binary files a/dlls/light.msstyles/blue_tab_pane_edge.bmp and b/dlls/light.msstyles/blue_tab_pane_edge.bmp differ diff --git a/dlls/light.msstyles/blue_tab_pane_edge.svg b/dlls/light.msstyles/blue_tab_pane_edge.svg index 73f3fc2d2c7..2a950c9087d 100644 --- a/dlls/light.msstyles/blue_tab_pane_edge.svg +++ b/dlls/light.msstyles/blue_tab_pane_edge.svg @@ -1,16 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:48-32" width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:48-24" width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> <g fill="#fff"> - <rect x=".13229" y=".13229" width="12.435" height="12.171" rx=".52917" ry=".52917" stroke="#aeaeae" stroke-width=".26458"/> - <rect transform="matrix(1 0 .99934 .036434 0 0)" x="-341.09" y="341.31" width="5.4429" height="7.262"/> + <rect y="-2.2204e-16" width="12.7" height="12.7" rx=".52919" ry=".54067" stroke-linejoin="round" stroke-width=".26458"/> + <rect x=".13229" y=".13229" width="12.435" height="12.435" rx=".52919" ry=".54067" stroke="#aeaeae" stroke-width=".26458"/> </g> </svg>

1 0

Zhiyi Zhang : light.msstyles: Fill combo box background with white pixels.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: c4ffeff7cd11822adb7289e43415a5103e5fa5c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4ffeff7cd11822adb7289e4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:15:04 2022 +0800 light.msstyles: Fill combo box background with white pixels. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/blue_combobutton.bmp | Bin 6858 -> 5178 bytes dlls/light.msstyles/blue_combobutton.svg | 6 +++--- dlls/light.msstyles/light.rc | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/light.msstyles/blue_combobutton.bmp b/dlls/light.msstyles/blue_combobutton.bmp index a2b12ba3e1f..77ddc24e296 100644 Binary files a/dlls/light.msstyles/blue_combobutton.bmp and b/dlls/light.msstyles/blue_combobutton.bmp differ diff --git a/dlls/light.msstyles/blue_combobutton.svg b/dlls/light.msstyles/blue_combobutton.svg index aab7ff06812..07293de0ba8 100644 --- a/dlls/light.msstyles/blue_combobutton.svg +++ b/dlls/light.msstyles/blue_combobutton.svg @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:20-32" width="20" height="84" version="1.1" viewBox="0 0 5.2917 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:20-24" width="20" height="84" version="1.1" viewBox="0 0 5.2917 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g stroke-width=".26458"> + <rect y="-7e-5" width="5.2917" height="22.225" fill="#fff" stroke-width=".26458"/> + <g transform="translate(5.0184e-6 -6.4982e-5)" stroke-width=".26458"> <rect x=".39687" y=".39687" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/> <rect x=".39687" y="5.9531" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#3096fa"/> <rect x=".39687" y="11.509" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index a8e35f9c5d7..4b196716171 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -398,7 +398,6 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_combobutton_glyph.bmp\r\n" "GlyphTransparent = True\r\n" -"Transparent = True\r\n" "TransitionDurations = 4, " "0, 100, 100, 100, " "100, 0, 100, 100, "

1 0

Zhiyi Zhang : light.msstyles: Fill checkbox background with white pixels.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 03e7ad417d0eb16fd77ea91cbff8ad786ef9c2e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e7ad417d0eb16fd77ea91c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:14:43 2022 +0800 light.msstyles: Fill checkbox background with white pixels. Some window procedures don't actually erase background when WM_ERASEBKGND is received. So when drawing transparent buttons on such windows, there may be left over content from buttons of different states. This commit adds a white background to all the button parts that shouldn't be transparent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52433 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/blue_checkbox_13px.bmp | Bin 8250 -> 8250 bytes dlls/light.msstyles/blue_checkbox_13px.svg | 18 +++++++----------- dlls/light.msstyles/blue_checkbox_16px.bmp | Bin 12426 -> 12426 bytes dlls/light.msstyles/blue_checkbox_16px.svg | 12 +++++------- dlls/light.msstyles/blue_checkbox_19px.bmp | Bin 17466 -> 17466 bytes dlls/light.msstyles/blue_checkbox_19px.svg | 2 +- dlls/light.msstyles/blue_checkbox_22px.bmp | Bin 23370 -> 23370 bytes dlls/light.msstyles/blue_checkbox_22px.svg | 2 +- dlls/light.msstyles/blue_checkbox_25px.bmp | Bin 30138 -> 30138 bytes dlls/light.msstyles/blue_checkbox_25px.svg | 18 +++++++----------- dlls/light.msstyles/blue_checkbox_28px.bmp | Bin 37770 -> 37770 bytes dlls/light.msstyles/blue_checkbox_28px.svg | 10 +++++----- dlls/light.msstyles/blue_checkbox_31px.bmp | Bin 46266 -> 46266 bytes dlls/light.msstyles/blue_checkbox_31px.svg | 26 ++++++++++---------------- 14 files changed, 36 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03e7ad417d0eb16fd77e…

1 0

Zhiyi Zhang : light.msstyles: Adjust scroll bar arrow width and height to 17 pixels.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: cbc0d24f665fec3f44a4c08c0699d1356b754479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbc0d24f665fec3f44a4c08c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:14:30 2022 +0800 light.msstyles: Adjust scroll bar arrow width and height to 17 pixels. Themed scroll bar width and height are 17 pixels on XP. Fix that Light theme scroll bar arrow glyphs look off by 1 pixel. The combo button glyphs also have to be moved by 1 pixel because it was designed against the old scroll bar arrow button width and height. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/blue_combobutton_glyph.bmp | Bin 1258 -> 1258 bytes dlls/light.msstyles/blue_combobutton_glyph.svg | 27 +++++++++++-------------- dlls/light.msstyles/light.rc | 4 ++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/light.msstyles/blue_combobutton_glyph.bmp b/dlls/light.msstyles/blue_combobutton_glyph.bmp index 2c0bd8a357f..251f3772bb8 100644 Binary files a/dlls/light.msstyles/blue_combobutton_glyph.bmp and b/dlls/light.msstyles/blue_combobutton_glyph.bmp differ diff --git a/dlls/light.msstyles/blue_combobutton_glyph.svg b/dlls/light.msstyles/blue_combobutton_glyph.svg index 0caf1c4b696..b501a5496bd 100644 --- a/dlls/light.msstyles/blue_combobutton_glyph.svg +++ b/dlls/light.msstyles/blue_combobutton_glyph.svg @@ -5,24 +5,21 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g> - <path d="m0-1.8521h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> - <path d="m0 3.7042h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> - <path d="m0.39688 0.66961 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" stroke-width=".26458"/> - <path d="m2.1173 0.52917-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" stroke-width=".26458"/> - <g> - <g stroke-width=".26458"> - <path d="m0.39688 2.5217 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/> - <path d="m2.1173 2.3812-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/> - <path d="m0.39688 4.3738 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/> - <path d="m2.1173 4.2333-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/> - </g> - <path d="m0.39688 6.2259 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#aeaeae"/> - <path d="m2.1173 6.0854-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#aeaeae"/> + <path d="m0-1.8521h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> + <path d="m0 3.7042h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> + <path d="m0.52915 0.66961 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" stroke-width=".26458"/> + <path d="m2.2496 0.52917-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" stroke-width=".26458"/> + <g transform="translate(.13227)"> + <g stroke-width=".26458"> + <path d="m0.39688 2.5217 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/> + <path d="m2.1173 2.3812-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/> + <path d="m0.39688 4.3738 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/> + <path d="m2.1173 4.2333-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/> </g> + <path d="m0.39688 6.2259 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#aeaeae"/> + <path d="m2.1173 6.0854-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#aeaeae"/> </g> </svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index bfb04faf9e8..a8e35f9c5d7 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -144,8 +144,8 @@ BLUE_INI TEXTFILE "EdgeFillColor = 255 255 255\r\n" "\r\n[SysMetrics]\r\n" -"ScrollbarWidth = 16\r\n" -"ScrollbarHeight = 16\r\n" +"ScrollbarWidth = 17\r\n" +"ScrollbarHeight = 17\r\n" "\r\n; System colors\r\n" "Scrollbar = 255 255 255\r\n"

1 0

Eric Pouech : ktmw32: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: a0625265cf980e3f7da69591d0e06342297c7118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0625265cf980e3f7da69591… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:41:41 2022 +0100 ktmw32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ktmw32/Makefile.in | 1 - dlls/ktmw32/ktmw32_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ktmw32/Makefile.in b/dlls/ktmw32/Makefile.in index 73f80aef0cf..b0517f09193 100644 --- a/dlls/ktmw32/Makefile.in +++ b/dlls/ktmw32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ktmw32.dll C_SRCS = \ diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 462d122a4e5..710683aff36 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -43,7 +43,7 @@ HANDLE WINAPI CreateTransaction(LPSECURITY_ATTRIBUTES pattr, LPGUID pguid, DWORD DWORD level, DWORD flags, DWORD timeout, LPWSTR description) { - FIXME("(%p %p 0x%x 0x%x 0x%x, %u, %s): stub\n", + FIXME("(%p %p 0x%lx 0x%lx 0x%lx, %lu, %s): stub\n", pattr, pguid, options, level, flags, timeout, debugstr_w(description)); return (HANDLE) 1;

1 0

Eric Pouech : krnl386.exe16: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 83bc5d4be709f02432f732ce2ffff055c47f5fec URL: https://source.winehq.org/git/wine.git/?a=commit;h=83bc5d4be709f02432f732ce… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:41:35 2022 +0100 krnl386.exe16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dosmem.c | 2 +- dlls/krnl386.exe16/file.c | 2 +- dlls/krnl386.exe16/global.c | 8 ++-- dlls/krnl386.exe16/instr.c | 14 +++---- dlls/krnl386.exe16/int21.c | 50 ++++++++++++------------ dlls/krnl386.exe16/int25.c | 4 +- dlls/krnl386.exe16/int26.c | 4 +- dlls/krnl386.exe16/int2f.c | 18 ++++----- dlls/krnl386.exe16/int31.c | 18 ++++----- dlls/krnl386.exe16/interrupts.c | 12 +++--- dlls/krnl386.exe16/ioports.c | 4 +- dlls/krnl386.exe16/kernel.c | 12 +++--- dlls/krnl386.exe16/ne_module.c | 2 +- dlls/krnl386.exe16/ne_segment.c | 4 +- dlls/krnl386.exe16/relay.c | 4 +- dlls/krnl386.exe16/resource.c | 2 +- dlls/krnl386.exe16/snoop.c | 6 +-- dlls/krnl386.exe16/syslevel.c | 10 ++--- dlls/krnl386.exe16/task.c | 6 +-- dlls/krnl386.exe16/thunk.c | 56 +++++++++++++-------------- dlls/krnl386.exe16/utthunk.c | 2 +- dlls/krnl386.exe16/vxd.c | 86 ++++++++++++++++++++--------------------- dlls/krnl386.exe16/wowthunk.c | 4 +- 24 files changed, 165 insertions(+), 166 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83bc5d4be709f02432f7…

1 0

Eric Pouech : kernel32: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: a0fee49db292682f60ce765a1b2071f12778917b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0fee49db292682f60ce765a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:41:23 2022 +0100 kernel32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 2 +- dlls/kernel32/comm.c | 8 ++++---- dlls/kernel32/console.c | 18 +++++++++--------- dlls/kernel32/file.c | 4 ++-- dlls/kernel32/heap.c | 4 ++-- dlls/kernel32/kernel_main.c | 2 +- dlls/kernel32/lcformat.c | 34 +++++++++++++++++----------------- dlls/kernel32/locale.c | 2 +- dlls/kernel32/lzexpand.c | 2 +- dlls/kernel32/path.c | 10 +++++----- dlls/kernel32/process.c | 30 +++++++++++++++--------------- dlls/kernel32/profile.c | 8 ++++---- dlls/kernel32/resource.c | 28 ++++++++++++++-------------- dlls/kernel32/sync.c | 10 +++++----- dlls/kernel32/tape.c | 26 +++++++++++++------------- dlls/kernel32/thread.c | 2 +- dlls/kernel32/toolhelp.c | 12 ++++++------ dlls/kernel32/version.c | 2 +- dlls/kernel32/volume.c | 10 +++++----- 19 files changed, 107 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0fee49db292682f60ce…

1 0

Eric Pouech : jsproxy: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 8143fb5916ef9b8cca80c3116b037ec86da71bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8143fb5916ef9b8cca80c311… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:41:17 2022 +0100 jsproxy: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/Makefile.in | 1 - dlls/jsproxy/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/jsproxy/Makefile.in b/dlls/jsproxy/Makefile.in index 6345c9a2d74..07f1fb53bc9 100644 --- a/dlls/jsproxy/Makefile.in +++ b/dlls/jsproxy/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = jsproxy.dll IMPORTS = uuid oleaut32 ole32 ws2_32 IMPORTLIB = jsproxy diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index bf8a2624920..b93d1200f42 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -81,7 +81,7 @@ static struct pac_script *global_script = &pac_script; */ BOOL WINAPI InternetDeInitializeAutoProxyDll( LPSTR mime, DWORD reserved ) { - TRACE( "%s, %u\n", debugstr_a(mime), reserved ); + TRACE( "%s, %lu\n", debugstr_a(mime), reserved ); EnterCriticalSection( &cs_jsproxy ); @@ -127,7 +127,7 @@ BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile { BOOL ret = FALSE; - TRACE( "%u, %s, %s, %p, %p\n", version, debugstr_a(tmpfile), debugstr_a(mime), callbacks, buffer ); + TRACE( "%lu, %s, %s, %p, %p\n", version, debugstr_a(tmpfile), debugstr_a(mime), callbacks, buffer ); if (callbacks) FIXME( "callbacks not supported\n" ); @@ -538,7 +538,7 @@ static BOOL run_script( const WCHAR *script, const WCHAR *url, const WCHAR *host VariantClear( &args[1] ); if (hr != S_OK) { - WARN("script failed 0x%08x\n", hr); + WARN("script failed 0x%08lx\n", hr); goto done; } if ((*result_str = strdupWA( V_BSTR( &retval ) ))) @@ -568,7 +568,7 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW WCHAR *urlW = NULL, *hostnameW = NULL; BOOL ret = FALSE; - TRACE( "%s, %u, %s, %u, %p, %p\n", debugstr_a(url), len_url, hostname, len_hostname, proxy, len_proxy ); + TRACE( "%s, %lu, %s, %lu, %p, %p\n", debugstr_a(url), len_url, hostname, len_hostname, proxy, len_proxy ); EnterCriticalSection( &cs_jsproxy );

1 0

Zhiyi Zhang : light.msstyles: Use stretch sizing type for scroll bar arrow button background.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 3acf12b8676c15be52ac4c4145112f0c0c646559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3acf12b8676c15be52ac4c41… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:14:16 2022 +0800 light.msstyles: Use stretch sizing type for scroll bar arrow button background. Scroll bar arrow button background within its sizing margins is all white, using stretch instead of tile has no visual difference and is more efficient. On Windows, stretch sizing type is also used for this part. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/light.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index ba27c9461bc..bfb04faf9e8 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -607,7 +607,7 @@ BLUE_INI TEXTFILE "BgType = ImageFile\r\n" "SizingMargins = 5, 5, 5, 5\r\n" "ContentMargins = 0, 0, 3, 3\r\n" -"SizingType = Tile\r\n" +"SizingType = Stretch\r\n" "ImageFile = blue_scrollbar_arrows.bmp\r\n" "ImageCount = 16\r\n" "ImageLayout = Vertical\r\n"

1 0

Eric Pouech : localspl: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 600d80429959e39f3b8b340243cc9c245ed0f505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=600d80429959e39f3b8b3402… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:41:53 2022 +0100 localspl: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/Makefile.in | 1 - dlls/localspl/localmon.c | 48 ++++++++++----------- dlls/localspl/provider.c | 104 +++++++++++++++++++++++----------------------- 3 files changed, 76 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=600d80429959e39f3b8b…

1 0