wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Jacek Caban : secur32: Added support for a few more algorithms in schannel_get_cipher_algid.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 3617e2b2a9f028347702c87da97e6a74f854027e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3617e2b2a9f028347702c87da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 16 13:46:32 2015 +0200 secur32: Added support for a few more algorithms in schannel_get_cipher_algid. --- dlls/secur32/schannel_gnutls.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 7039dcd..16b8c5f 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -299,7 +299,10 @@ static ALG_ID schannel_get_cipher_algid(gnutls_cipher_algorithm_t cipher) case GNUTLS_CIPHER_DES_CBC: case GNUTLS_CIPHER_3DES_CBC: return CALG_DES; case GNUTLS_CIPHER_AES_128_CBC: - case GNUTLS_CIPHER_AES_256_CBC: return CALG_AES; + case GNUTLS_CIPHER_AES_128_GCM: return CALG_AES_128; + case GNUTLS_CIPHER_AES_192_CBC: return CALG_AES_192; + case GNUTLS_CIPHER_AES_256_GCM: + case GNUTLS_CIPHER_AES_256_CBC: return CALG_AES_256; case GNUTLS_CIPHER_RC2_40_CBC: return CALG_RC2; default: FIXME("unknown algorithm %d\n", cipher);

1 0

Huw Davies : user32/tests: Try to fix the test failures on Win 2k.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 1342254422ac5dff985aeeae1d1e220a21050487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1342254422ac5dff985aeeae1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 16 12:38:53 2015 +0100 user32/tests: Try to fix the test failures on Win 2k. --- dlls/user32/tests/msg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b5f9e6a..cc74f1c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10339,13 +10339,14 @@ static void wait_move_event(HWND hwnd, int x, int y) { MSG msg; DWORD time; - BOOL ret, go = FALSE; + BOOL ret; time = GetTickCount(); - while (GetTickCount() - time < 200 && !go) { + while (GetTickCount() - time < 200) { ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); - go = ret && msg.pt.x > x && msg.pt.y > y; + if (ret && msg.pt.x > x && msg.pt.y > y) break; if (!ret) MsgWaitForMultipleObjects( 0, NULL, FALSE, GetTickCount() - time, QS_ALLINPUT ); + else Sleep( GetTickCount() - time ); } }

1 0

Mohamed Mediouni : ntdll: Multiply r4 with the word size in ARM for __chkstk.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 2b095beace7b457586bd33b3b1c81df116215193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b095beace7b457586bd33b3b… Author: Mohamed Mediouni <mmediouni(a)gmx.fr> Date: Mon Jun 15 19:22:45 2015 +0000 ntdll: Multiply r4 with the word size in ARM for __chkstk. --- dlls/ntdll/signal_arm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 7625d77..6509046 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -250,9 +250,10 @@ static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) /************************************************************************** * __chkstk (NTDLL.@) * - * Should check if we can decrement SP by the value provided in r4, but we shouldn't need that. + * Incoming r4 contains words to allocate, converting to bytes then return */ -__ASM_GLOBAL_FUNC( __chkstk, "bx lr" ) +__ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" + "bx lr" ) /*********************************************************************** * RtlCaptureContext (NTDLL.@)

1 0

Hugh McMaster : regsvr32: Convert if-else block to switch statement.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: dc1b177a1a5f362be069c9017d4d79389f064495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1b177a1a5f362be069c9017… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 15 22:12:45 2015 +1000 regsvr32: Convert if-else block to switch statement. --- programs/regsvr32/regsvr32.c | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index e048b30..8aa567c 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -52,6 +52,7 @@ #include "wine/port.h" #include <string.h> +#include <ctype.h> #include <windows.h> #include <ole2.h> #include "regsvr32.h" @@ -252,26 +253,33 @@ int main(int argc, char* argv[]) */ for(i = 1; i < argc; i++) { - if ((!strcasecmp(argv[i], "/u")) ||(!strcasecmp(argv[i], "-u"))) + if ((argv[i][0] == '/' || argv[i][0] == '-') && (!argv[i][2] || argv[i][2] == ':')) + { + switch (tolower(argv[i][1])) + { + case 'u': Unregister = TRUE; - else if ((!strcasecmp(argv[i], "/s"))||(!strcasecmp(argv[i], "-s"))) + break; + case 's': Silent = TRUE; - else if ((!strncasecmp(argv[i], "/i", strlen("/i")))||(!strncasecmp(argv[i], "-i", strlen("-i")))) - { - CallInstall = TRUE; - wsCommandLine = parse_command_line(argv[i] + strlen("/i")); - if (!wsCommandLine) - wsCommandLine = EmptyLine; - } - else if((!strcasecmp(argv[i], "/n"))||(!strcasecmp(argv[i], "-n"))) - CallRegister = FALSE; - else if((!strcasecmp(argv[i], "/c"))||(!strcasecmp(argv[i], "-c"))) - /* console output */; - else if (argv[i][0] == '/' && (!argv[i][2] || argv[i][2] == ':')) - { - output_write(STRING_UNRECOGNIZED_SWITCH, argv[i]); - output_write(STRING_USAGE); - return 1; + break; + case 'i': + CallInstall = TRUE; + wsCommandLine = parse_command_line(argv[i] + strlen("/i")); + if (!wsCommandLine) + wsCommandLine = EmptyLine; + break; + case 'n': + CallRegister = FALSE; + break; + case 'c': + /* console output */; + break; + default: + output_write(STRING_UNRECOGNIZED_SWITCH, argv[i]); + output_write(STRING_USAGE); + return 1; + } } else {

