February 2017 - Wine-commits

Bruno Jesus : winemp3.acm: Ignore XING headers when parsing MP3 files.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 2253d1a9d3a36bc3dcdc05acc8bf47085b739c6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2253d1a9d3a36bc3dcdc05acc… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Feb 7 13:55:53 2017 -0200 winemp3.acm: Ignore XING headers when parsing MP3 files. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 37993b4..28a1998 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -248,6 +248,13 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) aad->convert = mp3_horse; aad->mh = mpg123_new(NULL,&err); mpg123_open_feed(aad->mh); + + /* mpg123 may find a XING header in the mp3 and use that information + * to ask for seeks in order to read specific frames in the file. + * We cannot allow that since the caller application is feeding us. + * This fixes problems for mp3 files encoded with LAME (bug 42361) + */ + mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); } /* no encoding yet else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM &&

1 0

Jactry Zeng : qcap: Avoid call LeaveCriticalSection() repeatedly.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 6530824ab31bf9af311f3f93e2d145b81f85de9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6530824ab31bf9af311f3f93e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Feb 7 22:20:29 2017 +0800 qcap: Avoid call LeaveCriticalSection() repeatedly. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 54e0230..bc760bd 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -604,7 +604,12 @@ static DWORD WINAPI ReadThread(LPVOID lParam) hr = V4l_Prepare(capBox); if (FAILED(hr)) - goto fail; + { + ERR("Stop IFilterGraph: %x\n", hr); + capBox->thread = 0; + capBox->stopped = TRUE; + return 0; + } pOutput = CoTaskMemAlloc(capBox->width * capBox->height * capBox->bitDepth / 8); capBox->curframe = 0; @@ -641,27 +646,19 @@ static DWORD WINAPI ReadThread(LPVOID lParam) IMediaSample_Release(pSample); V4l_FreeFrame(capBox); } - LeaveCriticalSection(&capBox->CritSect); if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) { - ERR("Received error: %x\n", hr); - goto cfail; + TRACE("Return %x, stop IFilterGraph\n", hr); + V4l_Unprepare(capBox); + capBox->thread = 0; + capBox->stopped = TRUE; + break; } + LeaveCriticalSection(&capBox->CritSect); } - LeaveCriticalSection(&capBox->CritSect); - CoTaskMemFree(pOutput); - - return 0; -cfail: - CoTaskMemFree(pOutput); - V4l_Unprepare(capBox); LeaveCriticalSection(&capBox->CritSect); - -fail: - capBox->thread = 0; - capBox->stopped = TRUE; - FIXME("Stop IFilterGraph\n"); + CoTaskMemFree(pOutput); return 0; }

1 0

Nikolay Sivov : kernel32/nls: Added Bangla (India) locale data.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 2f6e6605b494b2412f9e4363149fec704c04d4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f6e6605b494b2412f9e43631… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 17:30:22 2017 +0300 kernel32/nls: Added Bangla (India) locale data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/ben.nls | 162 +++++++++++++++++++++++++++++++++++++++++++++ include/winnt.rh | 3 + 3 files changed, 167 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index cddac46..37b20e3 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -208,6 +208,8 @@ #include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_DEFAULT */ +#include "nls/ben.nls" /* 0x0445 LANG_BANGLA, SUBLANG_BANGLA_INDIA */ + #include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_DEFAULT */ #include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/ben.nls b/dlls/kernel32/nls/ben.nls new file mode 100644 index 0000000..9dcfa70 --- /dev/null +++ b/dlls/kernel32/nls/ben.nls @@ -0,0 +1,162 @@ +/* + * Locale definitions for Bangla + * + * Copyright 2017 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_BANGLA, SUBLANG_BANGLA_INDIA +{ + LOCALE_FONTSIGNATURE L"\x0000\x0001\x0000\x0000\x0000\x0000\x0000\x8000\x0000\x0000\x0000\x0000\x0000\x0000\x0000\x0000" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "0" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0445" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0445" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "AM" + LOCALE_S2359 "PM" + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "সোম." + LOCALE_SABBREVDAYNAME2 "মঙ্গল." + LOCALE_SABBREVDAYNAME3 "বুধ." + LOCALE_SABBREVDAYNAME4 "বৃহস্পতি." + LOCALE_SABBREVDAYNAME5 "শুক্র." + LOCALE_SABBREVDAYNAME6 "শনি." + LOCALE_SABBREVDAYNAME7 "রবি." + LOCALE_SABBREVLANGNAME "BNG" + LOCALE_SABBREVMONTHNAME1 "জানু." + LOCALE_SABBREVMONTHNAME2 "ফেব্রু." + LOCALE_SABBREVMONTHNAME3 "মার্চ" + LOCALE_SABBREVMONTHNAME4 "এপ্রিল" + LOCALE_SABBREVMONTHNAME5 "মে" + LOCALE_SABBREVMONTHNAME6 "জুন" + LOCALE_SABBREVMONTHNAME7 "জুলাই" + LOCALE_SABBREVMONTHNAME8 "আগ." + LOCALE_SABBREVMONTHNAME9 "সেপ্টে." + LOCALE_SABBREVMONTHNAME10 "অক্টো." + LOCALE_SABBREVMONTHNAME11 "নভে." + LOCALE_SABBREVMONTHNAME12 "ডিসে." + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "₹" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "সোমবার" + LOCALE_SDAYNAME2 "মঙ্গলবার" + LOCALE_SDAYNAME3 "বুধবার" + LOCALE_SDAYNAME4 "বৃহস্পতিবার" + LOCALE_SDAYNAME5 "শুক্রবার" + LOCALE_SDAYNAME6 "শনিবার" + LOCALE_SDAYNAME7 "রবিবার" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Bangla" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "bn" + LOCALE_SLANGUAGE "Bangla (India)" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "জানুয়ারী" + LOCALE_SMONTHNAME2 "ফেব্রুয়ারী" + LOCALE_SMONTHNAME3 "মার্চ" + LOCALE_SMONTHNAME4 "এপ্রিল" + LOCALE_SMONTHNAME5 "মে" + LOCALE_SMONTHNAME6 "জুন" + LOCALE_SMONTHNAME7 "জুলাই" + LOCALE_SMONTHNAME8 "আগস্ট" + LOCALE_SMONTHNAME9 "সেপ্টেম্বর" + LOCALE_SMONTHNAME10 "অক্টোবর" + LOCALE_SMONTHNAME11 "নভেম্বর" + LOCALE_SMONTHNAME12 "ডিসেম্বর" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "bn-IN" + LOCALE_SNATIVECTRYNAME "ভারত" + LOCALE_SNATIVECURRNAME "টাকা" + LOCALE_SNATIVEDIGITS "০১২৩৪৫৬৭৮৯" + LOCALE_SNATIVEDISPLAYNAME "বাংলা (ভারত)" + LOCALE_SNATIVELANGNAME "বাংলা" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "BEN " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Beng;" + LOCALE_SSHORTDATE "dd-MM-yy" + LOCALE_SSHORTESTDAYNAME1 "স" + LOCALE_SSHORTESTDAYNAME2 "ম" + LOCALE_SSHORTESTDAYNAME3 "বু" + LOCALE_SSHORTESTDAYNAME4 "বৃ" + LOCALE_SSHORTESTDAYNAME5 "শু" + LOCALE_SSHORTESTDAYNAME6 "শ" + LOCALE_SSHORTESTDAYNAME7 "র" + LOCALE_SSHORTTIME "HH.mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME "." + LOCALE_STIMEFORMAT "HH.mm.ss" + LOCALE_SYEARMONTH "MMMM, yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + 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_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} diff --git a/include/winnt.rh b/include/winnt.rh index 1013a24..5f07168 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -45,6 +45,7 @@ #define LANG_ARMENIAN 0x2b #define LANG_ASSAMESE 0x4d #define LANG_AZERI 0x2c +#define LANG_BANGLA 0x45 #define LANG_BASHKIR 0x6d #define LANG_BASQUE 0x2d #define LANG_BELARUSIAN 0x23 @@ -211,6 +212,8 @@ #define SUBLANG_ASSAMESE_INDIA 0x01 #define SUBLANG_AZERI_LATIN 0x01 #define SUBLANG_AZERI_CYRILLIC 0x02 +#define SUBLANG_BANGLA_BANGLADESH 0x02 +#define SUBLANG_BANGLA_INDIA 0x01 #define SUBLANG_BASHKIR_RUSSIA 0x01 #define SUBLANG_BASQUE_BASQUE 0x01 #define SUBLANG_BELARUSIAN_BELARUS 0x01

