April 2016 - Wine-Commits - list.winehq.org

Julian Rüger : German translation for release 1.9.7
by Jeremy Newman April 12, 2016

April 12, 2016

Module: website Branch: master Commit: e01e9cee1d41bb377314ec69b18d45f1898067de URL: http://source.winehq.org/git/website.git/?a=commit;h=e01e9cee1d41bb377314ec… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Apr 9 12:41:24 2016 +0200 German translation for release 1.9.7 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016040201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2016040201.xml b/news/de/2016040201.xml new file mode 100644 index 0000000..b8df339 --- /dev/null +++ b/news/de/2016040201.xml @@ -0,0 +1,17 @@ +<news> +<date>2. April 2016</date> +<title>Wine 1.9.7 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.7 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.7">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Mehr Arbeit in Richtung des WineD3D-Command-Stream.</li> + <li>Bessere Unterstützung von Shader-Model-5-Shadern.</li> + <li>C++-Ausnahmebehandlung unter x86-64.</li> + <li>Unterstützung von Windows-artigen Static-Import-Libraries.</li> + <li>Performance-Korrekturen am XML-Writer.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.7.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.8.2
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: website Branch: master Commit: 18977e8b07fecbda297be00bbae9645cd23b8efe URL: http://source.winehq.org/git/website.git/?a=commit;h=18977e8b07fecbda297be0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 12 20:45:38 2016 +0900 Wine release 1.8.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016041201.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2016041201.xml b/news/en/2016041201.xml new file mode 100644 index 0000000..910d84c --- /dev/null +++ b/news/en/2016041201.xml @@ -0,0 +1,13 @@ +<news> +<date>April 12, 2016</date> +<title>Wine 1.8.2 Released</title> +<body> + The Wine maintenance release 1.8.2 is now available. + <a href="{$root}/announce/1.8.2">What's new</a> in this release: +<ul> + <li>Various bug fixes.</li> + <li>Small translation updates.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : secur32/tests: Don' t check the exact number of cipher bits.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 9a8220c4ed66146627c5d7ad2bf1da1a91add5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8220c4ed66146627c5d7ad2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 18:20:29 2015 +0100 secur32/tests: Don't check the exact number of cipher bits. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9ab03dd7bbded6f9a2a93e5fec2f60b61125140a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/tests/schannel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 35100f7..51c22d5 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -927,8 +927,7 @@ todo_wine status = pQueryContextAttributesA(&context, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_CONNECTION_INFO) failed: %08x\n", status); if(status == SEC_E_OK) { - ok(conn_info.dwCipherStrength == 128 || conn_info.dwCipherStrength == 168, - "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); + ok(conn_info.dwCipherStrength >= 128, "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); }

1 0

Hans Leidekker : winhttp/tests: Fix test failures.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 23bd4cc385ec2ce080184c693b84a33bdf2c8ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23bd4cc385ec2ce080184c693… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 17 10:13:59 2016 +0100 winhttp/tests: Fix test failures. These were introduced with the web server upgrade. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 05a13fb1558f19687f2a22c6566ed81108f5a5e0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 9442085..ec204b5 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1004,11 +1004,13 @@ static void test_secure_connection(void) ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(!ret || proxy_active(), "succeeded unexpectedly\n"); + ok(ret, "failed to receive response %u\n", GetLastError()); - size = 0; - ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); - ok(!ret, "succeeded unexpectedly\n"); + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "header query failed %u\n", GetLastError()); + ok(status == HTTP_STATUS_BAD_REQUEST, "got %u\n", status); WinHttpCloseHandle(req);

1 0

Andrew Eikum : ntdll: Implement SystemLogicalProcessorInformationEx.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: d16ff97e7a7bcba578f61f481213fb9810754463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16ff97e7a7bcba578f61f481… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 25 08:47:10 2016 -0600 ntdll: Implement SystemLogicalProcessorInformationEx. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a124064ce5e1c83fa453da5610712b303e65de30) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 5 + dlls/kernel32/tests/process.c | 7 +- dlls/ntdll/nt.c | 606 ++++++++++++++++++++++++++++-------------- dlls/ntdll/tests/info.c | 61 ++++- 4 files changed, 474 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d16ff97e7a7bcba578f61…

