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

Francois Gouget : commdlg.dll16: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 285dc99999f6e0c50db01585004d5ec12099e2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=285dc99999f6e0c50db015850… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 09:32:20 2015 +0100 commdlg.dll16: Remove unneeded NONAMELESSXXX directives. --- dlls/commdlg.dll16/printdlg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/commdlg.dll16/printdlg.c b/dlls/commdlg.dll16/printdlg.c index 59239dd..ac4741e 100644 --- a/dlls/commdlg.dll16/printdlg.c +++ b/dlls/commdlg.dll16/printdlg.c @@ -27,8 +27,6 @@ #include <stdio.h> #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Francois Gouget : comdlg32: Remove unneeded NONAMELESSSTRUCT directives.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 99f0f3a7e1876df5d217a3c9ceb0c3150145179d URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f0f3a7e1876df5d217a3c9c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 09:32:39 2015 +0100 comdlg32: Remove unneeded NONAMELESSSTRUCT directives. --- dlls/comdlg32/filedlg.c | 1 - dlls/comdlg32/filedlgbrowser.c | 1 - dlls/comdlg32/itemdlg.c | 1 - 3 files changed, 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index e0939ef..2890108 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -56,7 +56,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index eed34f5..ce97ec3 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -25,7 +25,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 3b97111..c37b66e 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -22,7 +22,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Michael Stefaniuc : mstml/tests: Merge two adjacent if blocks with identical condition (PVS-Studio).
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 533bb9f390d8026f6885e077b92d200a9b2c8a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533bb9f390d8026f6885e077b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 9 10:25:34 2015 +0100 mstml/tests: Merge two adjacent if blocks with identical condition (PVS-Studio). --- dlls/mshtml/tests/htmldoc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 08c31ad..f131563 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6509,11 +6509,10 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded) editmode = TRUE; - if(loaded) + if(loaded) { load_state = LD_DOLOAD; - - if(loaded) SET_EXPECT(GetClassID); + } SET_EXPECT(SetStatusText); SET_EXPECT(Exec_ShellDocView_37); SET_EXPECT(GetHostInfo);

1 0

Michael Stefaniuc : dbghelp: Remove no-op additions with 0 (PVS-Studio).
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 1328ec48546913671af3d83b0ebf37d2936bbb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1328ec48546913671af3d83b0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 9 10:26:19 2015 +0100 dbghelp: Remove no-op additions with 0 (PVS-Studio). --- dlls/dbghelp/coff.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index 9f01fd2..01c5826 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -296,7 +296,6 @@ DECLSPEC_HIDDEN BOOL coff_process_info(const struct msc_debug_info* msc_dbg) msc_dbg->module->module.BaseOfImage + base + coff_sym->Value, 0 /* FIXME */, NULL /* FIXME */)->symt); - i += naux; continue; } @@ -377,7 +376,6 @@ DECLSPEC_HIDDEN BOOL coff_process_info(const struct msc_debug_info* msc_dbg) * Ignore these. They don't have anything to do with * reality. */ - i += naux; continue; }

1 0