1 0

Jacek Caban : maintainers: Update myself.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: e28f2f4908024379593ca4802877287b50aa4205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28f2f4908024379593ca4802… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 9 15:47:49 2017 +0100 maintainers: Update myself. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 738e1b7..878e210 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -134,12 +134,6 @@ F: dlls/hid/ F: dlls/hidclass.sys/ F: dlls/winehid.sys/ -HTML rendering (Gecko) -M: Jacek Caban <jacek(a)codeweavers.com> -F: dlls/ieframe/ -F: dlls/mshtml/ -F: dlls/shdocvw/ - Input methods M: Aric Stewart <aric(a)codeweavers.com> F: dlls/imm32/ @@ -242,10 +236,24 @@ Uniscribe M: Aric Stewart <aric(a)codeweavers.com> F: dlls/usp10/ +URL Moniker +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/urlmon/ + +VBScript +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/vbscript/ + Web Services M: Hans Leidekker <hans(a)codeweavers.com> F: dlls/webservices/ +WebBrowser control +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/ieframe/ +F: dlls/mshtml/ +F: dlls/shdocvw/ + Windows Imaging Component M: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/windowscodecs/ @@ -271,14 +279,14 @@ WinHTTP M: Hans Leidekker <hans(a)codeweavers.com> F: dlls/winhttp/ +WinINet +P: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/wininet/ + WPcap M: André Hentschel <nerv(a)dawncrow.de> F: dlls/wpcap/ -VB Script -M: Jacek Caban <jacek(a)codeweavers.com> -F: dlls/vbscript/ - X11 Driver M: Alexandre Julliard <julliard(a)winehq.org> P: Vincent Povirk <vincent(a)codeweavers.com> @@ -294,6 +302,7 @@ M: Alexandre Julliard <julliard(a)winehq.org> P: Alex Henrie <alexhenrie24(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> +P: Jacek Caban <jacek(a)codeweavers.com> P: Sebastian Lackner <sebastian(a)fds-team.de> P: Vincent Povirk <vincent(a)codeweavers.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com>

1 0

Bruno Jesus : configure: Make FreeBSD recognize struct __res_state for iphlpapi.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 2f447bb49c794058e71bf5bd43a3c53147260226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f447bb49c794058e71bf5bd4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Feb 9 14:59:11 2017 -0200 configure: Make FreeBSD recognize struct __res_state for iphlpapi. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 8 +++++++- configure.ac | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1cac4e0..a7e350e 100755 --- a/configure +++ b/configure @@ -16711,7 +16711,13 @@ _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct __res_state" "ac_cv_type_struct___res_state" "#ifdef HAVE_RESOLV_H +ac_fn_c_check_type "$LINENO" "struct __res_state" "ac_cv_type_struct___res_state" "#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_RESOLV_H #include <resolv.h> #endif " diff --git a/configure.ac b/configure.ac index cae8d72..413bfc9 100644 --- a/configure.ac +++ b/configure.ac @@ -2347,7 +2347,13 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, dnl Check for struct __res_state AC_CHECK_TYPES([struct __res_state],,, -[#ifdef HAVE_RESOLV_H +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_RESOLV_H #include <resolv.h> #endif])

1 0

Andrew Wesie : ntdll: Read entry point in LdrInitializeThunk.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 06c5a9ab55751b1c66ea0847aea4d4a45d8d343c URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c5a9ab55751b1c66ea0847a… Author: Andrew Wesie <awesie(a)gmail.com> Date: Thu Feb 9 20:11:52 2017 +0100 ntdll: Read entry point in LdrInitializeThunk. Overwatch overwrites the PE header contents in a TLS callback. This results in a crash on wine, because the entry point will be incorrect in start_process. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 11 +++-------- dlls/ntdll/loader.c | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5a9fea2..0cb3d9b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1083,16 +1083,11 @@ static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ) * * Startup routine of a new process. Runs on the new process stack. */ -static DWORD WINAPI start_process( PEB *peb ) +static DWORD WINAPI start_process( LPTHREAD_START_ROUTINE entry ) { - IMAGE_NT_HEADERS *nt; - LPTHREAD_START_ROUTINE entry; - - nt = RtlImageNtHeader( peb->ImageBaseAddress ); - entry = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + - nt->OptionalHeader.AddressOfEntryPoint); + PEB *peb = NtCurrentTeb()->Peb; - if (!nt->OptionalHeader.AddressOfEntryPoint) + if (!entry) { ERR( "%s doesn't have an entry point, it cannot be executed\n", debugstr_w(peb->ProcessParameters->ImagePathName.Buffer) ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f1ef7ab..cf75850 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -99,6 +99,12 @@ struct builtin_load_info static struct builtin_load_info default_load_info; static struct builtin_load_info *builtin_load_info = &default_load_info; +struct start_params +{ + void *kernel_start; + LPTHREAD_START_ROUTINE entry; +}; + static HANDLE main_exe_file; static UINT tls_module_count; /* number of modules with TLS directory */ static IMAGE_TLS_DIRECTORY *tls_dirs; /* array of TLS directories */ @@ -3042,9 +3048,10 @@ static void load_global_options(void) /*********************************************************************** * start_process */ -static void start_process( void *kernel_start ) +static void start_process( void *arg ) { - call_thread_entry_point( kernel_start, NtCurrentTeb()->Peb ); + struct start_params *start_params = (struct start_params *)arg; + call_thread_entry_point( start_params->kernel_start, start_params->entry ); } /****************************************************************** @@ -3059,6 +3066,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, WINE_MODREF *wm; LPCWSTR load_path; PEB *peb = NtCurrentTeb()->Peb; + struct start_params start_params; if (main_exe_file) NtClose( main_exe_file ); /* at this point the main module is created */ @@ -3095,12 +3103,16 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; heap_set_debug_flags( GetProcessHeap() ); + /* Store original entrypoint (in case it gets corrupted) */ + start_params.kernel_start = kernel_start; + start_params.entry = wm->ldr.EntryPoint; + status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); if (status != STATUS_SUCCESS) goto error; virtual_release_address_space(); virtual_clear_thread_stack(); - wine_switch_to_stack( start_process, kernel_start, NtCurrentTeb()->Tib.StackBase ); + wine_switch_to_stack( start_process, &start_params, NtCurrentTeb()->Tib.StackBase ); error: ERR( "Main exe initialization for %s failed, status %x\n",

1 0

Hugh McMaster : regedit: Display a dialog message after successful/ unsuccessful file import.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 9e1d356d78e04db950326156d390afa7d2808f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1d356d78e04db950326156d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 9 11:08:20 2017 +0000 regedit: Display a dialog message after successful/unsuccessful file import. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 114 +++++++++++++++++++++++------------------- po/bg.po | 113 +++++++++++++++++++++++------------------- po/ca.po | 117 +++++++++++++++++++++++++------------------- po/cs.po | 114 +++++++++++++++++++++++------------------- po/da.po | 116 ++++++++++++++++++++++++------------------- po/de.po | 117 +++++++++++++++++++++++++------------------- po/el.po | 111 ++++++++++++++++++++++------------------- po/en.po | 112 +++++++++++++++++++++++------------------- po/en_US.po | 112 +++++++++++++++++++++++------------------- po/eo.po | 113 +++++++++++++++++++++++------------------- po/es.po | 116 ++++++++++++++++++++++++------------------- po/fa.po | 112 +++++++++++++++++++++++------------------- po/fi.po | 117 +++++++++++++++++++++++++------------------- po/fr.po | 117 +++++++++++++++++++++++++------------------- po/he.po | 115 ++++++++++++++++++++++++------------------- po/hi.po | 111 ++++++++++++++++++++++------------------- po/hr.po | 115 ++++++++++++++++++++++++------------------- po/hu.po | 115 ++++++++++++++++++++++++------------------- po/it.po | 116 ++++++++++++++++++++++++------------------- po/ja.po | 116 ++++++++++++++++++++++++------------------- po/ko.po | 114 +++++++++++++++++++++++------------------- po/lt.po | 117 +++++++++++++++++++++++++------------------- po/ml.po | 111 ++++++++++++++++++++++------------------- po/nb_NO.po | 117 +++++++++++++++++++++++++------------------- po/nl.po | 116 ++++++++++++++++++++++++------------------- po/or.po | 111 ++++++++++++++++++++++------------------- po/pa.po | 111 ++++++++++++++++++++++------------------- po/pl.po | 114 +++++++++++++++++++++++------------------- po/pt_BR.po | 117 +++++++++++++++++++++++++------------------- po/pt_PT.po | 116 ++++++++++++++++++++++++------------------- po/rm.po | 112 +++++++++++++++++++++++------------------- po/ro.po | 117 +++++++++++++++++++++++++------------------- po/ru.po | 117 +++++++++++++++++++++++++------------------- po/sk.po | 113 +++++++++++++++++++++++------------------- po/sl.po | 114 +++++++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 113 +++++++++++++++++++++++------------------- po/sr_RS(a)latin.po | 113 +++++++++++++++++++++++------------------- po/sv.po | 115 ++++++++++++++++++++++++------------------- po/te.po | 111 ++++++++++++++++++++++------------------- po/th.po | 112 +++++++++++++++++++++++------------------- po/tr.po | 117 +++++++++++++++++++++++++------------------- po/uk.po | 117 +++++++++++++++++++++++++------------------- po/wa.po | 112 +++++++++++++++++++++++------------------- po/wine.pot | 111 ++++++++++++++++++++++------------------- po/zh_CN.po | 115 ++++++++++++++++++++++++------------------- po/zh_TW.po | 114 +++++++++++++++++++++++------------------- programs/regedit/framewnd.c | 7 ++- programs/regedit/regedit.rc | 2 + programs/regedit/resource.h | 2 + 49 files changed, 2920 insertions(+), 2347 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e1d356d78e04db950326…

1 0

Hugh McMaster : regedit: Refresh listview after import.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: e23ca416bd873cb546a44950c406862677044831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23ca416bd873cb546a44950c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 9 11:12:03 2017 +0000 regedit: Refresh listview after import. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index fb29ffb..6b549d6 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -354,6 +354,8 @@ static BOOL ImportRegistryFile(HWND hWnd) { OPENFILENAMEW ofn; WCHAR title[128]; + HKEY root_key = NULL; + WCHAR *key_path; InitOpenFileName(hWnd, &ofn); ofn.Flags |= OFN_ENABLESIZING; @@ -371,6 +373,11 @@ static BOOL ImportRegistryFile(HWND hWnd) CheckCommDlgError(hWnd); } RefreshTreeView(g_pChildWnd->hTreeWnd); + + key_path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &root_key); + RefreshListView(g_pChildWnd->hListWnd, root_key, key_path, NULL); + HeapFree(GetProcessHeap(), 0, key_path); + return TRUE; }