1 0

Nikolay Sivov : kernel32: Forward GetLogicalProcessorInformationEx() to ntdll.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: ebcc9c52517d5c19d2d0457f0ab784e642a4ada1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcc9c52517d5c19d2d0457f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 4 01:56:48 2016 +0300 kernel32: Forward GetLogicalProcessorInformationEx() to ntdll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae1fe69e3952e13e8361a25058d24e2d2ed6f79c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 23 +++++++++++++++++++---- dlls/kernel32/tests/process.c | 8 +++++++- dlls/ntdll/tests/info.c | 7 +++++++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 89ae5c4..7795b47 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3836,11 +3836,26 @@ BOOL WINAPI GetLogicalProcessorInformation(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION /*********************************************************************** * GetLogicalProcessorInformationEx (KERNEL32.@) */ -BOOL WINAPI GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP relationship, PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX buffer, PDWORD pBufLen) +BOOL WINAPI GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP relationship, SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *buffer, DWORD *len) { - FIXME("(%u,%p,%p): stub\n", relationship, buffer, pBufLen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS status; + + TRACE("(%u,%p,%p)\n", relationship, buffer, len); + + if (!len) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + status = NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), + buffer, *len, len ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; } /*********************************************************************** diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a6e731c..1ef9530 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2982,9 +2982,15 @@ static void test_GetLogicalProcessorInformationEx(void) } ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, NULL); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); len = 0; + ret = pGetLogicalProcessorInformationEx(RelationProcessorCore, NULL, &len); +todo_wine { + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %d\n", ret, GetLastError()); + ok(len > 0, "got %u\n", len); +} + len = 0; ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, &len); todo_wine { ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %d\n", ret, GetLastError()); diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 32355cb..96c9c5e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -687,6 +687,13 @@ static void test_query_logicalprocex(void) return; len = 0; + relationship = RelationProcessorCore; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len); +todo_wine { + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); + ok(len > 0, "got %u\n", len); +} + len = 0; relationship = RelationAll; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len); todo_wine {

1 0

Piotr Caban : msvcr110: Add _W_Gettnames implementation.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 93fb9cd15ea3b66aba7a8e0c438da2302c603b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93fb9cd15ea3b66aba7a8e0c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 11:42:14 2016 +0100 msvcr110: Add _W_Gettnames implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 59ed8c593c8c5d7d7de2ecde6a283d9d4276661f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 53 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/locale.c | 8 ++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index b619703..6ae7a08 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -4,7 +4,7 @@ @ cdecl _Strftime(str long str ptr ptr) ucrtbase._Strftime @ cdecl _W_Getdays() ucrtbase._W_Getdays @ cdecl _W_Getmonths() ucrtbase._W_Getmonths -@ stub _W_Gettnames +@ cdecl _W_Gettnames() ucrtbase._W_Gettnames @ stub _Wcsftime @ cdecl __daylight() ucrtbase.__daylight @ cdecl __dstbias() ucrtbase.__dstbias diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8a4ee4a..cd56cf8 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -866,7 +866,7 @@ @ stub _Unlock_shared_ptr_spin_lock @ cdecl _W_Getdays() @ cdecl _W_Getmonths() -@ stub _W_Gettnames +@ cdecl _W_Gettnames() @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) @ cdecl __AdjustPointer(ptr ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 47f79ca..5f69b0d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -850,7 +850,7 @@ @ cdecl _Strftime(str long str ptr ptr) @ cdecl _W_Getdays() @ cdecl _W_Getmonths() -@ stub _W_Gettnames +@ cdecl _W_Gettnames() @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) @ cdecl __AdjustPointer(ptr ptr) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 330c6b1..d6936f5 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -24,6 +24,7 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #include "wine/test.h" #include <locale.h> @@ -65,6 +66,8 @@ static int (CDECL *p__dsign)(double); static int (CDECL *p__fdsign)(float); static wchar_t** (CDECL *p____lc_locale_name_func)(void); static unsigned int (CDECL *p__GetConcurrency)(void); +static void* (CDECL *p__W_Gettnames)(void); +static void (CDECL *p_free)(void*); static BOOL init(void) { @@ -84,6 +87,8 @@ static BOOL init(void) p__fdsign = (void*)GetProcAddress(module, "_fdsign"); p____lc_locale_name_func = (void*)GetProcAddress(module, "___lc_locale_name_func"); p__GetConcurrency = (void*)GetProcAddress(module,"?_GetConcurrency(a)details@Concurrency@@YAIXZ"); + p__W_Gettnames = (void*)GetProcAddress(module, "_W_Gettnames"); + p_free = (void*)GetProcAddress(module, "free"); return TRUE; } @@ -233,6 +238,53 @@ static void test__GetConcurrency(void) ok(c == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, c); } +static void test__W_Gettnames(void) +{ + static const char *str[] = { + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", + "Sunday", "Monday", "Tuesday", "Wednesday", + "Thursday", "Friday", "Saturday", + "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", + "January", "February", "March", "April", "May", "June", "July", + "August", "September", "October", "November", "December", + "AM", "PM", "M/d/yyyy" + }; + + struct { + char *str[43]; + int unk[2]; + wchar_t *wstr[43]; + wchar_t *locname; + char data[1]; + } *ret; + int i, size; + WCHAR buf[64]; + + if(!p_setlocale(LC_ALL, "english")) + return; + + ret = p__W_Gettnames(); + size = ret->str[0]-(char*)ret; + if(sizeof(void*) == 8) + ok(size==0x2c0, "structure size: %x\n", size); + else + ok(size==0x164, "structure size: %x\n", size); + + for(i=0; i<sizeof(str)/sizeof(*str); i++) { + ok(!strcmp(ret->str[i], str[i]), "ret->str[%d] = %s, expected %s\n", + i, ret->str[i], str[i]); + + MultiByteToWideChar(CP_ACP, 0, str[i], strlen(str[i])+1, + buf, sizeof(buf)/sizeof(*buf)); + ok(!lstrcmpW(ret->wstr[i], buf), "ret->wstr[%d] = %s, expected %s\n", + i, wine_dbgstr_w(ret->wstr[i]), wine_dbgstr_w(buf)); + } + p_free(ret); + + p_setlocale(LC_ALL, "C"); +} + START_TEST(msvcr120) { if (!init()) return; @@ -240,4 +292,5 @@ START_TEST(msvcr120) test__dsign(); test____lc_locale_name_func(); test__GetConcurrency(); + test__W_Gettnames(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 6447c0d..9aa0978 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -844,7 +844,7 @@ @ cdecl _Strftime(str long str ptr ptr) msvcr120._Strftime @ cdecl _W_Getdays() msvcr120._W_Getdays @ cdecl _W_Getmonths() msvcr120._W_Getmonths -@ stub _W_Gettnames +@ cdecl _W_Gettnames() msvcr120._W_Gettnames @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) msvcr120._XcptFilter @ cdecl __AdjustPointer(ptr ptr) msvcr120.__AdjustPointer diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e1a0fbe..a1551c2 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -580,6 +580,14 @@ void* CDECL _Gettnames(void) } /********************************************************************* + * _W_Gettnames (MSVCR110.@) + */ +void* CDECL _W_Gettnames(void) +{ + return _Gettnames(); +} + +/********************************************************************* * __crtLCMapStringA (MSVCRT.@) */ int CDECL __crtLCMapStringA( diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 44b01af..5bad345 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -43,7 +43,7 @@ @ cdecl _Strftime(str long str ptr ptr) @ cdecl _W_Getdays() @ cdecl _W_Getmonths() -@ stub _W_Gettnames +@ cdecl _W_Gettnames() @ stub _Wcsftime @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject

1 0

Piotr Caban : msvcr110: Fix __lc_time_data definition.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: eccfab534130c95668d1d0f8d97934088d445f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eccfab534130c95668d1d0f8d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 11:42:08 2016 +0100 msvcr110: Fix __lc_time_data definition. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d4450b9195bd2209f5a874b31e2e82420cf5dd38) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/locale.c | 9 +++++++++ dlls/msvcrt/msvcrt.h | 5 +++++ dlls/msvcrt/time.c | 22 ++++++++++++++++++---- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b00bc78..e1a0fbe 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1528,6 +1528,9 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, size += ret*sizeof(MSVCRT_wchar_t); } } +#if _MSVCR_VER >= 110 + size += LCIDToLocaleName(lcid[MSVCRT_LC_TIME], NULL, 0, 0)*sizeof(MSVCRT_wchar_t); +#endif locinfo->lc_time_curr = MSVCRT_malloc(size); if(!locinfo->lc_time_curr) { @@ -1568,7 +1571,13 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, (MSVCRT_wchar_t*)&locinfo->lc_time_curr->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); } } +#if _MSVCR_VER >= 110 + locinfo->lc_time_curr->locname = (MSVCRT_wchar_t*)&locinfo->lc_time_curr->data[ret]; + LCIDToLocaleName(lcid[MSVCRT_LC_TIME], locinfo->lc_time_curr->locname, + (size-ret)/sizeof(MSVCRT_wchar_t), 0); +#else locinfo->lc_time_curr->lcid = lcid[MSVCRT_LC_TIME]; +#endif } return locinfo; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index e30e675..aff1741 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -132,7 +132,9 @@ typedef struct { char *time; } names; } str; +#if _MSVCR_VER < 110 LCID lcid; +#endif int unk[2]; union { MSVCRT_wchar_t *wstr[43]; @@ -148,6 +150,9 @@ typedef struct { MSVCRT_wchar_t *time; } names; } wstr; +#if _MSVCR_VER >= 110 + MSVCRT_wchar_t *locname; +#endif char data[1]; } MSVCRT___lc_time_data; diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 7fed3b3..50a27ec 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -946,6 +946,7 @@ static inline BOOL strftime_date(char *str, MSVCRT_size_t *pos, MSVCRT_size_t ma char *format; SYSTEMTIME st; MSVCRT_size_t ret; + LCID lcid; st.wYear = mstm->tm_year + 1900; st.wMonth = mstm->tm_mon + 1; @@ -956,10 +957,16 @@ static inline BOOL strftime_date(char *str, MSVCRT_size_t *pos, MSVCRT_size_t ma st.wSecond = mstm->tm_sec; st.wMilliseconds = 0; +#if _MSVCR_VER < 110 + lcid = time_data->lcid; +#else + lcid = LocaleNameToLCID(time_data->locname, 0); +#endif + format = alternate ? time_data->str.names.date : time_data->str.names.short_date; - ret = GetDateFormatA(time_data->lcid, 0, &st, format, NULL, 0); + ret = GetDateFormatA(lcid, 0, &st, format, NULL, 0); if(ret && ret<max-*pos) - ret = GetDateFormatA(time_data->lcid, 0, &st, format, str+*pos, max-*pos); + ret = GetDateFormatA(lcid, 0, &st, format, str+*pos, max-*pos); if(!ret) { *str = 0; *MSVCRT__errno() = MSVCRT_EINVAL; @@ -978,6 +985,7 @@ static inline BOOL strftime_time(char *str, MSVCRT_size_t *pos, MSVCRT_size_t ma { SYSTEMTIME st; MSVCRT_size_t ret; + LCID lcid; st.wYear = mstm->tm_year + 1900; st.wMonth = mstm->tm_mon + 1; @@ -988,9 +996,15 @@ static inline BOOL strftime_time(char *str, MSVCRT_size_t *pos, MSVCRT_size_t ma st.wSecond = mstm->tm_sec; st.wMilliseconds = 0; - ret = GetTimeFormatA(time_data->lcid, 0, &st, time_data->str.names.time, NULL, 0); +#if _MSVCR_VER < 110 + lcid = time_data->lcid; +#else + lcid = LocaleNameToLCID(time_data->locname, 0); +#endif + + ret = GetTimeFormatA(lcid, 0, &st, time_data->str.names.time, NULL, 0); if(ret && ret<max-*pos) - ret = GetTimeFormatA(time_data->lcid, 0, &st, time_data->str.names.time, + ret = GetTimeFormatA(lcid, 0, &st, time_data->str.names.time, str+*pos, max-*pos); if(!ret) { *str = 0;

