wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Nikolay Sivov : kernel32/nls: Fix shortest day names for Thai and Vietnamese.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 45edebfb4f07ab3533821e50b20369482df91d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=45edebfb4f07ab3533821e50b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 08:42:34 2016 +0300 kernel32/nls: Fix shortest day names for Thai and Vietnamese. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/tha.nls | 16 ++++++++-------- dlls/kernel32/nls/vit.nls | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls index 7e2e6ad..1b35e19 100644 --- a/dlls/kernel32/nls/tha.nls +++ b/dlls/kernel32/nls/tha.nls @@ -134,13 +134,13 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Thai;" LOCALE_SSHORTDATE "d/M/yyyy" - LOCALE_SSHORTESTDAYNAME1 "จ." - LOCALE_SSHORTESTDAYNAME2 "อ." - LOCALE_SSHORTESTDAYNAME3 "พ." - LOCALE_SSHORTESTDAYNAME4 "พฤ." - LOCALE_SSHORTESTDAYNAME5 "ศ." - LOCALE_SSHORTESTDAYNAME6 "ส." - LOCALE_SSHORTESTDAYNAME7 "อา." + LOCALE_SSHORTESTDAYNAME1 "จ" + LOCALE_SSHORTESTDAYNAME2 "อ" + LOCALE_SSHORTESTDAYNAME3 "พ" + LOCALE_SSHORTESTDAYNAME4 "พฤ" + LOCALE_SSHORTESTDAYNAME5 "ศ" + LOCALE_SSHORTESTDAYNAME6 "ส" + LOCALE_SSHORTESTDAYNAME7 "อา" LOCALE_SSHORTTIME "H:mm" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," @@ -160,7 +160,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls index 89b030c..b66c796 100644 --- a/dlls/kernel32/nls/vit.nls +++ b/dlls/kernel32/nls/vit.nls @@ -134,13 +134,13 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;" LOCALE_SSHORTDATE "dd/MM/yyyy" - LOCALE_SSHORTESTDAYNAME1 "hai" - LOCALE_SSHORTESTDAYNAME2 "ba" - LOCALE_SSHORTESTDAYNAME3 "tư" - LOCALE_SSHORTESTDAYNAME4 "năm" - LOCALE_SSHORTESTDAYNAME5 "sáu" - LOCALE_SSHORTESTDAYNAME6 "bảy" - LOCALE_SSHORTESTDAYNAME7 "cn" + LOCALE_SSHORTESTDAYNAME1 "H" + LOCALE_SSHORTESTDAYNAME2 "B" + LOCALE_SSHORTESTDAYNAME3 "T" + LOCALE_SSHORTESTDAYNAME4 "N" + LOCALE_SSHORTESTDAYNAME5 "S" + LOCALE_SSHORTESTDAYNAME6 "B" + LOCALE_SSHORTESTDAYNAME7 "C" LOCALE_SSHORTTIME "h:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "." @@ -160,7 +160,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian"

1 0

