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
February 2019
----- 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
1 participants
672 discussions
Start a n
N
ew thread
Jactry Zeng : propsys: Implement PSCreateMemoryPropertyStore().
by Alexandre Julliard
14 Feb '19
14 Feb '19
Module: wine Branch: master Commit: 906f91db323effed0bf52712fa5794368b145ed4 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=906f91db323effed0bf52712…
Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Feb 7 16:31:59 2019 +0800 propsys: Implement PSCreateMemoryPropertyStore(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 7 ++++++ dlls/propsys/tests/propstore.c | 54 ++++++++++++++++++++++++++++++++++++++++++ include/propsys.idl | 1 + 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index bbc7165..19c5a24 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -65,7 +65,7 @@ @ stub PSCoerceToCanonicalValue @ stub PSCreateAdapterFromPropertyStore @ stub PSCreateDelayedMultiplexPropertyStore -@ stub PSCreateMemoryPropertyStore +@ stdcall PSCreateMemoryPropertyStore(ptr ptr) @ stub PSCreateMultiplexPropertyStore @ stub PSCreatePropertyChangeArray @ stub PSCreatePropertyStoreFromObject diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 1dbaee4..65d157d 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -509,3 +509,10 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) return S_OK; } + +HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID riid, void **ppv) +{ + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + return PropertyStore_CreateInstance(NULL, riid, ppv); +} diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 3fe8613..132f5ff 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -35,6 +35,15 @@ DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static void test_inmemorystore(void) { IPropertyStoreCache *propcache; @@ -249,12 +258,57 @@ static void test_persistserialized(void) IPersistSerializedPropStorage_Release(serialized); } +static void test_PSCreateMemoryPropertyStore(void) +{ + IPropertyStore *propstore, *propstore1; + IPersistSerializedPropStorage *serialized; + IPropertyStoreCache *propstorecache; + HRESULT hr; + + /* PSCreateMemoryPropertyStore(&IID_IPropertyStore, NULL); crashes */ + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + EXPECT_REF(propstore, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPersistSerializedPropStorage, (void **)&serialized); + todo_wine ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + todo_wine ok(serialized != NULL, "got %p.\n", serialized); + EXPECT_REF(propstore, 1); + if(serialized) + { + EXPECT_REF(serialized, 1); + IPersistSerializedPropStorage_Release(serialized); + } + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStoreCache, (void **)&propstorecache); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstorecache != NULL, "got %p.\n", propstore); + ok(propstorecache != (IPropertyStoreCache *)propstore, "pointer are equal: %p, %p.\n", propstorecache, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstorecache, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore1); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore1 != NULL, "got %p.\n", propstore); + ok(propstore1 != propstore, "pointer are equal: %p, %p.\n", propstore1, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstore1, 1); + EXPECT_REF(propstorecache, 1); + + IPropertyStore_Release(propstore1); + IPropertyStore_Release(propstore); + IPropertyStoreCache_Release(propstorecache); +} + START_TEST(propstore) { CoInitialize(NULL); test_inmemorystore(); test_persistserialized(); + test_PSCreateMemoryPropertyStore(); CoUninitialize(); } diff --git a/include/propsys.idl b/include/propsys.idl index 04d3fbf..bdd67fa 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -799,6 +799,7 @@ cpp_quote("#define PKEY_PIDSTR_MAX 10") cpp_quote("#define GUIDSTRING_MAX 39") cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") +cpp_quote("HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID,void **);") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);")
1
0
0
0
Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard
14 Feb '19
14 Feb '19
Module: wine Branch: master Commit: bb4d919faf40ddd52bc03db57e38a28927efba01 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=bb4d919faf40ddd52bc03db5…
Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Thu Feb 14 16:23:28 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 134 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 68 insertions(+), 66 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb4d919faf40ddd52bc0…
1
0
0
0
Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard
14 Feb '19
14 Feb '19
Module: wine Branch: master Commit: 8dd8479fc96d7155f0ba0bf0a30260b50d952cbf URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8dd8479fc96d7155f0ba0bf0…
Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 14 15:54:27 2019 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fi.po b/po/fi.po index d087619..a13ed5b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -14742,11 +14742,11 @@ msgstr "&Oikea" #: view.rc:49 msgid "Regular Metafile Viewer" -msgstr "Tavallisten metatiedostojen katselin" +msgstr "Tavallisten Metafile-tiedostojen katselin" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafile-tiedostot (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program"
1
0
0
0
Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard
14 Feb '19
14 Feb '19
Module: wine Branch: master Commit: d596f3a22bc900bd9bbffe025768fb932bcb124f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d596f3a22bc900bd9bbffe02…
Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Feb 14 09:09:01 2019 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/lt.po b/po/lt.po index dcbb1ad..3476414 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To:
https://bugs.winehq.org\n
" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-14 21:07+0300\n" +"PO-Revision-Date: 2019-02-14 09:08+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14783,7 +14783,7 @@ msgstr "Įprastinė metafailų žiūryklė" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafailai (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program"
1
0
0
0
Alexandre Julliard : ntdll: Store extended FPU state and debug registers in RtlRaiseException().
by Alexandre Julliard
14 Feb '19
14 Feb '19
Module: wine Branch: master Commit: 20a2cc9751d1f32e610704a9bd58d2b99eaf0534 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=20a2cc9751d1f32e610704a9…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 19:51:35 2019 +0100 ntdll: Store extended FPU state and debug registers in RtlRaiseException(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 11 ++++++++++- dlls/ntdll/tests/exception.c | 3 +++ include/winnt.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 3ce10d3..0274a7d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2534,7 +2534,16 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL void raise_exception_full_context( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) { save_fpu( context ); - /* FIXME: extended registers, debug registers */ + save_fpux( context ); + /* FIXME: xstate */ + context->Dr0 = x86_thread_data()->dr0; + context->Dr1 = x86_thread_data()->dr1; + context->Dr2 = x86_thread_data()->dr2; + context->Dr3 = x86_thread_data()->dr3; + context->Dr6 = x86_thread_data()->dr6; + context->Dr7 = x86_thread_data()->dr7; + context->ContextFlags |= CONTEXT_DEBUG_REGISTERS; + RtlRaiseStatus( NtRaiseException( rec, context, first_chance )); } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f7b8f21..b8bd186 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -400,6 +400,9 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); + ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE), + "wrong context flags %x\n", context->ContextFlags ); + /* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT * even if raised by RtlRaiseException */ diff --git a/include/winnt.h b/include/winnt.h index 2b48938..5694ad7 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -969,6 +969,7 @@ typedef struct _CONTEXT #define CONTEXT_FLOATING_POINT (CONTEXT_i386 | 0x0008) /* 387 state */ #define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | 0x0010) /* DB 0-3,6,7 */ #define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386 | 0x0020) +#define CONTEXT_XSTATE (CONTEXT_i386 | 0x0040) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | \ CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | CONTEXT_EXTENDED_REGISTERS) @@ -1014,6 +1015,7 @@ typedef struct _LDT_ENTRY { #define CONTEXT_SEGMENTS (CONTEXT_AMD64 | 0x0004) #define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | 0x0008) #define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x0010) +#define CONTEXT_XSTATE (CONTEXT_AMD64 | 0x0040) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) @@ -2130,6 +2132,7 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); #define WOW64_CONTEXT_FLOATING_POINT (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000008)) #define WOW64_CONTEXT_DEBUG_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000010)) #define WOW64_CONTEXT_EXTENDED_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000020)) +#define WOW64_CONTEXT_XSTATE (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000040)) #define WOW64_CONTEXT_FULL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | WOW64_CONTEXT_SEGMENTS) #define WOW64_CONTEXT_ALL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | \ WOW64_CONTEXT_SEGMENTS | WOW64_CONTEXT_FLOATING_POINT | \
1
0
0
0
Alexandre Julliard : ntdll: Store extended FPU context in NtGetContextThread().
by Alexandre Julliard
14 Feb '19
14 Feb '19
Module: wine Branch: master Commit: edbdec441b80dbc06f3878b7e4d823735f2888ec URL:
https://source.winehq.org/git/wine.git/?a=commit;h=edbdec441b80dbc06f3878b7…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 19:46:16 2019 +0100 ntdll: Store extended FPU context in NtGetContextThread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 1b3b10f..3ce10d3 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -427,8 +427,6 @@ static size_t signal_stack_size; static wine_signal_handler handlers[256]; -static BOOL fpux_support; /* whether the CPU supports extended fpu context */ - enum i386_trap_code { TRAP_x86_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */ @@ -559,6 +557,15 @@ static inline void *get_signal_stack(void) /*********************************************************************** + * has_fpux + */ +static inline int has_fpux(void) +{ + return (cpu_info.FeatureSet & CPU_FEATURE_FXSR); +} + + +/*********************************************************************** * get_current_teb * * Get the current teb based on the stack pointer. @@ -860,6 +867,26 @@ static inline void save_fpu( CONTEXT *context ) /*********************************************************************** + * save_fpux + * + * Save the thread FPU extended context. + */ +static inline void save_fpux( CONTEXT *context ) +{ +#ifdef __GNUC__ + /* we have to enforce alignment by hand */ + char buffer[sizeof(XMM_SAVE_AREA32) + 16]; + XMM_SAVE_AREA32 *state = (XMM_SAVE_AREA32 *)(((ULONG_PTR)buffer + 15) & ~15); + + if (!has_fpux()) return; + context->ContextFlags |= CONTEXT_EXTENDED_REGISTERS; + __asm__ __volatile__( "fxsave %0" : "=m" (*state) ); + memcpy( context->ExtendedRegisters, state, sizeof(*state) ); +#endif +} + + +/*********************************************************************** * restore_fpu * * Restore the FPU context to a sigcontext. @@ -985,7 +1012,6 @@ static inline void save_context( CONTEXT *context, const ucontext_t *sigcontext, { context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); - fpux_support = TRUE; if (!fpu) fpux_to_fpu( &context->FloatSave, fpux ); } if (!fpu && !fpux) save_fpu( context ); @@ -1137,7 +1163,7 @@ void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ) { DWORD flags = context->ContextFlags & ~CONTEXT_i386; - if ((flags & CONTEXT_EXTENDED_REGISTERS) && fpux_support) restore_fpux( context ); + if ((flags & CONTEXT_EXTENDED_REGISTERS) && has_fpux()) restore_fpux( context ); else if (flags & CONTEXT_FLOATING_POINT) restore_fpu( context ); if (flags & CONTEXT_DEBUG_REGISTERS) @@ -1419,7 +1445,8 @@ NTSTATUS CDECL DECLSPEC_HIDDEN __regs_NtGetContextThread( DWORD edi, DWORD esi, context->ContextFlags |= CONTEXT_SEGMENTS; } if (needed_flags & CONTEXT_FLOATING_POINT) save_fpu( context ); - /* FIXME: extended floating point */ + if (needed_flags & CONTEXT_EXTENDED_REGISTERS) save_fpux( context ); + /* FIXME: xstate */ /* update the cached version of the debug registers */ if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) {
1
0
0
0
Alexandre Julliard : ntdll: Make the CPU information global.
by Alexandre Julliard
14 Feb '19
14 Feb '19
Module: wine Branch: master Commit: 5ecea501704f7ac1f1a9c6db8ca787ce79394e8c URL:
https://source.winehq.org/git/wine.git/?a=commit;h=5ecea501704f7ac1f1a9c6db…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 19:41:34 2019 +0100 ntdll: Make the CPU information global. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 13 ++++++------- dlls/ntdll/ntdll_misc.h | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5138da4..0a59947 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -926,7 +926,7 @@ NTSTATUS WINAPI NtSetIntervalProfile( return STATUS_SUCCESS; } -static SYSTEM_CPU_INFORMATION cached_sci; +SYSTEM_CPU_INFORMATION cpu_info = { 0 }; /******************************************************************************* * Architecture specific feature detection for CPUs @@ -1305,7 +1305,7 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) * fill_cpu_info * * inits a couple of places with CPU related information: - * - cached_sci in this file + * - cpu_info in this file * - Peb->NumberOfProcessors * - SharedUserData->ProcessFeatures[] array */ @@ -1336,11 +1336,10 @@ void fill_cpu_info(void) #endif NtCurrentTeb()->Peb->NumberOfProcessors = num; - memset(&cached_sci, 0, sizeof(cached_sci)); - get_cpuinfo(&cached_sci); + get_cpuinfo(&cpu_info); TRACE("<- CPU arch %d, level %d, rev %d, features 0x%x\n", - cached_sci.Architecture, cached_sci.Level, cached_sci.Revision, cached_sci.FeatureSet); + cpu_info.Architecture, cpu_info.Level, cpu_info.Revision, cpu_info.FeatureSet); } static BOOL grow_logical_proc_buf(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **pdata, @@ -2287,10 +2286,10 @@ NTSTATUS WINAPI NtQuerySystemInformation( } break; case SystemCpuInformation: - if (Length >= (len = sizeof(cached_sci))) + if (Length >= (len = sizeof(cpu_info))) { if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; - else memcpy(SystemInformation, &cached_sci, len); + else memcpy(SystemInformation, &cpu_info, len); } else ret = STATUS_INFO_LENGTH_MISMATCH; break; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 5bfc8a9..5afb17f 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -248,6 +248,7 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) extern mode_t FILE_umask DECLSPEC_HIDDEN; extern HANDLE keyed_event DECLSPEC_HIDDEN; +extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN; #define HASH_STRING_ALGORITHM_DEFAULT 0 #define HASH_STRING_ALGORITHM_X65599 1
1
0
0
0
Alexandre Julliard : ntdll: Rename attach_dlls() to LdrInitializeThunk().
by Alexandre Julliard
14 Feb '19
14 Feb '19
Module: wine Branch: master Commit: 9f0d66923933d82ae0b09fe5d84f977c1a657cc1 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=9f0d66923933d82ae0b09fe5…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 16:49:09 2019 +0100 ntdll: Rename attach_dlls() to LdrInitializeThunk(). Based on a patch by Andrew Wesie. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 87 ++++++++++++++++++--------------------------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_powerpc.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- include/winternl.h | 1 - 8 files changed, 41 insertions(+), 59 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d6b8950..d7dbe57 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3247,13 +3247,13 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) } -/*********************************************************************** - * attach_dlls +/****************************************************************** + * LdrInitializeThunk (NTDLL.@) * * Attach to all the loaded dlls. * If this is the first time, perform the full process initialization. */ -NTSTATUS attach_dlls( CONTEXT *context, void **entry ) +void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknown3, ULONG_PTR unknown4 ) { NTSTATUS status; WINE_MODREF *wm; @@ -3261,7 +3261,7 @@ NTSTATUS attach_dlls( CONTEXT *context, void **entry ) pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); - if (process_detaching) return STATUS_SUCCESS; + if (process_detaching) return; RtlEnterCriticalSection( &loader_section ); @@ -3317,7 +3317,6 @@ NTSTATUS attach_dlls( CONTEXT *context, void **entry ) } RtlLeaveCriticalSection( &loader_section ); - return STATUS_SUCCESS; } @@ -3374,52 +3373,6 @@ static void load_global_options(void) } -/****************************************************************** - * LdrInitializeThunk (NTDLL.@) - * - */ -void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, - ULONG_PTR unknown3, ULONG_PTR unknown4 ) -{ - static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; - NTSTATUS status; - WINE_MODREF *wm; - PEB *peb = NtCurrentTeb()->Peb; - - /* allocate the modref for the main exe (if not already done) */ - wm = get_modref( peb->ImageBaseAddress ); - assert( wm ); - if (wm->ldr.Flags & LDR_IMAGE_IS_DLL) - { - ERR("%s is a dll, not an executable\n", debugstr_w(wm->ldr.FullDllName.Buffer) ); - exit(1); - } - - peb->LoaderLock = &loader_section; - update_user_process_params( &wm->ldr.FullDllName ); - version_init( wm->ldr.FullDllName.Buffer ); - virtual_set_large_address_space(); - - LdrQueryImageFileExecutionOptions( &peb->ProcessParameters->ImagePathName, globalflagW, - REG_DWORD, &peb->NtGlobalFlag, sizeof(peb->NtGlobalFlag), NULL ); - heap_set_debug_flags( GetProcessHeap() ); - - /* the main exe needs to be the first in the load order list */ - RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); - InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); - RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); - InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); - - if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0, NULL )) != STATUS_SUCCESS) - { - ERR( "Main exe initialization for %s failed, status %x\n", - debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), status ); - NtTerminateProcess( GetCurrentProcess(), status ); - } - server_init_process_done(); -} - - /*********************************************************************** * RtlImageDirectoryEntryToData (NTDLL.@) */ @@ -3551,6 +3504,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) void __wine_process_init(void) { static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; WINE_MODREF *wm; NTSTATUS status; @@ -3585,5 +3539,34 @@ void __wine_process_init(void) kernel32_start_process = init_func(); - LdrInitializeThunk( NULL, 0, 0, 0 ); + wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); + assert( wm ); + if (wm->ldr.Flags & LDR_IMAGE_IS_DLL) + { + MESSAGE( "wine: %s is a dll, not an executable\n", debugstr_w(wm->ldr.FullDllName.Buffer) ); + exit(1); + } + + NtCurrentTeb()->Peb->LoaderLock = &loader_section; + update_user_process_params( &wm->ldr.FullDllName ); + version_init( wm->ldr.FullDllName.Buffer ); + virtual_set_large_address_space(); + + LdrQueryImageFileExecutionOptions( &wm->ldr.FullDllName, globalflagW, REG_DWORD, + &NtCurrentTeb()->Peb->NtGlobalFlag, sizeof(DWORD), NULL ); + heap_set_debug_flags( GetProcessHeap() ); + + /* the main exe needs to be the first in the load order list */ + RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); + InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); + RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); + InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); + + if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0, NULL )) != STATUS_SUCCESS) + { + ERR( "Main exe initialization for %s failed, status %x\n", + debugstr_w(wm->ldr.FullDllName.Buffer), status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + server_init_process_done(); } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 5a93ede..5bfc8a9 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -111,7 +111,6 @@ extern BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) DECLSPEC_ /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; -extern NTSTATUS attach_dlls( CONTEXT *context, void **entry ) DECLSPEC_HIDDEN; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, @@ -255,5 +254,6 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN; #define HASH_STRING_ALGORITHM_INVALID 0xffffffff NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); +void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); #endif diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e224808..75a1133 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1327,7 +1327,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx, (void **)&ctx->R0 ); + LdrInitializeThunk( ctx, (void **)&ctx->R0, 0, 0 ); return ctx; } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c063be5..1d26125 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1100,7 +1100,7 @@ static void thread_startup( void *param ) context.Pc = (DWORD_PTR)info->start; if (info->suspend) wait_suspend( &context ); - attach_dlls( &context, (void **)&context.u.s.X0 ); + LdrInitializeThunk( &context, (void **)&context.u.s.X0, 0, 0 ); ((thread_start_func)context.Pc)( (LPTHREAD_START_ROUTINE)context.u.s.X0, (void *)context.u.s.X1 ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 91ecfa7..1b3b10f 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2717,7 +2717,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx, (void **)&ctx->Eax ); + LdrInitializeThunk( ctx, (void **)&ctx->Eax, 0, 0 ); return ctx; } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 1c96d62..86398d8 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1194,7 +1194,7 @@ static void thread_startup( void *param ) context.Iar = (DWORD)info->start; if (info->suspend) wait_suspend( &context ); - attach_dlls( &context, (void **)&context.Gpr3 ); + LdrInitializeThunk( &context, (void **)&context.Gpr3, 0, 0 ); ((thread_start_func)context.Iar)( (LPTHREAD_START_ROUTINE)context.Gpr3, (void *)context.Gpr4 ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c3cc3d8..54871b8 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4557,7 +4557,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx, (void **)&ctx->Rcx ); + LdrInitializeThunk( ctx, (void **)&ctx->Rcx, 0, 0 ); return ctx; } diff --git a/include/winternl.h b/include/winternl.h index a3adba3..46dac7e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2302,7 +2302,6 @@ NTSYSAPI NTSTATUS WINAPI LdrDisableThreadCalloutsForDll(HMODULE); NTSYSAPI NTSTATUS WINAPI LdrFindEntryForAddress(const void*, PLDR_MODULE*); NTSYSAPI NTSTATUS WINAPI LdrGetDllHandle(LPCWSTR, ULONG, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); -NTSYSAPI void WINAPI LdrInitializeThunk(void*,ULONG_PTR,ULONG_PTR,ULONG_PTR); NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG_PTR*); IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT_PTR);
1
0
0
0
Alexandre Julliard : ntdll: Return the kernel process start address from __wine_kernel_init().
by Alexandre Julliard
14 Feb '19
14 Feb '19
Module: wine Branch: master Commit: 42df4dccd578d0f7f635d7b6eaf9ddedf7c65987 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=42df4dccd578d0f7f635d7b6…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 16:45:03 2019 +0100 ntdll: Return the kernel process start address from __wine_kernel_init(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 4 ++-- dlls/ntdll/loader.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index df2d0d6..ad257a0 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1336,7 +1336,7 @@ static void set_process_name( int argc, char *argv[] ) * * Wine initialisation: load and start the main exe file. */ -void CDECL __wine_kernel_init(void) +void * CDECL __wine_kernel_init(void) { static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; static const WCHAR dotW[] = {'.',0}; @@ -1458,7 +1458,7 @@ void CDECL __wine_kernel_init(void) if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */ - LdrInitializeThunk( start_process_wrapper, 0, 0, 0 ); + return start_process_wrapper; error: ExitProcess( GetLastError() ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6becb44..d6b8950 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3386,8 +3386,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, WINE_MODREF *wm; PEB *peb = NtCurrentTeb()->Peb; - kernel32_start_process = kernel_start; - /* allocate the modref for the main exe (if not already done) */ wm = get_modref( peb->ImageBaseAddress ); assert( wm ); @@ -3558,7 +3556,7 @@ void __wine_process_init(void) NTSTATUS status; ANSI_STRING func_name; UNICODE_STRING nt_name; - void (* DECLSPEC_NORETURN CDECL init_func)(void); + void * (CDECL *init_func)(void); thread_init(); @@ -3584,5 +3582,8 @@ void __wine_process_init(void) MESSAGE( "wine: could not find __wine_kernel_init in kernel32.dll, status %x\n", status ); exit(1); } - init_func(); + + kernel32_start_process = init_func(); + + LdrInitializeThunk( NULL, 0, 0, 0 ); }
1
0
0
0
Nikolay Sivov : msvcrt: Add _ismbcl1().
by Alexandre Julliard
14 Feb '19
14 Feb '19
Module: wine Branch: master Commit: 698b26a432ff8ce036014adc041efb08a63d6367 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=698b26a432ff8ce036014adc…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 14 14:35:45 2019 +0100 msvcrt: Add _ismbcl1(). Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=46644
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 15 +++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e9fdbff..202042d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -988,7 +988,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index dc1fa1d..1f4bfe3 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1334,7 +1334,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5d05b3d..7e03eb1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1339,7 +1339,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index e1b373f..629dce9 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -382,7 +382,7 @@ @ cdecl _ismbchira(long) @ cdecl _ismbckata(long) @ cdecl _ismbcl0(long) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ stub _ismbcl2(long) @ cdecl _ismbclegal(long) @ cdecl _ismbclower(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 24bd681..f0009be 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -377,7 +377,7 @@ @ cdecl _ismbchira(long) @ cdecl _ismbckata(long) @ cdecl _ismbcl0(long) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ stub _ismbcl2(long) @ cdecl _ismbclegal(long) @ cdecl _ismbclower(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ec1cd22..7dc4ea8 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -660,7 +660,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 78f1768..16a2473 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -638,7 +638,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 9174214..909ea46 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2600,3 +2600,11 @@ int CDECL _ismbcl1_l(unsigned int c, MSVCRT__locale_t locale) return 0; } + +/********************************************************************* + * _ismbcl1 (MSVCRT.@) + */ +int CDECL _ismbcl1(unsigned int c) +{ + return _ismbcl1_l(c, NULL); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b6b7882..1f9ad64 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -609,7 +609,7 @@ # stub _ismbckata_l(long ptr) @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) # stub _ismbcl2_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4574ea7..53fbfd3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3275,11 +3275,17 @@ static void test__ismbclx(void) ret = _ismbcl0(0); ok(!ret, "got %d\n", ret); + ret = _ismbcl1(0); + ok(!ret, "got %d\n", ret); + cp = _setmbcp(1252); ret = _ismbcl0(0x8140); ok(!ret, "got %d\n", ret); + ret = _ismbcl1(0x889f); + ok(!ret, "got %d\n", ret); + _setmbcp(932); ret = _ismbcl0(0); @@ -3291,6 +3297,15 @@ static void test__ismbclx(void) ret = _ismbcl0(0x817f); ok(!ret, "got %d\n", ret); + ret = _ismbcl1(0); + ok(!ret, "got %d\n", ret); + + ret = _ismbcl1(0x889f); + ok(ret, "got %d\n", ret); + + ret = _ismbcl1(0x88fd); + ok(!ret, "got %d\n", ret); + _setmbcp(cp); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8387521..db894a0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -478,7 +478,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l
1
0
0
0
← Newer
1
...
34
35
36
37
38
39
40
...
68
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
62
63
64
65
66
67
68
Results per page:
10
25
50
100
200