March 2015 - Wine-commits - list.winehq.org

Francois Gouget : quartz: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 78bf626d20039edf66844eafbe5b40ed6fee4a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78bf626d20039edf66844eafb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:19:35 2015 +0100 quartz: Remove unneeded NONAMELESSXXX directives. --- dlls/quartz/nullrenderer.c | 2 -- dlls/quartz/videorenderer.c | 2 -- dlls/quartz/vmr9.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index dbbdd4f..eccdfc6 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -21,8 +21,6 @@ #include "config.h" -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include "quartz_private.h" #include "pin.h" diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 571a19d..7bc2620 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -20,8 +20,6 @@ #include "config.h" -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include "quartz_private.h" #include "pin.h" diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e950a48..c9a330d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -22,8 +22,6 @@ #include "config.h" -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include "quartz_private.h" #include "uuids.h"

1 0

Francois Gouget : qcap: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 77f29bcdc0603eea0f0ca588767f85724513405e URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f29bcdc0603eea0f0ca5887… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:19:53 2015 +0100 qcap: Remove unneeded NONAMELESSXXX directives. --- dlls/qcap/capturegraph.c | 2 -- dlls/qcap/qcap_main.c | 2 -- dlls/qcap/v4l.c | 2 -- dlls/qcap/vfwcapture.c | 2 -- 4 files changed, 8 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index f5973c8..e2bc54d 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -23,8 +23,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 0f9ed14..ddacd62 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -25,8 +25,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 4e19b71..54e0230 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -25,8 +25,6 @@ #include "config.h" #include "wine/port.h" -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #define COBJMACROS #include <stdarg.h> diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 2551534..23f7407 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -18,8 +18,6 @@ * */ -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #define COBJMACROS #include "config.h"

1 0

Francois Gouget : quartz/tests: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 7c3e2558968ad2b9f8aa2870b5e10de0e156da58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3e2558968ad2b9f8aa2870b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:22:40 2015 +0100 quartz/tests: Remove an uneeded NONAMELESSUNION directive. --- dlls/quartz/tests/dsoundrender.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index c613423..c350192 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #define COBJMACROS #include "wine/test.h"

1 0

Francois Gouget : jscript: Mark internal symbols with hidden visibility.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: f0584081c94079c1d77a7b741b7ca96b50750a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0584081c94079c1d77a7b741… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:29:40 2015 +0100 jscript: Mark internal symbols with hidden visibility. --- dlls/jscript/jscript.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 3cfc4ba..32a1be0 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -284,7 +284,7 @@ HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT disp_delete(IDispatch*,DISPID,BOOL*) DECLSPEC_HIDDEN; -HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*); +HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_is_own_prop(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN;

1 0

Francois Gouget : hhctrl.ocx: Make html_encoded_symbols[] static.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 3d1c2dc63ec9487a88084f604b575867c0e8cebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d1c2dc63ec9487a88084f604… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:39:07 2015 +0100 hhctrl.ocx: Make html_encoded_symbols[] static. --- dlls/hhctrl.ocx/help.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 4f3ea1a..68989ae 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -61,7 +61,7 @@ struct html_encoded_symbol { * Table mapping the conversion between HTML encoded symbols and their ANSI code page equivalent. * Note: Add additional entries in proper alphabetical order (a binary search is used on this table). */ -struct html_encoded_symbol html_encoded_symbols[] = +static struct html_encoded_symbol html_encoded_symbols[] = { {"AElig", 0xC6}, {"Aacute", 0xC1},

1 0

Francois Gouget : hhctrl.ocx: Mark internal symbols with hidden visibility.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 8fcef187e8685d205d787a482262e0915f70101a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fcef187e8685d205d787a482… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:39:34 2015 +0100 hhctrl.ocx: Mark internal symbols with hidden visibility. --- dlls/hhctrl.ocx/hhctrl.c | 1 - dlls/hhctrl.ocx/hhctrl.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 86a31f5..7efca00 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -41,7 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); HINSTANCE hhctrl_hinstance; BOOL hh_process = FALSE; -extern struct list window_list; BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 206f5ed..5318b5f 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -225,6 +225,7 @@ IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*) DECLSPEC_HIDDEN; LPWSTR FindContextAlias(CHMInfo*,DWORD) DECLSPEC_HIDDEN; WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR) DECLSPEC_HIDDEN; +extern struct list window_list DECLSPEC_HIDDEN; HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND) DECLSPEC_HIDDEN; void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN; BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : rsaenh: Don't compare a BOOL with 1 (PVS-Studio).
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: c641205cee71bf8b3c60891266030f8e78201ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c641205cee71bf8b3c6089126… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 18 11:48:23 2015 +0100 rsaenh: Don't compare a BOOL with 1 (PVS-Studio). --- dlls/rsaenh/mpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index f75d89f..03e3102 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -1783,7 +1783,7 @@ static int mp_div_d (const mp_int * a, mp_digit b, mp_int * c, mp_digit * d) } /* power of two ? */ - if (s_is_power_of_two(b, &ix) == 1) { + if (s_is_power_of_two(b, &ix)) { if (d != NULL) { *d = a->dp[0] & ((((mp_digit)1)<<ix) - 1); }

