winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2015
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
610 discussions
Start a n
N
ew thread
Jared Smudde : winhlp32: Move Always on top to Options.
by Alexandre Julliard
24 Jun '15
24 Jun '15
Module: wine Branch: master Commit: 49b6b60e2311f85ddfa86fc68bcb2d85d4e68160 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=49b6b60e2311f85ddfa86fc68…
Author: Jared Smudde <computerwhiz02(a)hotmail.com> Date: Mon Jun 22 08:36:11 2015 -0500 winhlp32: Move Always on top to Options. --- po/ar.po | 22 +++++++++++----------- po/bg.po | 22 +++++++++++----------- po/ca.po | 22 +++++++++++----------- po/cs.po | 22 +++++++++++----------- po/da.po | 22 +++++++++++----------- po/de.po | 22 +++++++++++----------- po/el.po | 22 +++++++++++----------- po/en.po | 22 +++++++++++----------- po/en_US.po | 22 +++++++++++----------- po/eo.po | 22 +++++++++++----------- po/es.po | 22 +++++++++++----------- po/fa.po | 22 +++++++++++----------- po/fi.po | 22 +++++++++++----------- po/fr.po | 22 +++++++++++----------- po/he.po | 22 +++++++++++----------- po/hi.po | 24 ++++++++++++------------ po/hr.po | 22 +++++++++++----------- po/hu.po | 22 +++++++++++----------- po/it.po | 22 +++++++++++----------- po/ja.po | 22 +++++++++++----------- po/ko.po | 22 +++++++++++----------- po/lt.po | 22 +++++++++++----------- po/ml.po | 24 ++++++++++++------------ po/nb_NO.po | 22 +++++++++++----------- po/nl.po | 22 +++++++++++----------- po/or.po | 24 ++++++++++++------------ po/pa.po | 24 ++++++++++++------------ po/pl.po | 22 +++++++++++----------- po/pt_BR.po | 22 +++++++++++----------- po/pt_PT.po | 22 +++++++++++----------- po/rm.po | 22 +++++++++++----------- po/ro.po | 22 +++++++++++----------- po/ru.po | 22 +++++++++++----------- po/sk.po | 22 +++++++++++----------- po/sl.po | 22 +++++++++++----------- po/sr_RS(a)cyrillic.po | 24 ++++++++++++------------ po/sr_RS(a)latin.po | 22 +++++++++++----------- po/sv.po | 22 +++++++++++----------- po/te.po | 24 ++++++++++++------------ po/th.po | 24 ++++++++++++------------ po/tr.po | 22 +++++++++++----------- po/uk.po | 22 +++++++++++----------- po/wa.po | 22 +++++++++++----------- po/wine.pot | 22 +++++++++++----------- po/zh_CN.po | 22 +++++++++++----------- po/zh_TW.po | 22 +++++++++++----------- programs/winhlp32/winhlp32.rc | 2 +- 47 files changed, 514 insertions(+), 514 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=49b6b60e2311f85ddfa86…
1
0
0
0
Hugh McMaster : regsvr32: Make Dll* exports WINAPI.
by Alexandre Julliard
24 Jun '15
24 Jun '15
Module: wine Branch: master Commit: 3f01461ddc2743ee931bfa683bcef88974ab6462 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3f01461ddc2743ee931bfa683…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu May 28 20:00:57 2015 +1000 regsvr32: Make Dll* exports WINAPI. --- programs/regsvr32/regsvr32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 2e7af5b..c539095 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -59,9 +59,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(regsvr32); -typedef HRESULT (*DLLREGISTER) (void); -typedef HRESULT (*DLLUNREGISTER) (void); -typedef HRESULT (*DLLINSTALL) (BOOL,LPCWSTR); +typedef HRESULT (WINAPI *DLLREGISTER) (void); +typedef HRESULT (WINAPI *DLLUNREGISTER) (void); +typedef HRESULT (WINAPI *DLLINSTALL) (BOOL,LPCWSTR); static BOOL Silent = FALSE;
1
0
0
0
Hugh McMaster : regsvr32: Add WriteFile fallback if WriteConsole fails.
by Alexandre Julliard
24 Jun '15
24 Jun '15
Module: wine Branch: master Commit: 485b8dfcf2e4865b2633ce10f046d7689db68d05 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=485b8dfcf2e4865b2633ce10f…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 23 21:27:23 2015 +1000 regsvr32: Add WriteFile fallback if WriteConsole fails. --- programs/regsvr32/regsvr32.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 1c9d1b0..2e7af5b 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -93,9 +93,23 @@ static void __cdecl output_write(UINT id, ...) ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &nOut, NULL); + /* WriteConsole fails if its output is redirected to a file. + * If this occurs, we should use an OEM codepage and call WriteFile. + */ if (!ret) - WINE_WARN("regsvr32: WriteConsoleW() failed.\n"); + { + DWORD lenA; + char *strA; + lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, NULL, 0, NULL, NULL); + strA = HeapAlloc(GetProcessHeap(), 0, lenA); + if (strA) + { + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &nOut, FALSE); + HeapFree(GetProcessHeap(), 0, strA); + } + } LocalFree(str); }
1
0
0
0
Hugh McMaster : regsvr32: Convert codebase to Unicode.
by Alexandre Julliard
24 Jun '15
24 Jun '15
Module: wine Branch: master Commit: fdae80d45f0ed62971925c08978089abdb5698f9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fdae80d45f0ed62971925c089…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 23 21:27:22 2015 +1000 regsvr32: Convert codebase to Unicode. --- po/ar.po | 2 +- po/bg.po | 2 +- po/ca.po | 4 ++-- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 4 ++-- po/el.po | 2 +- po/en.po | 4 ++-- po/en_US.po | 4 ++-- po/eo.po | 2 +- po/es.po | 2 +- po/fa.po | 2 +- po/fi.po | 4 ++-- po/fr.po | 4 ++-- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 4 ++-- po/ko.po | 2 +- po/lt.po | 4 ++-- po/ml.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 2 +- po/or.po | 2 +- po/pa.po | 2 +- po/pl.po | 4 ++-- po/pt_BR.po | 4 ++-- po/pt_PT.po | 2 +- po/rm.po | 2 +- po/ro.po | 2 +- po/ru.po | 4 ++-- po/sk.po | 2 +- po/sl.po | 2 +- po/sr_RS(a)cyrillic.po | 2 +- po/sr_RS(a)latin.po | 2 +- po/sv.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/wa.po | 2 +- po/wine.pot | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- programs/regsvr32/Makefile.in | 2 +- programs/regsvr32/regsvr32.c | 51 +++++++++++++++++++------------------------ programs/regsvr32/regsvr32.rc | 2 +- 49 files changed, 81 insertions(+), 88 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdae80d45f0ed62971925…
1
0
0
0
Jacek Caban : msscript.ocx: Added DLL registration implementation.
by Alexandre Julliard
24 Jun '15
24 Jun '15
Module: wine Branch: master Commit: 611b6725e12aa1d4a3e6b724dafe8cd6c3e75f76 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=611b6725e12aa1d4a3e6b724d…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 24 10:26:12 2015 +0200 msscript.ocx: Added DLL registration implementation. --- dlls/msscript.ocx/Makefile.in | 1 + dlls/msscript.ocx/msscript.c | 11 ++++++++--- dlls/msscript.ocx/msscript.idl | 5 ++++- dlls/msscript.ocx/msscript.rc | 20 ++++++++++++++++++++ dlls/msscript.ocx/msscript.rgs | 27 +++++++++++++++++++++++++++ 5 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index 6c0e09a..0cbc964 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -1,4 +1,5 @@ MODULE = msscript.ocx +RC_SRCS = msscript.rc IDL_SRCS = msscript.idl C_SRCS = \ diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 330ad76..30666a0 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -17,11 +17,15 @@ */ #include "windows.h" +#include "ole2.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msscript); +static HINSTANCE msscript_instance; + /****************************************************************** * DllMain (msscript.ocx.@) */ @@ -33,6 +37,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID lpv) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + msscript_instance = instance; DisableThreadLibraryCalls(instance); break; } @@ -63,8 +68,8 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("()\n"); - return E_NOTIMPL; + TRACE("()\n"); + return __wine_register_resources(msscript_instance); } /*********************************************************************** @@ -73,5 +78,5 @@ HRESULT WINAPI DllRegisterServer(void) HRESULT WINAPI DllUnregisterServer(void) { TRACE("()\n"); - return E_NOTIMPL; + return __wine_unregister_resources(msscript_instance); } diff --git a/dlls/msscript.ocx/msscript.idl b/dlls/msscript.ocx/msscript.idl index e498723..244e85b 100644 --- a/dlls/msscript.ocx/msscript.idl +++ b/dlls/msscript.ocx/msscript.idl @@ -294,7 +294,10 @@ library MSScriptControl [ helpstring("ScriptControl Object"), - uuid(0e59f1d5-1fbe-11d0-8ff2-00a0d10038bc) + uuid(0e59f1d5-1fbe-11d0-8ff2-00a0d10038bc), + threading(apartment), + progid("MSScriptControl.ScriptControl.1"), + vi_progid("MSScriptControl.ScriptControl") ] coclass ScriptControl { [default] interface IScriptControl; diff --git a/dlls/msscript.ocx/msscript.rc b/dlls/msscript.ocx/msscript.rc new file mode 100644 index 0000000..8a766fa --- /dev/null +++ b/dlls/msscript.ocx/msscript.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2015 Jacek Caban 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 + */ + +/* @makedep: msscript.rgs */ +2 WINE_REGISTRY msscript.rgs diff --git a/dlls/msscript.ocx/msscript.rgs b/dlls/msscript.ocx/msscript.rgs new file mode 100644 index 0000000..46c266a --- /dev/null +++ b/dlls/msscript.ocx/msscript.rgs @@ -0,0 +1,27 @@ +HKCR +{ + NoRemove CLSID + { + '{0e59f1d5-1fbe-11d0-8ff2-00a0d10038bc}' + { + 'Implemented Categories' + { + '{0de86a52-2baa-11cf-a229-00aa003d7352}' + '{0de86a53-2baa-11cf-a229-00aa003d7352}' + '{0de86a57-2baa-11cf-a229-00aa003d7352}' + '{40fc6ed4-2438-11cf-a3db-080036f12502}' + '{40fc6ed5-2438-11cf-a3db-080036f12502}' + } + Control + MiscStatus = s '0' + { + '1' = s '132499' + } + } + } + 'ScriptControl' = s 'ScriptControl Object' + { + CLSID = s '{0e59f1d5-1fbe-11d0-8ff2-00a0d10038bc}' + CurVer = s 'MSScriptControl.ScriptControl.1' + } +}
1
0
0
0
Jacek Caban : msscript.ocx: Added typelib.
by Alexandre Julliard
24 Jun '15
24 Jun '15
Module: wine Branch: master Commit: 90466296e34f16520602fff1dcd523aeb3949899 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=90466296e34f16520602fff1d…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 24 10:26:03 2015 +0200 msscript.ocx: Added typelib. --- configure | 2 +- configure.ac | 2 +- dlls/msscript.ocx/Makefile.in | 1 + dlls/msscript.ocx/msscript.idl | 303 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 306 insertions(+), 2 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=90466296e34f16520602f…
1
0
0
0
André Hentschel : include: Add IMAGE_LOAD_CONFIG_DIRECTORY64 definition.
by Alexandre Julliard
24 Jun '15
24 Jun '15
Module: wine Branch: master Commit: 8d4917e865e8c423a554267f6e8a7a6bc9043d7a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8d4917e865e8c423a554267f6…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 23 20:57:32 2015 +0200 include: Add IMAGE_LOAD_CONFIG_DIRECTORY64 definition. --- dlls/ntdll/tests/generated.c | 396 +++++++++++++++++++++++++++++-------------- include/winnt.h | 35 +++- tools/winapi/tests.dat | 2 + 3 files changed, 306 insertions(+), 127 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d4917e865e8c423a5542…
1
0
0
0
Sebastian Lackner : ntoskrnl: Use SIZE_T to store 64-bit offset to USER_SHARED_DATA page.
by Alexandre Julliard
24 Jun '15
24 Jun '15
Module: wine Branch: master Commit: 3d203b1ecb4ac1ab79888a1a333d993da464dd45 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3d203b1ecb4ac1ab79888a1a3…
Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jun 24 01:54:40 2015 +0200 ntoskrnl: Use SIZE_T to store 64-bit offset to USER_SHARED_DATA page. --- dlls/ntoskrnl.exe/instr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 1306d5f..85b872e 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -684,7 +684,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) BYTE *data = INSTR_GetOperandAddr( context, instr + 2, long_addr, rex, segprefix, &len ); unsigned int data_size = (instr[1] == 0xb7) ? 2 : 1; - unsigned int offset = data - user_shared_data; + SIZE_T offset = data - user_shared_data; if (offset <= sizeof(KSHARED_USER_DATA) - data_size) { @@ -705,7 +705,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) BYTE *data = INSTR_GetOperandAddr( context, instr + 1, long_addr, rex, segprefix, &len ); unsigned int data_size = (*instr == 0x8b) ? get_op_size( long_op, rex ) : 1; - unsigned int offset = data - user_shared_data; + SIZE_T offset = data - user_shared_data; if (offset <= sizeof(KSHARED_USER_DATA) - data_size) { @@ -725,7 +725,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) { BYTE *data = (BYTE *)(long_addr ? *(DWORD64 *)(instr + 1) : *(DWORD *)(instr + 1)); unsigned int data_size = (*instr == 0xa1) ? get_op_size( long_op, rex ) : 1; - unsigned int offset = data - user_shared_data; + SIZE_T offset = data - user_shared_data; len = long_addr ? sizeof(DWORD64) : sizeof(DWORD); if (offset <= sizeof(KSHARED_USER_DATA) - data_size)
1
0
0
0
Nikolay Sivov : amstream: Create a surface if it wasn' t provided in CreateSample().
by Alexandre Julliard
24 Jun '15
24 Jun '15
Module: wine Branch: master Commit: ed06707bacece1dfe03338039738d453af11fa30 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ed06707bacece1dfe03338039…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 23 23:24:46 2015 +0300 amstream: Create a surface if it wasn't provided in CreateSample(). --- dlls/amstream/mediastream.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/amstream/tests/amstream.c | 15 +++++++++++++-- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index ca4f0ce..947be1e 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -364,6 +364,7 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetDirect HRESULT hr = DirectDrawCreateEx(NULL, (void**)&This->ddraw, &IID_IDirectDraw7, NULL); if (FAILED(hr)) return hr; + IDirectDraw7_SetCooperativeLevel(This->ddraw, NULL, DDSCL_NORMAL); } return IDirectDraw7_QueryInterface(This->ddraw, &IID_IDirectDraw, (void**)ddraw); @@ -979,7 +980,39 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD IDirectDrawSurface_AddRef(surface); } else - FIXME("create ddraw surface\n"); + { + DDSURFACEDESC desc; + IDirectDraw *ddraw; + + hr = IDirectDrawMediaStream_GetDirectDraw(parent, &ddraw); + if (FAILED(hr)) + { + IDirectDrawStreamSample_Release(&object->IDirectDrawStreamSample_iface); + return hr; + } + + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS|DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT; + desc.dwHeight = 100; + desc.dwWidth = 100; + desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat); + desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + desc.ddpfPixelFormat.dwRGBBitCount = 32; + desc.ddpfPixelFormat.dwRBitMask = 0xff0000; + desc.ddpfPixelFormat.dwGBitMask = 0x00ff00; + desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; + desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0; + desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN; + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &object->surface, NULL); + IDirectDraw_Release(ddraw); + if (FAILED(hr)) + { + ERR("failed to create surface, 0x%08x\n", hr); + IDirectDrawStreamSample_Release(&object->IDirectDrawStreamSample_iface); + return hr; + } + } if (rect) object->rect = *rect; @@ -995,7 +1028,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD } } - *ddraw_stream_sample = (IDirectDrawStreamSample*)&object->IDirectDrawStreamSample_iface; + *ddraw_stream_sample = &object->IDirectDrawStreamSample_iface; return S_OK; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index b961084..909a738 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -452,11 +452,13 @@ static void test_media_streams(void) static void test_IDirectDrawStreamSample(void) { + DDSURFACEDESC desc = { sizeof(desc) }; IAMMultiMediaStream *pams; HRESULT hr; IMediaStream *pvidstream = NULL; IDirectDrawMediaStream *pddstream = NULL; IDirectDrawStreamSample *pddsample = NULL; + IDirectDrawSurface7 *surface7; IDirectDrawSurface *surface, *surface2; IDirectDraw *ddraw, *ddraw2; IDirectDraw7 *ddraw7; @@ -504,9 +506,18 @@ static void test_IDirectDrawStreamSample(void) surface = NULL; hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(surface != NULL, "got %p\n", surface); -if (surface) + + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void**)&surface7); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDirectDrawSurface7_Release(surface7); + + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(desc.dwWidth == 100, "width %d\n", desc.dwWidth); + ok(desc.dwHeight == 100, "height %d\n", desc.dwHeight); + ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "format flags %08x\n", desc.ddpfPixelFormat.dwFlags); + ok(desc.ddpfPixelFormat.dwRGBBitCount, "dwRGBBitCount %d\n", desc.ddpfPixelFormat.dwRGBBitCount); IDirectDrawSurface_Release(surface); IDirectDrawStreamSample_Release(pddsample);
1
0
0
0
Nikolay Sivov : qmgr: Simplify GetProgress() with a structure copy.
by Alexandre Julliard
24 Jun '15
24 Jun '15
Module: wine Branch: master Commit: 91e4394c1b9a3e9e8f785c895bde9259787990dd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=91e4394c1b9a3e9e8f785c895…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 23 19:59:40 2015 +0300 qmgr: Simplify GetProgress() with a structure copy. --- dlls/qmgr/file.c | 4 +--- dlls/qmgr/job.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index b92e52f..c132c7e 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -122,9 +122,7 @@ static HRESULT WINAPI BackgroundCopyFile_GetProgress( TRACE("(%p)->(%p)\n", file, pVal); EnterCriticalSection(&file->owner->cs); - pVal->BytesTotal = file->fileProgress.BytesTotal; - pVal->BytesTransferred = file->fileProgress.BytesTransferred; - pVal->Completed = file->fileProgress.Completed; + *pVal = file->fileProgress; LeaveCriticalSection(&file->owner->cs); return S_OK; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index fda7a01..f6891e3 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -506,10 +506,7 @@ static HRESULT WINAPI BackgroundCopyJob_GetProgress( return E_INVALIDARG; EnterCriticalSection(&This->cs); - pVal->BytesTotal = This->jobProgress.BytesTotal; - pVal->BytesTransferred = This->jobProgress.BytesTransferred; - pVal->FilesTotal = This->jobProgress.FilesTotal; - pVal->FilesTransferred = This->jobProgress.FilesTransferred; + *pVal = This->jobProgress; LeaveCriticalSection(&This->cs); return S_OK;
1
0
0
0
← Newer
1
...
12
13
14
15
16
17
18
...
61
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
Results per page:
10
25
50
100
200