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 2017
----- 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
595 discussions
Start a n
N
ew thread
Austin English : wmvcore: Add WMCheckURLScheme stub.
by Alexandre Julliard
20 Jun '17
20 Jun '17
Module: wine Branch: master Commit: 3f6b7c34dbf76fdbf7561a3fe5019713b10d1c9e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3f6b7c34dbf76fdbf7561a3fe…
Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 14 15:29:26 2017 -0500 wmvcore: Add WMCheckURLScheme stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 9 +- include/Makefile.in | 2 + include/nserror.h | 1266 +++++++++++++++++++++++++++++++++++++++++++ include/wmsdk.h | 26 + 5 files changed, 1303 insertions(+), 2 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f6b7c34dbf76fdbf7561…
1
0
0
0
Hugh McMaster : regedit: Use a generic data type to correctly process all data types.
by Alexandre Julliard
20 Jun '17
20 Jun '17
Module: wine Branch: master Commit: e3234f6ede1e84eb1c7595f2971206620d9b4188 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e3234f6ede1e84eb1c7595f29…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 20 13:25:32 2017 +0000 regedit: Use a generic data type to correctly process all data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 16 ++++++---------- programs/regedit/tests/regedit.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e08ffa6..e75ebec 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -160,10 +160,10 @@ struct parser HKEY hkey; /* current registry key */ WCHAR *key_name; /* current key name */ WCHAR *value_name; /* value name */ + DWORD parse_type; /* generic data type for parsing */ DWORD data_type; /* data type */ void *data; /* value data */ DWORD data_size; /* size of the data (in bytes) */ - BOOL hex_type; /* parsing a hex data type */ enum parser_state state; /* current parser state */ }; @@ -309,6 +309,7 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) if (strncmpW(ptr->tag, *line, ptr->len)) continue; + parser->parse_type = ptr->parse_type; parser->data_type = ptr->parse_type; *line += ptr->len; @@ -323,7 +324,6 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) return FALSE; parser->data_type = val; - parser->hex_type = TRUE; *line = end + 2; } return TRUE; @@ -720,7 +720,7 @@ static WCHAR *data_type_state(struct parser *parser, WCHAR *pos) return line; } - switch (parser->data_type) + switch (parser->parse_type) { case REG_SZ: set_state(parser, STRING_DATA); @@ -728,10 +728,7 @@ static WCHAR *data_type_state(struct parser *parser, WCHAR *pos) case REG_DWORD: set_state(parser, DWORD_DATA); break; - case REG_NONE: - case REG_EXPAND_SZ: - case REG_BINARY: - case REG_MULTI_SZ: + case REG_BINARY: /* all hex data types, including undefined */ set_state(parser, HEX_DATA); break; default: @@ -828,11 +825,10 @@ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) RegSetValueExW(parser->hkey, parser->value_name, 0, parser->data_type, parser->data, parser->data_size); - if (parser->data_type == REG_DWORD || parser->hex_type) + if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) { HeapFree(GetProcessHeap(), 0, parser->data); parser->data = NULL; - parser->hex_type = FALSE; } if (parser->reg_version == REG_VERSION_31) @@ -1469,10 +1465,10 @@ BOOL import_registry_file(FILE *reg_file) parser.hkey = NULL; parser.key_name = NULL; parser.value_name = NULL; + parser.parse_type = 0; parser.data_type = 0; parser.data = NULL; parser.data_size = 0; - parser.hex_type = FALSE; parser.state = HEADER; pos = parser.two_wchars; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index ec488bf..96091f8 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -457,14 +457,14 @@ static void test_basic_import(void) "\"Wine13h\"=hex(ffffffff):56,61,6c,75,65,00\n" "\"Wine13i\"=hex(100000000):56,61,6c,75,65,00\n\n"); verify_reg(hkey, "Wine13a", REG_NONE, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13b", 0x10, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13c", 0x100, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13d", 0x1000, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13e", 0x7fff, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13f", 0xffff, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); - verify_reg_nonexist(hkey, "Wine13i"); + verify_reg(hkey, "Wine13b", 0x10, "Value", 6, 0); + verify_reg(hkey, "Wine13c", 0x100, "Value", 6, 0); + verify_reg(hkey, "Wine13d", 0x1000, "Value", 6, 0); + verify_reg(hkey, "Wine13e", 0x7fff, "Value", 6, 0); + verify_reg(hkey, "Wine13f", 0xffff, "Value", 6, 0); + verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); + verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); + todo_wine verify_reg_nonexist(hkey, "Wine13i"); RegCloseKey(hkey);
1
0
0
0
Dmitry Timoshkov : include: Print contents of VT_LPSTR and VT_LPWSTR variants in wine_dbgstr_variant.
by Alexandre Julliard
20 Jun '17
20 Jun '17
Module: wine Branch: master Commit: 8fd6c63bf33b1d501e12f3937cddfdfbf0a7ab8c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8fd6c63bf33b1d501e12f3937…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:31 2017 +0800 include: Print contents of VT_LPSTR and VT_LPWSTR variants in wine_dbgstr_variant. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/wine/debug.h b/include/wine/debug.h index 5409d70..fb0d6bb 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -296,6 +296,10 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) return wine_dbg_sprintf( "%p {VT_CY: %s}", v, wine_dbgstr_longlong(V_CY(v).int64) ); case VT_DATE: return wine_dbg_sprintf( "%p {VT_DATE: %lf}", v, V_DATE(v) ); + case VT_LPSTR: + return wine_dbg_sprintf( "%p {VT_LPSTR: %s}", v, wine_dbgstr_a((const char *)V_BSTR(v)) ); + case VT_LPWSTR: + return wine_dbg_sprintf( "%p {VT_LPWSTR: %s}", v, wine_dbgstr_w(V_BSTR(v)) ); case VT_BSTR: return wine_dbg_sprintf( "%p {VT_BSTR: %s}", v, wine_dbgstr_w(V_BSTR(v)) ); case VT_DISPATCH:
1
0
0
0
Dmitry Timoshkov : propsys: Add support for VT_LPSTR to PropVariantChangeType.
by Alexandre Julliard
20 Jun '17
20 Jun '17
Module: wine Branch: master Commit: db7e816c9c4294a7ee443a0397fb08e1ef432128 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=db7e816c9c4294a7ee443a039…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:00 2017 +0800 propsys: Add support for VT_LPSTR to PropVariantChangeType. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index fc6cf58..8a8698f 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -385,6 +385,31 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p return hr; } + case VT_LPSTR: + { + WCHAR *resW; + hr = PropVariantToStringAlloc(propvarSrc, &resW); + if (SUCCEEDED(hr)) + { + char *res; + DWORD len; + + len = WideCharToMultiByte(CP_ACP, 0, resW, -1, NULL, 0, NULL, NULL); + res = CoTaskMemAlloc(len); + if (res) + { + WideCharToMultiByte(CP_ACP, 0, resW, -1, res, len, NULL, NULL); + ppropvarDest->vt = VT_LPSTR; + ppropvarDest->u.pszVal = res; + } + else + hr = E_OUTOFMEMORY; + + CoTaskMemFree(resW); + } + return hr; + } + default: FIXME("Unhandled dest type: %d\n", vt); return E_FAIL;
1
0
0
0
Dmitry Timoshkov : propsys: Make VT_FILETIME handling by PropVariantChangeType more implicit.
by Alexandre Julliard
20 Jun '17
20 Jun '17
Module: wine Branch: master Commit: 3a7fb7575175f09eb961822fa86d1f78c5bf9d51 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3a7fb7575175f09eb961822fa…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:36:56 2017 +0800 propsys: Make VT_FILETIME handling by PropVariantChangeType more implicit. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 1d762d0..fc6cf58 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -36,12 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(propsys); -static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest, - REFPROPVARIANT propvarSrc, VARTYPE vt) +static HRESULT PROPVAR_ConvertFILETIME(const FILETIME *ft, PROPVARIANT *ppropvarDest, VARTYPE vt) { SYSTEMTIME time; - FileTimeToSystemTime(&propvarSrc->u.filetime, &time); + FileTimeToSystemTime(ft, &time); switch (vt) { @@ -272,9 +271,12 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p FIXME("(%p, %p, %d, %d, %d): semi-stub!\n", ppropvarDest, propvarSrc, propvarSrc->vt, flags, vt); - if(vt == propvarSrc->vt) + if (vt == propvarSrc->vt) return PropVariantCopy(ppropvarDest, propvarSrc); + if (propvarSrc->vt == VT_FILETIME) + return PROPVAR_ConvertFILETIME(&propvarSrc->u.filetime, ppropvarDest, vt); + switch (vt) { case VT_I1: @@ -382,17 +384,11 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p } return hr; } - } - switch (propvarSrc->vt) - { - case VT_FILETIME: - return PROPVAR_ConvertFILETIME(ppropvarDest, propvarSrc, vt); - default: - FIXME("Unhandled source type: %d\n", propvarSrc->vt); + default: + FIXME("Unhandled dest type: %d\n", vt); + return E_FAIL; } - - return E_FAIL; } static void PROPVAR_GUIDToWSTR(REFGUID guid, WCHAR *str)
1
0
0
0
Dmitry Timoshkov : propsys: Add support for VT_BSTR to PropVariantChangeType.
by Alexandre Julliard
20 Jun '17
20 Jun '17
Module: wine Branch: master Commit: aa8dc616e078e60b947aa6618501d69aaa9ace09 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aa8dc616e078e60b947aa6618…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:36:51 2017 +0800 propsys: Add support for VT_BSTR to PropVariantChangeType. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index af486d6..1d762d0 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -369,7 +369,9 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p } return hr; } + case VT_LPWSTR: + case VT_BSTR: { WCHAR *res; hr = PropVariantToStringAlloc(propvarSrc, &res);
1
0
0
0
Dmitry Timoshkov : propsys: Add support for VT_LPWSTR and VT_BSTR to PropVariantToStringAlloc.
by Alexandre Julliard
20 Jun '17
20 Jun '17
Module: wine Branch: master Commit: 97c512082c0eccb1606061c4f5435d2065a74bc9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=97c512082c0eccb1606061c4f…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:36:47 2017 +0800 propsys: Add support for VT_LPWSTR and VT_BSTR to PropVariantToStringAlloc. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 007fd94..af486d6 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -224,6 +224,7 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) res = CoTaskMemAlloc(1*sizeof(WCHAR)); res[0] = '\0'; break; + case VT_LPSTR: if(propvarIn->u.pszVal) { @@ -237,6 +238,18 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) MultiByteToWideChar(CP_ACP, 0, propvarIn->u.pszVal, -1, res, len); } break; + + case VT_LPWSTR: + case VT_BSTR: + if (propvarIn->u.pwszVal) + { + DWORD size = (lstrlenW(propvarIn->u.pwszVal) + 1) * sizeof(WCHAR); + res = CoTaskMemAlloc(size); + if(!res) return E_OUTOFMEMORY; + memcpy(res, propvarIn->u.pwszVal, size); + } + break; + default: FIXME("Unsupported conversion (%d)\n", propvarIn->vt); hr = E_FAIL;
1
0
0
0
Dmitry Timoshkov : propsys: Add support for VT_I1 and VT_UI1 to PropVariantChangeType.
by Alexandre Julliard
20 Jun '17
20 Jun '17
Module: wine Branch: master Commit: 09a2547f2d68c7892c148f0c4116268a98a49ccc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=09a2547f2d68c7892c148f0c4…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:36:35 2017 +0800 propsys: Add support for VT_I1 and VT_UI1 to PropVariantChangeType. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 3fee67a..007fd94 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -264,6 +264,32 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p switch (vt) { + case VT_I1: + { + LONGLONG res; + + hr = PROPVAR_ConvertNumber(propvarSrc, 8, TRUE, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_I1; + ppropvarDest->u.cVal = (char)res; + } + return hr; + } + + case VT_UI1: + { + LONGLONG res; + + hr = PROPVAR_ConvertNumber(propvarSrc, 8, FALSE, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_UI1; + ppropvarDest->u.bVal = (UCHAR)res; + } + return hr; + } + case VT_I2: { SHORT res;
1
0
0
0
Austin English : ntoskrnl: Add KeAcquireSpinLockRaiseToDpc stub.
by Alexandre Julliard
20 Jun '17
20 Jun '17
Module: wine Branch: master Commit: 0c3a2a67a2fe6d84d9db17468271ced18a018191 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0c3a2a67a2fe6d84d9db17468…
Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 15 14:41:19 2017 -0500 ntoskrnl: Add KeAcquireSpinLockRaiseToDpc stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4b8a005..6287967 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3240,5 +3240,14 @@ void WINAPI __regs_KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) #endif { - FIXME( "stub: %p\n", handle); + FIXME( "stub: %p\n", handle ); +} + +/*********************************************************************** + * KeAcquireSpinLockRaiseToDpc (NTOSKRNL.EXE.@) + */ +KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK *spinlock) +{ + FIXME( "stub: %p\n", spinlock ); + return 0; } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 25649c9..aba5cb5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -510,6 +510,7 @@ @ stdcall Ke386SetIoAccessMap(long ptr) @ stub KeAcquireInterruptSpinLock @ stub KeAcquireSpinLockAtDpcLevel +@ stdcall -arch=x86_64 KeAcquireSpinLockRaiseToDpc(ptr) @ stub KeAddSystemServiceTable @ stub KeAreApcsDisabled @ stub KeAttachProcess
1
0
0
0
Jacek Caban : server: Introduce create_server_async and use it in read request handler.
by Alexandre Julliard
20 Jun '17
20 Jun '17
Module: wine Branch: master Commit: 26c5336494de2f85a87fb955a2caf46aa0718fd2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=26c5336494de2f85a87fb955a…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 13 16:46:41 2017 +0200 server: Introduce create_server_async and use it in read request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 14 ++++++++++++++ server/fd.c | 14 ++++---------- server/file.h | 1 + 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/server/async.c b/server/async.c index f9d8af3..d1cea9a 100644 --- a/server/async.c +++ b/server/async.c @@ -272,6 +272,20 @@ struct async *create_async( struct thread *thread, const async_data_t *data, str return async; } +/* create an async associated with iosb for async-based requests */ +struct async *create_request_async( struct thread *thread, const async_data_t *data ) +{ + struct async *async; + struct iosb *iosb; + + if (!(iosb = create_iosb( get_req_data(), get_req_data_size(), get_reply_max_size() ))) + return NULL; + + async = create_async( current, data, iosb ); + release_object( iosb ); + return async; +} + /* set the timeout of an async operation */ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ) { diff --git a/server/fd.c b/server/fd.c index 3c8f1bd..f05556a 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2446,20 +2446,14 @@ DECL_HANDLER(read) { struct fd *fd = get_handle_fd_obj( current->process, req->async.handle, FILE_READ_DATA ); struct async *async; - struct iosb *iosb; if (!fd) return; - if ((iosb = create_iosb( NULL, 0, get_reply_max_size() ))) + if ((async = create_request_async( current, &req->async ))) { - async = create_async( current, &req->async, iosb ); - if (async) - { - reply->wait = fd->fd_ops->read( fd, async, req->pos ); - reply->options = fd->options; - release_object( async ); - } - release_object( iosb ); + reply->wait = fd->fd_ops->read( fd, async, req->pos ); + reply->options = fd->options; + release_object( async ); } release_object( fd ); } diff --git a/server/file.h b/server/file.h index 5ea8f0f..30db87e 100644 --- a/server/file.h +++ b/server/file.h @@ -176,6 +176,7 @@ extern struct object *create_serial( struct fd *fd ); extern struct async_queue *create_async_queue( struct fd *fd ); extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct thread *thread, const async_data_t *data, struct iosb *iosb ); +extern struct async *create_request_async( struct thread *thread, const async_data_t *data ); extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total );
1
0
0
0
← Newer
1
...
18
19
20
21
22
23
24
...
60
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
Results per page:
10
25
50
100
200