1 0

Hugh McMaster : regedit: Sort treeview children on refresh.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 7073e27fbd61c7d2eeff8e4e3ccf1dfa0eca581b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7073e27fbd61c7d2eeff8e4e3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 9 11:12:14 2017 +0000 regedit: Sort treeview children on refresh. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 9d9fa6d..d07399d 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -482,6 +482,7 @@ BOOL RefreshTreeView(HWND hwndTV) SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); InvalidateRect(hwndTV, NULL, FALSE); + SendMessageW(hwndTV, TVM_SORTCHILDREN, TRUE, (LPARAM)hSelectedItem); SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */

1 0

Carlos Garnacho : winex11: Use XIAllDevices to select for XI_RawMotion.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 448433ae034841b47b79af1c652c1a7f45d2895f URL: http://source.winehq.org/git/wine.git/?a=commit;h=448433ae034841b47b79af1c6… Author: Carlos Garnacho <carlosg(a)gnome.org> Date: Wed Feb 8 01:50:31 2017 +0100 winex11: Use XIAllDevices to select for XI_RawMotion. Instead of selecting for XI2 events for every slave device individually, do it for XIAllDevices, and store the current device's relative X/Y valuators so they can be quickly looked up in the XI_RawMotion events received. Signed-off-by: Carlos Garnacho <carlosg(a)gnome.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 185 +++++++++++++++++++++++++++++++--------------- dlls/winex11.drv/x11drv.h | 10 +++ 2 files changed, 137 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=448433ae034841b47b79a…

1 0