February 2016 - Wine-Commits

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: f74d481c12a77e2e1e2c0450ceae7500639743a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74d481c12a77e2e1e2c0450c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jan 4 10:25:32 2016 +0800 po: Update Simplified Chinese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f157192513c5b523a5366e8cedfc6b7d3b986140) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9ed9e73..5e05a07 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12509,11 +12509,11 @@ msgstr "Windows 注册信息" #: winecfg.rc:144 msgid "&Owner:" -msgstr "姓名：" +msgstr "姓名(&O)：" #: winecfg.rc:146 msgid "Organi&zation:" -msgstr "组织(_Z)：" +msgstr "组织(&Z)：" #: winecfg.rc:154 msgid "Application settings"

1 0

Alex Henrie : maintainers: Add Wine Staging maintainers.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 88aec6c81624bf5e8558497fcab1cd9ac716b887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88aec6c81624bf5e8558497fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 31 17:59:15 2015 +0100 maintainers: Add Wine Staging maintainers. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 18698993330d9a2755d3db635ea3b5d312ddca10) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index a32c686..6054e57 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -266,3 +266,9 @@ F: */ Stable Branch M: Michael Stefaniuc <mstefani(a)winehq.org> W: http://wiki.winehq.org/StableRules + +Staging Branch +M: Sebastian Lackner <sebastian(a)fds-team.de> +M: Michael Müller <michael(a)fds-team.de> +P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> +W: https://wine-staging.com/

1 0

Alexandre Julliard : Update copyright info for 2016.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: aa309dcd59e0f41c597b068ad7ffdf866faa6101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa309dcd59e0f41c597b068ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 3 20:08:27 2016 +0100 Update copyright info for 2016. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f6998ea4ced8b2051df64dd81242416d903a90d7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 6dbf8c0..c35515e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 6fd4ff9..8dbb85b 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2015 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index cae5408..fcf1385 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -74,7 +74,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Alexandre Julliard : wine.inf: Fix the wordpad.exe path in associations.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 284c06bc0472811dfb8aefbfd8f7c8ee111df50d URL: http://source.winehq.org/git/wine.git/?a=commit;h=284c06bc0472811dfb8aefbfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 21:23:02 2016 +0900 wine.inf: Fix the wordpad.exe path in associations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 41cb62acd902dd81c75b22edb1645edddea14a2a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 7c0ad09..b3a81d85 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -218,13 +218,13 @@ HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" HKCR,rtffile,,2,"Rich Text Document" -HKCR,rtffile\shell\open\command,,2,"%11%\wordpad.exe %1" -HKCR,rtffile\shell\print\command,,2,"%11%\wordpad.exe /p %1" +HKCR,rtffile\shell\open\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe %1" +HKCR,rtffile\shell\print\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe /p %1" HKCR,txtfile,,2,"Text Document" HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" -HKCR,wrifile\shell\open\command,,2,"%11%\wordpad.exe %1" -HKCR,wrifile\shell\print\command,,2,"%11%\wordpad.exe /p %1" +HKCR,wrifile\shell\open\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe %1" +HKCR,wrifile\shell\print\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe /p %1" HKCR,xmlfile,,2,"XML Document" HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,,"

1 0

Alexandre Julliard : wine.inf: Add quotes around the wordpad.exe path.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 754c9d7e64c511e0060f1a11ac02a2ced92d172c URL: http://source.winehq.org/git/wine.git/?a=commit;h=754c9d7e64c511e0060f1a11a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 13:30:29 2016 +0900 wine.inf: Add quotes around the wordpad.exe path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c3d602949ca00e88ae9ab11e01121389efd3925f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b3a81d85..d47b57c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -218,13 +218,13 @@ HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" HKCR,rtffile,,2,"Rich Text Document" -HKCR,rtffile\shell\open\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe %1" -HKCR,rtffile\shell\print\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe /p %1" +HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" +HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1" HKCR,txtfile,,2,"Text Document" HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" -HKCR,wrifile\shell\open\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe %1" -HKCR,wrifile\shell\print\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe /p %1" +HKCR,wrifile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" +HKCR,wrifile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1" HKCR,xmlfile,,2,"XML Document" HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,,"

1 0