1 0

Hugh McMaster : regsvr32: Move / i command line code to a separate function.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 00c13a20a6a078aa9582c7c2523d9d9591ef0011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c13a20a6a078aa9582c7c25… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 15 21:46:06 2015 +1000 regsvr32: Move /i command line code to a separate function. --- programs/regsvr32/regsvr32.c | 70 +++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 624acd6..e048b30 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -202,6 +202,37 @@ static int InstallDll(BOOL install, char *strDll, WCHAR *command_line) return 0; } +static WCHAR *parse_command_line(char *command_line) +{ + WCHAR *ret = NULL; + + if (command_line[0] == ':' && command_line[1]) + { + int len = strlen(command_line); + + command_line++; + len--; + /* remove double quotes */ + if (command_line[0] == '"') + { + command_line++; + len--; + if (command_line[0]) + { + len--; + command_line[len] = 0; + } + } + if (command_line[0]) + { + len = MultiByteToWideChar(CP_ACP, 0, command_line, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (ret) MultiByteToWideChar(CP_ACP, 0, command_line, -1, ret, len); + } + } + return ret; +} + int main(int argc, char* argv[]) { int i; @@ -227,45 +258,10 @@ int main(int argc, char* argv[]) Silent = TRUE; else if ((!strncasecmp(argv[i], "/i", strlen("/i")))||(!strncasecmp(argv[i], "-i", strlen("-i")))) { - CHAR* command_line = argv[i] + strlen("/i"); - CallInstall = TRUE; - if (command_line[0] == ':' && command_line[1]) - { - int len = strlen(command_line); - - command_line++; - len--; - /* remove double quotes */ - if (command_line[0] == '"') - { - command_line++; - len--; - if (command_line[0]) - { - len--; - command_line[len] = 0; - } - } - if (command_line[0]) - { - len = MultiByteToWideChar(CP_ACP, 0, command_line, -1, - NULL, 0); - wsCommandLine = HeapAlloc(GetProcessHeap(), 0, - len * sizeof(WCHAR)); - if (wsCommandLine) - MultiByteToWideChar(CP_ACP, 0, command_line, -1, - wsCommandLine, len); - } - else - { - wsCommandLine = EmptyLine; - } - } - else - { + wsCommandLine = parse_command_line(argv[i] + strlen("/i")); + if (!wsCommandLine) wsCommandLine = EmptyLine; - } } else if((!strcasecmp(argv[i], "/n"))||(!strcasecmp(argv[i], "-n"))) CallRegister = FALSE;

1 0

Jacek Caban : wininet: Don' t pass BLOCKING_WAITALL to NETCON_recv in netconn_read.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 049a3ba40153253e40177d05e47cd59b0144c86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=049a3ba40153253e40177d05e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 16 12:24:54 2015 +0200 wininet: Don't pass BLOCKING_WAITALL to NETCON_recv in netconn_read. --- dlls/wininet/http.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b7c4661..f4f67cb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2659,24 +2659,29 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; DWORD res = ERROR_SUCCESS; - int len = 0; + int len = 0, ret = 0; size = min(size, netconn_stream->content_length-netconn_stream->content_read); if(size && is_valid_netconn(req->netconn)) { - if((res = NETCON_recv(req->netconn, buf, size, blocking_mode, &len))) { - len = 0; - if(blocking_mode == BLOCKING_DISALLOW && res == WSAEWOULDBLOCK) - res = ERROR_SUCCESS; - else + while((res = NETCON_recv(req->netconn, buf+ret, size-ret, + blocking_mode == BLOCKING_WAITALL ? BLOCKING_ALLOW : blocking_mode, &len)) == ERROR_SUCCESS) { + if(!len) { netconn_stream->content_length = netconn_stream->content_read; - }else if(!len) { - netconn_stream->content_length = netconn_stream->content_read; + break; + } + ret += len; + netconn_stream->content_read += len; + if(blocking_mode != BLOCKING_WAITALL || size == ret) + break; } + + if(ret || (blocking_mode == BLOCKING_DISALLOW && res == WSAEWOULDBLOCK)) + res = ERROR_SUCCESS; } - netconn_stream->content_read += *read = len; - TRACE("read %u bytes\n", len); + TRACE("read %u bytes\n", ret); + *read = ret; return res; }

1 0

Nikolay Sivov : riched20: Improve tracing for unimplemented range methods.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: b0db959ec95506973d2843bff8c8139388c73736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0db959ec95506973d2843bff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 11:46:24 2015 +0300 riched20: Improve tracing for unimplemented range methods. --- dlls/riched20/riched_tom.idl | 2 +- dlls/riched20/richole.c | 231 +++++++++++++++++++++++++++---------------- include/tom.idl | 2 +- 3 files changed, 150 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0db959ec95506973d284…

1 0

Qian Hong : include: Remove duplicate macro definition in shellapi.h.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 0edeb9b9b10b1af0ca33b4202ab9d1d5037ae7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edeb9b9b10b1af0ca33b4202… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 16 15:58:21 2015 +0800 include: Remove duplicate macro definition in shellapi.h. --- include/shellapi.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/shellapi.h b/include/shellapi.h index ecf0b21..8492155 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -250,12 +250,6 @@ void WINAPI SHFreeNameMappings(HANDLE hNameMappings); /****************************************** * ShellExecute */ -#define SE_ERR_SHARE 26 -#define SE_ERR_ASSOCINCOMPLETE 27 -#define SE_ERR_DDETIMEOUT 28 -#define SE_ERR_DDEFAIL 29 -#define SE_ERR_DDEBUSY 30 -#define SE_ERR_NOASSOC 31 HINSTANCE WINAPI ShellExecuteA(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT); HINSTANCE WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT);

1 0

Michael Stefaniuc : dmstyle/tests: Add IPersistStream tests for DM*Track.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 19b9c8fdb7fddbd094d0a67e0e7bf2816e4798b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b9c8fdb7fddbd094d0a67e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 16 09:34:51 2015 +0200 dmstyle/tests: Add IPersistStream tests for DM*Track. --- dlls/dmstyle/tests/dmstyle.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 1401d75..0a0c5aa 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -239,6 +239,73 @@ static void test_dmstyle(void) while (IDirectMusicStyle_Release(dms)); } +static void test_track(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + CLSID classid; + ULARGE_INTEGER size; + HRESULT hr; +#define X(class) &CLSID_ ## class, #class + const struct { + REFCLSID clsid; + const char *name; + BOOL has_save; + BOOL todo; + } class[] = { + { X(DirectMusicAuditionTrack), TRUE, TRUE }, + { X(DirectMusicChordTrack), TRUE, FALSE }, + { X(DirectMusicCommandTrack), TRUE, TRUE }, + { X(DirectMusicMotifTrack), FALSE, TRUE }, + { X(DirectMusicMuteTrack), TRUE, TRUE }, + { X(DirectMusicStyleTrack), FALSE, FALSE }, + }; +#undef X + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(class); i++) { + trace("Testing %s\n", class[i].name); + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, + (void**)&dmt8); + if (hr == E_NOINTERFACE && !dmt8) { + skip("%s not created with CoCreateInstance()\n", class[i].name); + continue; + } + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + + /* IPersistStream */ + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &classid); + if (class[i].todo) { + todo_wine { + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&classid, class[i].clsid), + "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + } + } else { + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&classid, class[i].clsid), + "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + } + + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + + hr = IPersistStream_Save(ps, NULL, TRUE); + if (class[i].has_save) + todo_wine ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); + else + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicTrack8_Release(dmt8)); + } +} + START_TEST(dmstyle) { CoInitialize(NULL); @@ -253,6 +320,7 @@ START_TEST(dmstyle) test_COM_section(); test_COM_track(); test_dmstyle(); + test_track(); CoUninitialize(); }

1 0

Ken Thomases : configure: Only check for libunwind.h on OS X.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 36a9f9dd05c3b9df77c44c91663e9bd6cae1c848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a9f9dd05c3b9df77c44c916… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 15 20:42:33 2015 -0500 configure: Only check for libunwind.h on OS X. --- configure | 13 ++++++++++++- configure.ac | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a104097..c0951db 100755 --- a/configure +++ b/configure @@ -6626,7 +6626,6 @@ for ac_header in \ lber.h \ ldap.h \ libproc.h \ - libunwind.h \ link.h \ linux/cdrom.h \ linux/compiler.h \ @@ -7849,6 +7848,18 @@ uninstall:: ;; darwin*|macosx*) + for ac_header in libunwind.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libunwind.h" "ac_cv_header_libunwind_h" "$ac_includes_default" +if test "x$ac_cv_header_libunwind_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBUNWIND_H 1 +_ACEOF + +fi + +done + LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" LIBWINE_LDFLAGS="-multiply_defined suppress" diff --git a/configure.ac b/configure.ac index df28b27..f9df3f0 100644 --- a/configure.ac +++ b/configure.ac @@ -424,7 +424,6 @@ AC_CHECK_HEADERS(\ lber.h \ ldap.h \ libproc.h \ - libunwind.h \ link.h \ linux/cdrom.h \ linux/compiler.h \ @@ -751,6 +750,7 @@ uninstall:: ;; darwin*|macosx*) + AC_CHECK_HEADERS(libunwind.h) LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" LIBWINE_LDFLAGS="-multiply_defined suppress"

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
61
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 June 2015