1 0

Alistair Leslie-Hughes : gdiplus: Implement GdipSetPenTransform.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: e4d0ac3671fdb2de2d9e7902fb8cc044edef4859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d0ac3671fdb2de2d9e7902f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 5 18:20:46 2016 +1100 gdiplus: Implement GdipSetPenTransform. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 36c068193dbc81792621dd0a5240fad43afa2979) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/pen.c | 6 ++++-- dlls/gdiplus/tests/pen.c | 9 ++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 47e91ec..a285bd8 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -442,9 +442,11 @@ GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) return InvalidParameter; if(!(calls++)) - FIXME("not implemented\n"); + FIXME("(%p,%p) Semi-stub\n", pen, matrix); - return NotImplemented; + pen->transform = *matrix; + + return Ok; } GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 1e63560..691386a 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -394,21 +394,20 @@ static void test_transform(void) GdipCreateMatrix2(3.0, -2.0, 5.0, 2.0, 6.0, 3.0, &matrix2); status = GdipSetPenTransform(pen, matrix2); - todo_wine expect(Ok, status); + expect(Ok, status); GdipDeleteMatrix(matrix2); status = GdipGetPenTransform(pen, matrix); expect(Ok, status); status = GdipGetMatrixElements(matrix, values); expect(Ok, status); -todo_wine { expectf(3.0, values[0]); expectf(-2.0, values[1]); expectf(5.0, values[2]); expectf(2.0, values[3]); expectf(6.0, values[4]); expectf(3.0, values[5]); -} + status = GdipResetPenTransform(pen); todo_wine expect(Ok, status); @@ -416,14 +415,14 @@ todo_wine { expect(Ok, status); status = GdipGetMatrixElements(matrix, values); expect(Ok, status); - +todo_wine { expectf(1.0, values[0]); expectf(0.0, values[1]); expectf(0.0, values[2]); expectf(1.0, values[3]); expectf(0.0, values[4]); expectf(0.0, values[5]); - +} GdipDeletePen(pen); GdipDeleteMatrix(matrix);

1 0

Alistair Leslie-Hughes : gdiplus/tests: Add Pen Transform tests.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 1b5f9745e1243d0be60976334f4cdefd79ee1039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5f9745e1243d0be60976334… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jan 24 18:23:58 2016 +1100 gdiplus/tests: Add Pen Transform tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a4d95074b9b4b2f30060b9a534cf79e72fe8fef9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/tests/pen.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 90d57d6..6eee2ea 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -366,6 +366,69 @@ static void test_compoundarray(void) GdipDeletePen(pen); } +static void test_transform(void) +{ + GpStatus status; + GpPen *pen; + GpMatrix *matrix, *matrix2; + REAL values[6]; + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + + status = GdipGetPenTransform(pen, matrix); + todo_wine expect(Ok, status); + + status = GdipGetMatrixElements(matrix, values); + expect(Ok, status); + + expectf(1.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(1.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); + + GdipCreateMatrix2(3.0, -2.0, 5.0, 2.0, 6.0, 3.0, &matrix2); + status = GdipSetPenTransform(pen, matrix2); + todo_wine expect(Ok, status); + GdipDeleteMatrix(matrix2); + + status = GdipGetPenTransform(pen, matrix); + todo_wine expect(Ok, status); + status = GdipGetMatrixElements(matrix, values); + expect(Ok, status); +todo_wine { + expectf(3.0, values[0]); + expectf(-2.0, values[1]); + expectf(5.0, values[2]); + expectf(2.0, values[3]); + expectf(6.0, values[4]); + expectf(3.0, values[5]); +} + status = GdipResetPenTransform(pen); + todo_wine expect(Ok, status); + + status = GdipGetPenTransform(pen, matrix); + todo_wine expect(Ok, status); + status = GdipGetMatrixElements(matrix, values); + expect(Ok, status); + + expectf(1.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(1.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); + + GdipDeletePen(pen); + + GdipDeleteMatrix(matrix); +} + START_TEST(pen) { struct GdiplusStartupInput gdiplusStartupInput; @@ -387,6 +450,7 @@ START_TEST(pen) test_customcap(); test_penfilltype(); test_compoundarray(); + test_transform(); GdiplusShutdown(gdiplusToken); }

1 0