André Hentschel : include: Add more OID defines.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: e3021a172dc15680c81d8a45800b5ba1b0857e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3021a172dc15680c81d8a458… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 26 20:51:02 2016 +0100 include: Add more OID defines. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ff1ecab238320705c0f7ded6e93443aeaf7165be) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/ntddndis.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/include/ntddndis.h b/include/ntddndis.h index 3ea18ce..e820a81 100644 --- a/include/ntddndis.h +++ b/include/ntddndis.h @@ -57,6 +57,62 @@ extern "C" { #define IOCTL_NDIS_RESERVED12 _NDIS_CONTROL_CODE(0x14, METHOD_BUFFERED) #define IOCTL_NDIS_RESERVED13 _NDIS_CONTROL_CODE(0x15, METHOD_BUFFERED) +#define OID_GEN_SUPPORTED_LIST 0x00010101 +#define OID_GEN_HARDWARE_STATUS 0x00010102 +#define OID_GEN_MEDIA_SUPPORTED 0x00010103 +#define OID_GEN_MEDIA_IN_USE 0x00010104 +#define OID_GEN_MAXIMUM_LOOKAHEAD 0x00010105 +#define OID_GEN_MAXIMUM_FRAME_SIZE 0x00010106 +#define OID_GEN_LINK_SPEED 0x00010107 +#define OID_GEN_TRANSMIT_BUFFER_SPACE 0x00010108 +#define OID_GEN_RECEIVE_BUFFER_SPACE 0x00010109 +#define OID_GEN_TRANSMIT_BLOCK_SIZE 0x0001010a +#define OID_GEN_RECEIVE_BLOCK_SIZE 0x0001010b +#define OID_GEN_VENDOR_ID 0x0001010c +#define OID_GEN_VENDOR_DESCRIPTION 0x0001010d +#define OID_GEN_CURRENT_PACKET_FILTER 0x0001010e +#define OID_GEN_CURRENT_LOOKAHEAD 0x0001010f +#define OID_GEN_DRIVER_VERSION 0x00010110 +#define OID_GEN_MAXIMUM_TOTAL_SIZE 0x00010111 +#define OID_GEN_PROTOCOL_OPTIONS 0x00010112 +#define OID_GEN_MAC_OPTIONS 0x00010113 +#define OID_GEN_MEDIA_CONNECT_STATUS 0x00010114 +#define OID_GEN_MAXIMUM_SEND_PACKETS 0x00010115 + +#define OID_802_3_PERMANENT_ADDRESS 0x01010101 +#define OID_802_3_CURRENT_ADDRESS 0x01010102 +#define OID_802_3_MULTICAST_LIST 0x01010103 +#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104 +#define OID_802_3_MAC_OPTIONS 0x01010105 +#define OID_802_3_RCV_ERROR_ALIGNMENT 0x01020101 +#define OID_802_3_XMIT_ONE_COLLISION 0x01020102 +#define OID_802_3_XMIT_MORE_COLLISIONS 0x01020103 +#define OID_802_3_XMIT_DEFERRED 0x01020201 +#define OID_802_3_XMIT_MAX_COLLISIONS 0x01020202 +#define OID_802_3_RCV_OVERRUN 0x01020203 +#define OID_802_3_XMIT_UNDERRUN 0x01020204 +#define OID_802_3_XMIT_HEARTBEAT_FAILURE 0x01020205 +#define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206 +#define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207 +#define OID_802_3_ADD_MULTICAST_ADDRESS 0x01010208 +#define OID_802_3_DELETE_MULTICAST_ADDRESS 0x01010209 + +#define OID_802_5_PERMANENT_ADDRESS 0x02010101 +#define OID_802_5_CURRENT_ADDRESS 0x02010102 +#define OID_802_5_CURRENT_FUNCTIONAL 0x02010103 +#define OID_802_5_CURRENT_GROUP 0x02010104 +#define OID_802_5_LAST_OPEN_STATUS 0x02010105 +#define OID_802_5_CURRENT_RING_STATUS 0x02010106 +#define OID_802_5_CURRENT_RING_STATE 0x02010107 +#define OID_802_5_LINE_ERRORS 0x02020101 +#define OID_802_5_LOST_FRAMES 0x02020102 +#define OID_802_5_BURST_ERRORS 0x02020201 +#define OID_802_5_AC_ERRORS 0x02020202 +#define OID_802_5_ABORT_DELIMETERS 0x02020203 +#define OID_802_5_FRAME_COPIED_ERRORS 0x02020204 +#define OID_802_5_FREQUENCY_ERRORS 0x02020205 +#define OID_802_5_TOKEN_ERRORS 0x02020206 +#define OID_802_5_INTERNAL_ERRORS 0x02020207 #define OID_802_11_BSSID 0x0d010101 #define OID_802_11_SSID 0x0d010102

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayAllocDescriptor().
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 2813e922f14e6e7b013b8238993e91f12fe53d22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2813e922f14e6e7b013b82389… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 10 21:47:06 2016 +0300 ole2disp: Implement SafeArrayAllocDescriptor(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d8287b55009890c63adf15f7809b527a5c5885c7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 51 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 43336c4..1774211 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -30,6 +30,7 @@ #include "ole2.h" #include "oleauto.h" #include "winerror.h" +#include "wownt32.h" #include "wine/windef16.h" #include "wine/winbase16.h" @@ -39,6 +40,56 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +#define E_OUTOFMEMORY16 MAKE_SCODE(SEVERITY_ERROR, FACILITY_NULL, 2) +#define E_INVALIDARG16 MAKE_SCODE(SEVERITY_ERROR, FACILITY_NULL, 3) + +/* 16-bit SAFEARRAY implementation */ +typedef struct tagSAFEARRAYBOUND16 +{ + ULONG cElements; + LONG lLbound; +} SAFEARRAYBOUND16; + +typedef struct tagSAFEARRAY16 +{ + USHORT cDims; + USHORT fFeatures; + USHORT cbElements; + USHORT cLocks; + ULONG handle; + SEGPTR pvData; + SAFEARRAYBOUND16 rgsabound[1]; +} SAFEARRAY16; + +static SEGPTR safearray_alloc(ULONG size) +{ + HANDLE16 h; + return WOWGlobalAllocLock16(GPTR, size, &h); +} + +/****************************************************************************** + * SafeArrayAllocDescriptor [OLE2DISP.38] + */ +HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) +{ + SAFEARRAY16 *sa; + ULONG size; + + TRACE("%u, %p\n", dims, ret); + + if (!dims) + return E_INVALIDARG16; + + size = sizeof(SAFEARRAY16) + sizeof(SAFEARRAYBOUND16) * (dims - 1); + *ret = safearray_alloc(size); + if (!*ret) + return E_OUTOFMEMORY16; + + sa = MapSL(*ret); + sa->cDims = dims; + return S_OK; +} + /* This implementation of the BSTR API is 16-bit only. It represents BSTR as a 16:16 far pointer, and the strings as ISO-8859 */ diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index e4655f0..08372c5 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -35,7 +35,7 @@ 35 pascal RegisterActiveObject(ptr ptr long ptr) RegisterActiveObject16 36 stub REVOKEACTIVEOBJECT 37 stub GETACTIVEOBJECT -38 stub SAFEARRAYALLOCDESCRIPTOR +38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16 39 stub SAFEARRAYALLOCDATA 40 stub SAFEARRAYDESTROYDESCRIPTOR 41 stub SAFEARRAYDESTROYDATA

1 0

Austin English : setupx.dll16: Add DiBuildDriverIndex stub.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: e59f0bed85e71d32d9ee306b0f98e162fea9b9b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59f0bed85e71d32d9ee306b0… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 11:48:35 2015 -0600 setupx.dll16: Add DiBuildDriverIndex stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 296ac8cf320336353fc5f5da3897c808a65556e3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupx.dll16/setupx.dll16.spec | 2 +- dlls/setupx.dll16/setupx_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/setupx.dll16/setupx.dll16.spec b/dlls/setupx.dll16/setupx.dll16.spec index 615e92f..34e6b68 100644 --- a/dlls/setupx.dll16/setupx.dll16.spec +++ b/dlls/setupx.dll16/setupx.dll16.spec @@ -205,7 +205,7 @@ 409 stub IPGETDRIVERVERSION 410 stub IpGetVersionString #(str str ptr word str) 411 pascal VcpExplain(ptr long) VcpExplain16 -412 stub DiBuildDriverIndex #(word) +412 pascal DiBuildDriverIndex(word) DiBuildDriverIndex16 413 stub DiAddSingleInfToDrvIdx #(str word word) 414 stub FCEGETFLAGS 450 stub UiMakeDlgNonBold #(word) diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c index adc5900..db15cfe 100644 --- a/dlls/setupx.dll16/setupx_main.c +++ b/dlls/setupx.dll16/setupx_main.c @@ -628,3 +628,12 @@ RETERR16 WINAPI CtlSetLddPath16(LOGDISKID16 ldid, LPSTR szPath) ldd.pszPath = szPath; return CtlSetLdd16(&ldd); } + +/*********************************************************************** + * DiBuildDriverIndex (SETUPX.412) + */ +RETERR16 WINAPI DiBuildDriverIndex16( WORD w1 ) +{ + FIXME( "%x: stub\n", w1 ); + return 0; +}

1 0

Christopher Thielen : user32: A window may be notified with WM_CAPTURECHANGED about itself if SetCapture () is called twice.
by Alexandre Julliard Feb. 2, 2016

Feb. 2, 2016

Module: wine Branch: master Commit: 9bb87cc71c95f45cd6111b28b687bd753380a4c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb87cc71c95f45cd6111b28b… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:32:51 2016 -0800 user32: A window may be notified with WM_CAPTURECHANGED about itself if SetCapture() is called twice. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 2 +- dlls/user32/tests/msg.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 40e35a9..63fae67 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -108,7 +108,7 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) { USER_Driver->pSetCapture( hwnd, gui_flags ); - if (previous && previous != hwnd) + if (previous) SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); if (prev_ret) *prev_ret = previous; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d20f28b..9990bcc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15125,6 +15125,33 @@ else flush_sequence(); } +static const struct message DoubleSetCaptureSeq[] = +{ + { WM_CAPTURECHANGED, sent }, + { 0 } +}; + +static void test_DoubleSetCapture(void) +{ + HWND hwnd; + + hwnd = CreateWindowExA(0, "TestWindowClass", "Test DoubleSetCapture", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + + ShowWindow( hwnd, SW_SHOW ); + UpdateWindow( hwnd ); + flush_events(); + flush_sequence(); + + SetCapture( hwnd ); + SetCapture( hwnd ); + ok_sequence(DoubleSetCaptureSeq, "SetCapture( hwnd ) twice", FALSE); + + DestroyWindow(hwnd); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -15265,6 +15292,7 @@ START_TEST(msg) test_layered_window(); test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); + test_DoubleSetCapture(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

1 0

Vincent Povirk : kernel32: Implement GetTimeZoneInformationForYear.
by Alexandre Julliard Feb. 2, 2016

Feb. 2, 2016

Module: wine Branch: master Commit: b922b55182ca2b51bf2599369c471b3920bfb635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b922b55182ca2b51bf2599369… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 29 14:31:27 2016 -0600 kernel32: Implement GetTimeZoneInformationForYear. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-sysinfo-l1-1-0.spec | 2 +- .../api-ms-win-core-timezone-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/time.c | 2 +- dlls/kernel32/time.c | 197 +++++++++++++++++++++ 5 files changed, 201 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-sysinfo-l1-1-0/api-ms-win-core-sysinfo-l1-1-0.spec b/dlls/api-ms-win-core-sysinfo-l1-1-0/api-ms-win-core-sysinfo-l1-1-0.spec index 5044394..cafde5e 100644 --- a/dlls/api-ms-win-core-sysinfo-l1-1-0/api-ms-win-core-sysinfo-l1-1-0.spec +++ b/dlls/api-ms-win-core-sysinfo-l1-1-0/api-ms-win-core-sysinfo-l1-1-0.spec @@ -15,7 +15,7 @@ @ stdcall -ret64 GetTickCount64() kernel32.GetTickCount64 @ stdcall GetTickCount() kernel32.GetTickCount @ stdcall GetTimeZoneInformation(ptr) kernel32.GetTimeZoneInformation -@ stub GetTimeZoneInformationForYear +@ stdcall GetTimeZoneInformationForYear(long ptr ptr) kernel32.GetTimeZoneInformationForYear @ stdcall GetVersion() kernel32.GetVersion @ stdcall GetVersionExA(ptr) kernel32.GetVersionExA @ stdcall GetVersionExW(ptr) kernel32.GetVersionExW diff --git a/dlls/api-ms-win-core-timezone-l1-1-0/api-ms-win-core-timezone-l1-1-0.spec b/dlls/api-ms-win-core-timezone-l1-1-0/api-ms-win-core-timezone-l1-1-0.spec index f93cc10..b452879 100644 --- a/dlls/api-ms-win-core-timezone-l1-1-0/api-ms-win-core-timezone-l1-1-0.spec +++ b/dlls/api-ms-win-core-timezone-l1-1-0/api-ms-win-core-timezone-l1-1-0.spec @@ -3,7 +3,7 @@ @ stdcall GetDynamicTimeZoneInformation(ptr) kernel32.GetDynamicTimeZoneInformation @ stub GetDynamicTimeZoneInformationEffectiveYears @ stdcall GetTimeZoneInformation(ptr) kernel32.GetTimeZoneInformation -@ stub GetTimeZoneInformationForYear +@ stdcall GetTimeZoneInformationForYear(long ptr ptr) kernel32.GetTimeZoneInformationForYear @ stub SetDynamicTimeZoneInformation @ stdcall SetTimeZoneInformation(ptr) kernel32.SetTimeZoneInformation @ stdcall SystemTimeToFileTime(ptr ptr) kernel32.SystemTimeToFileTime diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9171558..b0a6361 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -860,7 +860,7 @@ @ stdcall GetTimeFormatEx(wstr long ptr wstr ptr long) @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @ stdcall GetTimeZoneInformation(ptr) -# @ stub GetTimeZoneInformationForYear +@ stdcall GetTimeZoneInformationForYear(long ptr ptr) @ stdcall GetThreadUILanguage() # @ stub GetUILanguageInfo # @ stub -arch=x86_64 GetUmsCompletionListEvent diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index cd100f2..53af39c 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -921,7 +921,7 @@ static void test_GetTimeZoneInformationForYear(void) if (!pGetTimeZoneInformationForYear || !pGetDynamicTimeZoneInformation) { - todo_wine win_skip("GetTimeZoneInformationForYear not available\n"); + win_skip("GetTimeZoneInformationForYear not available\n"); return; } diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index ac39fde..b7a7918 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -282,6 +282,179 @@ static BOOL TIME_GetTimezoneBias( const TIME_ZONE_INFORMATION *pTZinfo, return TRUE; } +/*********************************************************************** + * TIME_GetSpecificTimeZoneKey + * + * Opens the registry key for the time zone with the given name. + * + * PARAMS + * key_name [in] The time zone name. + * result [out] The open registry key handle. + * + * RETURNS + * TRUE if successful. + */ +static BOOL TIME_GetSpecificTimeZoneKey( const WCHAR *key_name, HANDLE *result ) +{ + static const WCHAR Time_ZonesW[] = { '\\','R','E','G','I','S','T','R','Y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'T','i','m','e',' ','Z','o','n','e','s',0 }; + HANDLE time_zones_key; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + NTSTATUS status; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, Time_ZonesW ); + status = NtOpenKey( &time_zones_key, KEY_READ, &attr ); + if (status) + { + WARN("Unable to open the time zones key\n"); + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + attr.RootDirectory = time_zones_key; + RtlInitUnicodeString( &nameW, key_name ); + status = NtOpenKey( result, KEY_READ, &attr ); + + NtClose( time_zones_key ); + + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + return TRUE; +} + +static BOOL reg_query_value(HKEY hkey, LPCWSTR name, DWORD type, void *data, DWORD count) +{ + UNICODE_STRING nameW; + char buf[256]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buf; + NTSTATUS status; + + if (count > sizeof(buf) - sizeof(KEY_VALUE_PARTIAL_INFORMATION)) + return FALSE; + + RtlInitUnicodeString(&nameW, name); + + if ((status = NtQueryValueKey(hkey, &nameW, KeyValuePartialInformation, + buf, sizeof(buf), &count))) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + if (info->Type != type) + { + SetLastError( ERROR_DATATYPE_MISMATCH ); + return FALSE; + } + + memcpy(data, info->Data, info->DataLength); + return TRUE; +} + +/*********************************************************************** + * TIME_GetSpecificTimeZoneInfo + * + * Returns time zone information for the given time zone and year. + * + * PARAMS + * key_name [in] The time zone name. + * year [in] The year, if Dynamic DST is used. + * dynamic [in] Whether to use Dynamic DST. + * result [out] The time zone information. + * + * RETURNS + * TRUE if successful. + */ +static BOOL TIME_GetSpecificTimeZoneInfo( const WCHAR *key_name, WORD year, + BOOL dynamic, DYNAMIC_TIME_ZONE_INFORMATION *tzinfo ) +{ + static const WCHAR Dynamic_DstW[] = { 'D','y','n','a','m','i','c',' ','D','S','T',0 }; + static const WCHAR fmtW[] = { '%','d',0 }; + static const WCHAR stdW[] = { 'S','t','d',0 }; + static const WCHAR dltW[] = { 'D','l','t',0 }; + static const WCHAR tziW[] = { 'T','Z','I',0 }; + HANDLE time_zone_key, dynamic_dst_key; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + WCHAR yearW[16]; + BOOL got_reg_data = FALSE; + struct tz_reg_data + { + LONG bias; + LONG std_bias; + LONG dlt_bias; + SYSTEMTIME std_date; + SYSTEMTIME dlt_date; + } tz_data; + + if (!TIME_GetSpecificTimeZoneKey( key_name, &time_zone_key )) + return FALSE; + + if (!reg_query_value( time_zone_key, stdW, REG_SZ, tzinfo->StandardName, sizeof(tzinfo->StandardName)) || + !reg_query_value( time_zone_key, dltW, REG_SZ, tzinfo->DaylightName, sizeof(tzinfo->DaylightName))) + { + NtClose( time_zone_key ); + return FALSE; + } + + lstrcpyW(tzinfo->TimeZoneKeyName, key_name); + + if (dynamic) + { + attr.Length = sizeof(attr); + attr.RootDirectory = time_zone_key; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, Dynamic_DstW ); + if (!NtOpenKey( &dynamic_dst_key, KEY_READ, &attr )) + { + sprintfW( yearW, fmtW, year ); + got_reg_data = reg_query_value( dynamic_dst_key, yearW, REG_BINARY, &tz_data, sizeof(tz_data) ); + + NtClose( dynamic_dst_key ); + } + } + + if (!got_reg_data) + { + if (!reg_query_value( time_zone_key, tziW, REG_BINARY, &tz_data, sizeof(tz_data) )) + { + NtClose( time_zone_key ); + return FALSE; + } + } + + tzinfo->Bias = tz_data.bias; + tzinfo->StandardBias = tz_data.std_bias; + tzinfo->DaylightBias = tz_data.dlt_bias; + tzinfo->StandardDate = tz_data.std_date; + tzinfo->DaylightDate = tz_data.dlt_date; + + tzinfo->DynamicDaylightTimeDisabled = !dynamic; + + NtClose( time_zone_key ); + + return TRUE; +} + /*********************************************************************** * SetLocalTime (KERNEL32.@) @@ -418,6 +591,30 @@ DWORD WINAPI GetTimeZoneInformation( LPTIME_ZONE_INFORMATION tzinfo ) } /*********************************************************************** + * GetTimeZoneInformationForYear (KERNEL32.@) + */ +BOOL WINAPI GetTimeZoneInformationForYear( USHORT wYear, + PDYNAMIC_TIME_ZONE_INFORMATION pdtzi, LPTIME_ZONE_INFORMATION ptzi ) +{ + DYNAMIC_TIME_ZONE_INFORMATION local_dtzi, result; + + if (!pdtzi) + { + if (GetDynamicTimeZoneInformation(&local_dtzi) == TIME_ZONE_ID_INVALID) + return FALSE; + pdtzi = &local_dtzi; + } + + if (!TIME_GetSpecificTimeZoneInfo(pdtzi->TimeZoneKeyName, wYear, + !pdtzi->DynamicDaylightTimeDisabled, &result)) + return FALSE; + + memcpy(ptzi, &result, sizeof(*ptzi)); + + return TRUE; +} + +/*********************************************************************** * SetTimeZoneInformation (KERNEL32.@) * * Change the settings of the current local time zone.

1 0