Michael Stefaniuc : dsound: Avoid comparing BOOL variables with TRUE ( PVS-Studio).
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 91e59d99f93907b464ae3d8d16547868476557af URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e59d99f93907b464ae3d8d1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 9 10:27:08 2015 +0100 dsound: Avoid comparing BOOL variables with TRUE (PVS-Studio). --- dlls/dsound/dsound_main.c | 2 +- dlls/dsound/mixer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 0e3a313..0130607 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -528,7 +528,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, release_mmdevenum(devenum, init_hr); - return (keep_going == TRUE) ? S_OK : S_FALSE; + return keep_going ? S_OK : S_FALSE; } /*************************************************************************** diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index b367086..973a65e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -841,7 +841,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) } /* if device was stopping, its for sure stopped when all buffers have stopped */ - else if((all_stopped == TRUE) && (device->state == STATE_STOPPING)){ + else if (all_stopped && (device->state == STATE_STOPPING)) { TRACE("All buffers have stopped. Stopping primary buffer\n"); device->state = STATE_STOPPED;

1 0

Michael Stefaniuc : gameux: Avoid comparison of a BOOL return with TRUE ( PVS-Studio).
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: cd1e969b2807a2e02aeccd8c9c56e52ec162a28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd1e969b2807a2e02aeccd8c9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 9 10:29:13 2015 +0100 gameux: Avoid comparison of a BOOL return with TRUE (PVS-Studio). --- dlls/gameux/gamestatistics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 7c95065..ff57b77 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -1127,7 +1127,7 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_RemoveGameStatistics( hr = GAMEUX_buildStatisticsFilePath(lpApplicationId, sStatsFile); if(SUCCEEDED(hr)) - hr = (DeleteFileW(sStatsFile)==TRUE ? S_OK : HRESULT_FROM_WIN32(GetLastError())); + hr = DeleteFileW(sStatsFile) ? S_OK : HRESULT_FROM_WIN32(GetLastError()); return hr; }

1 0

Michael Stefaniuc : kernel32: Don't free a NULL / not yet allocated pointer (PVS-Studio).
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: a7daccb674b10ff163b4b63d45634127e862f8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7daccb674b10ff163b4b63d4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 9 10:29:57 2015 +0100 kernel32: Don't free a NULL / not yet allocated pointer (PVS-Studio). --- dlls/kernel32/path.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 4cc8c1d..5dd221f 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -933,7 +933,6 @@ DWORD WINAPI SearchPathW( LPCWSTR path, LPCWSTR name, LPCWSTR ext, DWORD buflen, if (!search) { SetLastError( ERROR_OUTOFMEMORY ); - HeapFree( GetProcessHeap(), 0, dll_path ); return 0; } strcpyW( search, name );

1 0

Alexandre Julliard : server: Don' t report completion at all in the MORE_PROCESSING_REQUIRED case.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 8364351b9917e699c1654bab6eec98c2aec5bf41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8364351b9917e699c1654bab6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 7 14:26:51 2015 +0900 server: Don't report completion at all in the MORE_PROCESSING_REQUIRED case. --- server/async.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/async.c b/server/async.c index e403955..a8f3b05 100644 --- a/server/async.c +++ b/server/async.c @@ -243,9 +243,6 @@ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int sta static void add_async_completion( struct async_queue *queue, apc_param_t cvalue, unsigned int status, apc_param_t information ) { - if (status == STATUS_MORE_PROCESSING_REQUIRED) - return; /* The async callback has successfully finished but no completion should be reported */ - if (queue->fd) { apc_param_t ckey; @@ -287,6 +284,8 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (async->timeout) remove_timeout_user( async->timeout ); async->timeout = NULL; async->status = status; + if (status == STATUS_MORE_PROCESSING_REQUIRED) return; /* don't report the completion */ + if (async->data.cvalue) add_async_completion( async->queue, async->data.cvalue, status, total ); if (apc) {

1 0

Alexandre Julliard : announce.php: Escape html special characters.
by Alexandre Julliard 07 Mar '15

07 Mar '15

Module: website Branch: master Commit: a564b911a57276b88c05f33b3c56f5b4f3b35503 URL: http://source.winehq.org/git/website.git/?a=commit;h=a564b911a57276b88c05f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 7 15:13:14 2015 +0900 announce.php: Escape html special characters. --- include/plugins/announce.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index 6c61baa..fb707a0 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -26,7 +26,7 @@ if ($arr = file($announce)) if ($c == 0) $title = $html->encode(trim($arr[$c])); - $arr[$c] = $html->urlify($arr[$c]); + $arr[$c] = $html->urlify($html->encode($arr[$c])); if (preg_match("/^--------------------/", $arr[$c])) $in_header = 0; else if (preg_match("/^Bugs fixed/", $arr[$c])) $in_bugs = 1;

1 0

Alexandre Julliard : Wine release 1.7.38
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: website Branch: master Commit: bd593e3d4b6e9e0c952a709645b9dc20cc48d9a6 URL: http://source.winehq.org/git/website.git/?a=commit;h=bd593e3d4b6e9e0c952a70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 6 22:29:26 2015 +0900 Wine release 1.7.38 --- news/en/2015030601.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2015030601.xml b/news/en/2015030601.xml new file mode 100644 index 0000000..2305afd --- /dev/null +++ b/news/en/2015030601.xml @@ -0,0 +1,18 @@ +<news> +<date>March 6, 2015</date> +<title>Wine 1.7.38 Released</title> +<body> + The Wine development release 1.7.38 is now available. + <a href="{$root}/announce/1.7.38">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 36.</li> + <li>Support for themed scrollbars.</li> + <li>Updated version of the Mono engine.</li> + <li>More compatible RPC interface for service control.</li> + <li>Support for X Drag & Drop version 5.</li> + <li>Threading fixes in IME support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.38.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