Ken Thomases : winex11: Fix logic of whether to use XUnmapWindow() or XWithdrawWindow() in make_window_embedded().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: daa351ee82c1b699fb34652ca91ae5cb93b1dbab URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa351ee82c1b699fb34652ca… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 16 22:34:26 2016 -0500 winex11: Fix logic of whether to use XUnmapWindow() or XWithdrawWindow() in make_window_embedded(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4789f98..59affca 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1174,7 +1174,7 @@ void make_window_embedded( struct x11drv_win_data *data ) /* the window cannot be mapped before being embedded */ if (data->mapped) { - if (data->managed) XUnmapWindow( data->display, data->whole_window ); + if (!data->managed) XUnmapWindow( data->display, data->whole_window ); else XWithdrawWindow( data->display, data->whole_window, data->vis.screen ); data->net_wm_state = 0; }

1 0

Andrey Gusev : secur32: Fix a typo in comment.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: d987cc3d83bd234d1c81a4262fd66a36a8c9341a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d987cc3d83bd234d1c81a4262… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 16 22:38:02 2016 +0300 secur32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/ntlm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index a38d81a..d24c763 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1460,7 +1460,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_RevertSecurityContext(PCtxtHandle phContex * As both MakeSignature and VerifySignature need this, but different keys * are needed for NTLM2, the logic goes into a helper function. * To ensure maximal reusability, we can specify the direction as NTLM_SEND for - * signing/encrypting and NTLM_RECV for verfying/decrypting. When encrypting, + * signing/encrypting and NTLM_RECV for verifying/decrypting. When encrypting, * the signature is encrypted after the message was encrypted, so * CreateSignature shouldn't do it. In this case, encrypt_sig can be set to * false.

1 0

Andrey Gusev : kernel32/tests: Fix a typo in comment.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: a7f0dc8c3b23cc7dd2a95ec9c1410ca4ba3d7baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f0dc8c3b23cc7dd2a95ec9c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 16 16:42:44 2016 +0300 kernel32/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 2631aa3..61dcdc2 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2991,7 +2991,7 @@ static void test_process_info(void) sizeof(buf) /* ProcessHandleTracing */, sizeof(ULONG) /* ProcessIoPriority */, sizeof(ULONG) /* ProcessExecuteFlags */, -#if 0 /* FIXME: Add remaning classes */ +#if 0 /* FIXME: Add remaining classes */ ProcessResourceManagement, sizeof(ULONG) /* ProcessCookie */, sizeof(SECTION_IMAGE_INFORMATION) /* ProcessImageInformation */,

1 0

Kirill Smirnov : winhlp32: Fix an uninitialized variable (clang).
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 85c67cca96b2010cd885a6789def5ba1444ab1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c67cca96b2010cd885a6789… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Mon May 9 19:09:46 2016 +0300 winhlp32: Fix an uninitialized variable (clang). Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/winhelp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index b7d99e8..dc6777b 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -986,6 +986,7 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam popup = Globals.active_popup; Globals.active_popup = NULL; WINHELP_ReleaseWindow(popup); + if (lret) *lret = 1; return TRUE; } return FALSE;

1 0

Kirill Smirnov : winhlp32: Do not pass NULL to strchr() (spotted by clang) .
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 5a3ad0ecf08c00fc0b7b2f24e55be27b7c3f5da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3ad0ecf08c00fc0b7b2f24e… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Mon May 9 18:56:14 2016 +0300 winhlp32: Do not pass NULL to strchr() (spotted by clang). Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/macro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index f0a6893..5a25d6c 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -607,7 +607,7 @@ static void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id) LPSTR ptr; WINE_TRACE("(%s, %s)\n", debugstr_a(lpszPathWindow), debugstr_a(topic_id)); - if ((ptr = strchr(lpszPathWindow, '>')) != NULL) + if (lpszPathWindow && (ptr = strchr(lpszPathWindow, '>')) != NULL) { LPSTR tmp; size_t sz;

1 0

Kirill Smirnov : regedit: Fix an out-of-bounds array access (clang).
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: fe517f9256e9b9aaa32afb05b01198eec3e5ea17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe517f9256e9b9aaa32afb05b… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Mon May 9 19:50:44 2016 +0300 regedit: Fix an out-of-bounds array access (clang). Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index acff701..2cbd4bb 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -105,8 +105,8 @@ static void get_file_name(CHAR **command_line, CHAR *file_name) } } memcpy(file_name, *command_line, pos * sizeof((*command_line)[0])); - /* remove the last backslash */ - if (file_name[pos - 1] == '\\') { + /* Terminate the string and remove the trailing backslash */ + if (pos > 0 && file_name[pos - 1] == '\\') { file_name[pos - 1] = '\0'; } else { file_name[pos] = '\0';

1 0

Maarten Lankhorst : dsound: Fixup IDirectSoundCaptureBuffer_QueryInterface.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 0adf2af7ff1fe6a5d1ace4c2324c68ecffb76d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adf2af7ff1fe6a5d1ace4c23… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Mon May 16 09:55:43 2016 -0500 dsound: Fixup IDirectSoundCaptureBuffer_QueryInterface. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/capture.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 0764261..412b59e 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -50,7 +50,7 @@ typedef struct IDirectSoundCaptureBufferImpl IDirectSoundCaptureBuffer8 IDirectSoundCaptureBuffer8_iface; IDirectSoundNotify IDirectSoundNotify_iface; LONG numIfaces; /* "in use interfaces" refcount */ - LONG ref, refn; + LONG ref, refn, has_dsc8; /* IDirectSoundCaptureBuffer fields */ DirectSoundCaptureDevice *device; DSCBUFFERDESC *pdscbd; @@ -240,8 +240,9 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_QueryInterface(IDirectSoundC *ppobj = NULL; - if ( IsEqualGUID( &IID_IDirectSoundCaptureBuffer, riid ) || - IsEqualGUID( &IID_IDirectSoundCaptureBuffer8, riid ) ) { + if ( IsEqualIID( &IID_IUnknown, riid ) || + IsEqualIID( &IID_IDirectSoundCaptureBuffer, riid ) || + (This->has_dsc8 && IsEqualIID( &IID_IDirectSoundCaptureBuffer8, riid )) ) { IDirectSoundCaptureBuffer8_AddRef(iface); *ppobj = iface; return S_OK; @@ -1233,6 +1234,8 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer(IDirectSoundCa if (hr != DS_OK) WARN("IDirectSoundCaptureBufferImpl_Create failed\n"); + else + This->device->capture_buffer->has_dsc8 = This->has_dsc8; return hr; }

1 0

Maarten Lankhorst : dsound: Fixup DSOUND_WaveQueue checks.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: a330b011435e18372f434635c80a1eceea8ffd9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a330b011435e18372f434635c… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Mon May 16 09:55:26 2016 -0500 dsound: Fixup DSOUND_WaveQueue checks. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/mixer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index dec8ffd..4ca0af1 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -621,16 +621,18 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes) hr = IAudioRenderClient_GetBuffer(device->render, bytes / device->pwfx->nBlockAlign, &buffer); if(FAILED(hr)){ WARN("GetBuffer failed: %08x\n", hr); - goto done; + return; } memcpy(buffer, pos, bytes); hr = IAudioRenderClient_ReleaseBuffer(device->render, bytes / device->pwfx->nBlockAlign, 0); - if(FAILED(hr)) - WARN("ReleaseBuffer failed: %08x\n", hr); + if(FAILED(hr)) { + ERR("ReleaseBuffer failed: %08x\n", hr); + IAudioRenderClient_ReleaseBuffer(device->render, 0, 0); + return; + } -done: device->pad += bytes; }

1 0

Jacek Caban : wininet: Added test of cookies with long URL.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 238a462d2b903264e8fbcf5aef00bdea8d768ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=238a462d2b903264e8fbcf5ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:46:08 2016 +0200 wininet: Added test of cookies with long URL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 37490c2..d762768 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -614,6 +614,7 @@ static void test_cookie_attrs(void) static void test_cookie_url(void) { + char long_url[5000] = "http://long.url.test.com/", *p; WCHAR bufw[512]; char buf[512]; DWORD len; @@ -640,6 +641,23 @@ static void test_cookie_url(void) res = pInternetGetCookieExW(about_blankW, NULL, bufw, &len, 0, NULL); ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, "InternetGetCookeExW failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + + p = long_url + strlen(long_url); + memset(p, 'x', long_url+sizeof(long_url)-p); + p += (long_url+sizeof(long_url)-p) - 3; + p[0] = '/'; + p[2] = 0; + res = InternetSetCookieA(long_url, NULL, "A=B"); + ok(res, "InternetSetCookieA failed: %u\n", GetLastError()); + + len = sizeof(buf); + res = InternetGetCookieA(long_url, NULL, buf, &len); + ok(res, "InternetGetCookieA failed: %u\n", GetLastError()); + ok(!strcmp(buf, "A=B"), "buf = %s\n", buf); + + len = sizeof(buf); + res = InternetGetCookieA("http://long.url.test.com/", NULL, buf, &len); + ok(!res && GetLastError() == ERROR_NO_MORE_ITEMS, "InternetGetCookieA failed: %u\n", GetLastError()); } static void test_null(void)

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2016