1 0

Bruno Jesus : kernel32: Only zero the buffer up to 32767 bytes in GetTempPathW.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 24fc876e616db6f2249811c21c2c399c57c7df2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fc876e616db6f2249811c21… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Mar 14 01:27:27 2015 -0300 kernel32: Only zero the buffer up to 32767 bytes in GetTempPathW. --- dlls/kernel32/path.c | 5 +++-- dlls/kernel32/tests/path.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 7fe229f..c2833b1 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -622,8 +622,9 @@ DWORD WINAPI GetTempPathW( DWORD count, LPWSTR path ) if (count >= ret) { lstrcpynW(path, tmp_path, count); - /* the remaining buffer must be zeroed */ - memset(path + ret, 0, (count - ret) * sizeof(WCHAR)); + /* the remaining buffer must be zeroed up to 32766 bytes in XP or 32767 + * bytes after it, we will assume the > XP behavior for now */ + memset(path + ret, 0, (min(count, 32767) - ret) * sizeof(WCHAR)); ret--; /* return length without 0 */ } else if (count) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e97c50c..cdb565a 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -975,7 +975,7 @@ static void test_GetTempPathA(char* tmp_dir) static void test_GetTempPathW(char* tmp_dir) { DWORD len, slen, len_with_null; - WCHAR buf[MAX_PATH]; + WCHAR buf[MAX_PATH], *long_buf; WCHAR tmp_dirW[MAX_PATH]; static const WCHAR fooW[] = {'f','o','o',0}; @@ -1048,6 +1048,34 @@ static void test_GetTempPathW(char* tmp_dir) ok(buf[len] == '\0', "expected NULL at [%d], got 0x%x\n", len, buf[len]); for(; len < sizeof(buf) / sizeof(buf[0]); len++) ok(buf[len] == 'a', "expected 'a' at [%d], got 0x%x\n", len, buf[len]); + + /* bogus application from bug 38220 passes the count value in sizeof(buffer) + * instead the correct count of WCHAR, this test catches this case. */ + slen = 65534; + long_buf = HeapAlloc(GetProcessHeap(), 0, slen * sizeof(WCHAR)); + if (!long_buf) + { + skip("Could not allocate memory for the test\n"); + return; + } + for(len = 0; len < slen; len++) + long_buf[len] = 0xCC; + len = GetTempPathW(slen, long_buf); + ok(lstrcmpiW(long_buf, tmp_dirW) == 0, "GetTempPathW returned an incorrect temporary path\n"); + ok(len == lstrlenW(long_buf), "returned length should be equal to the length of string\n"); + /* the remaining buffer must be zeroed up to different values in different OS versions. + * <= XP - 32766 + * > XP - 32767 + * to simplify testing we will test only until XP. + */ + for(; len < 32767; len++) + ok(long_buf[len] == '\0', "expected NULL at [%d], got 0x%x\n", len, long_buf[len]); + /* we will know skip the test that is in the middle of the OS difference by + * incrementing len and then resume the test for the untouched part. */ + for(len++; len < slen; len++) + ok(long_buf[len] == 0xcc, "expected 0xcc at [%d], got 0x%x\n", len, long_buf[len]); + + HeapFree(GetProcessHeap(), 0, long_buf); } static void test_GetTempPath(void)

1 0

Ken Thomases : winejoystick: Separate Linux-specific code into a separate file.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 01227ab26700c5aee85952621d45068c96fcc9d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01227ab26700c5aee85952621… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 16 18:43:49 2015 -0500 winejoystick: Separate Linux-specific code into a separate file. --- dlls/winejoystick.drv/Makefile.in | 3 +- dlls/winejoystick.drv/joystick.c | 513 ++------------------------------- dlls/winejoystick.drv/joystick.h | 34 +++ dlls/winejoystick.drv/joystick_linux.c | 490 +++++++++++++++++++++++++++++++ 4 files changed, 547 insertions(+), 493 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01227ab26700c5aee8595…

1 0

Ken Thomases : winejoystick: Add WinMM joystick support for OS X.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 65711634ce97e3e01e7ac70d95388da5e208f90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65711634ce97e3e01e7ac70d9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 16 18:44:08 2015 -0500 winejoystick: Add WinMM joystick support for OS X. --- configure | 2 +- configure.ac | 2 +- dlls/winejoystick.drv/Makefile.in | 4 +- dlls/winejoystick.drv/joystick_osx.c | 754 +++++++++++++++++++++++++++++++++++ 4 files changed, 759 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65711634ce97e3e01e7ac…

1 0