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
October 2016
----- 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
451 discussions
Start a n
N
ew thread
Piotr Caban : msvcrt: Add support for member function pointers demangling in unDName function.
by Alexandre Julliard
07 Oct '16
07 Oct '16
Module: wine Branch: stable Commit: e10558ecddc30f42d581e1b58f1ff328b7e64071 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e10558ecddc30f42d581e1b58…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 22:01:12 2016 +0100 msvcrt: Add support for member function pointers demangling in unDName function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 112ad7fc8766b7b09d5026db19f2e826a9c83d9a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index c331db1..73011b0 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1323,6 +1323,9 @@ static void test_demangle(void) /* 128 */ {"??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z", "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", "??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z", 2}, +/* 129 */ {"??$run@XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture@X@@PEAVTask_Render_Preview@@P82@EAAXXZ@Z", + "class QFuture<void> __cdecl QtConcurrent::run<void,class Task_Render_Preview>(class Task_Render_Preview * __ptr64,void (__cdecl Task_Render_Preview::*)(void) __ptr64)", + "??$run@XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture@X@@PEAVTask_Render_Preview@@P82@EAAXXZ@Z"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 5972320..dd5e599 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -859,14 +859,55 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case 'P': /* Pointer */ if (isdigit(*sym->current)) { - /* FIXME: P6 = Function pointer, others who knows.. */ - if (*sym->current++ == '6') + /* FIXME: + * P6 = Function pointer + * P8 = Member function pointer + * others who knows.. */ + if (*sym->current == '8') { char* args = NULL; const char* call_conv; const char* exported; struct datatype_t sub_ct; unsigned mark = sym->stack.num; + const char* class; + const char* modifier; + const char* ptr_modif; + + sym->current++; + + if (!(class = get_class_name(sym))) + goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) + goto done; + if (modifier) + modifier = str_printf(sym, "%s %s", modifier, ptr_modif); + else if(ptr_modif[0]) + modifier = str_printf(sym, " %s", ptr_modif); + if (!get_calling_convention(*sym->current++, + &call_conv, &exported, + sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE)) + goto done; + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) + goto done; + + args = get_args(sym, pmt_ref, TRUE, '(', ')'); + if (!args) goto done; + sym->stack.num = mark; + + ct->left = str_printf(sym, "%s%s (%s %s::*", + sub_ct.left, sub_ct.right, call_conv, class); + ct->right = str_printf(sym, ")%s%s", args, modifier); + } + else if (*sym->current == '6') + { + char* args = NULL; + const char* call_conv; + const char* exported; + struct datatype_t sub_ct; + unsigned mark = sym->stack.num; + + sym->current++; if (!get_calling_convention(*sym->current++, &call_conv, &exported,
1
0
0
0
André Hentschel : msvcrt: Don' t continue on demangle failure (Coverity).
by Alexandre Julliard
07 Oct '16
07 Oct '16
Module: wine Branch: stable Commit: 74711f31db91e42ec451056da8bb88394f2749f4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=74711f31db91e42ec451056da…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:35:04 2015 +0100 msvcrt: Don't continue on demangle failure (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 51098fcd94457b46945a03131c4cd1f049682d17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/undname.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index ec2c2dd..5972320 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1380,6 +1380,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->current++; str_array_init(&pmt); demangle_datatype(sym, &ct, &pmt, FALSE); + if (!demangle_datatype(sym, &ct, NULL, FALSE)) + goto done; function_name = str_printf(sym, "%s%s `RTTI Type Descriptor'", ct.left, ct.right); sym->current--;
1
0
0
0
Piotr Caban : msvcr120: Add _set_FMA3_enable stub.
by Alexandre Julliard
07 Oct '16
07 Oct '16
Module: wine Branch: stable Commit: 2adb7d6c936159cbe65dcdd58b53c2b69547b22c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2adb7d6c936159cbe65dcdd58…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 18 21:08:29 2016 +0100 msvcr120: Add _set_FMA3_enable stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 68fedc12681ecacc714c01e9a34266ef70e8d6ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcrt/math.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 129ba27..b2eff02 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1639,7 +1639,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable -@ stub -arch=win64 _set_FMA3_enable +@ cdecl -arch=win64 _set_FMA3_enable(long) MSVCRT__set_FMA3_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 557bcec..51bb99c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -73,6 +73,17 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } +#ifdef _WIN64 +/********************************************************************* + * _set_FMA3_enable (MSVCR120.@) + */ +int CDECL MSVCRT__set_FMA3_enable(int flag) +{ + FIXME("(%x) stub\n", flag); + return 0; +} +#endif + #if defined(__x86_64__) || defined(__arm__) || _MSVCR_VER>=120 /*********************************************************************
1
0
0
0
Pierre Schweitzer : mpr: Add support for REG_EXPAND_SZ for providers path.
by Alexandre Julliard
07 Oct '16
07 Oct '16
Module: wine Branch: stable Commit: 97585fed061bb7ce0eb2e292da6a88b7348070c6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=97585fed061bb7ce0eb2e292d…
Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Mon Jan 25 08:17:48 2016 +0100 mpr: Add support for REG_EXPAND_SZ for providers path. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 80eb2fa08eb21ba9504438493fa66097ed03faf5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mpr/wnet.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index dd34969..f130de0 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -133,11 +133,17 @@ static void _tryLoadProvider(PCWSTR provider) DWORD type, size = sizeof(providerPath); if (RegQueryValueExW(hKey, szProviderPath, NULL, &type, - (LPBYTE)providerPath, &size) == ERROR_SUCCESS && type == REG_SZ) + (LPBYTE)providerPath, &size) == ERROR_SUCCESS && (type == REG_SZ || type == REG_EXPAND_SZ)) { static const WCHAR szProviderName[] = { 'N','a','m','e',0 }; PWSTR name = NULL; - + + if (type == REG_EXPAND_SZ) + { + WCHAR path[MAX_PATH]; + if (ExpandEnvironmentStringsW(providerPath, path, MAX_PATH)) lstrcpyW( providerPath, path ); + } + size = 0; RegQueryValueExW(hKey, szProviderName, NULL, NULL, NULL, &size); if (size)
1
0
0
0
Thomas Faller : dde: Fix use-after-free.
by Alexandre Julliard
07 Oct '16
07 Oct '16
Module: wine Branch: stable Commit: 0350c24a4f7dfa54ac48c9c536c45ce7e5dc974c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0350c24a4f7dfa54ac48c9c53…
Author: Thomas Faller <tfaller1(a)gmx.de> Date: Tue Jan 12 22:06:30 2016 +0100 dde: Fix use-after-free. Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4e7a7d01ffd1bbbb07acfe08ebf74046ad1f9d9a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/dde_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 633331d..989131c 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -778,7 +778,7 @@ static WDML_QUEUE_STATE WDML_HandlePokeReply(WDML_CONV* pConv, MSG* msg, WDML_XA GlobalDeleteAtom(uiHi); if (ack) *ack = uiLo; - GlobalFree(pXAct->hMem); + pXAct->hMem = GlobalFree(pXAct->hMem); pXAct->hDdeData = (HDDEDATA)TRUE; return TRUE;
1
0
0
0
Piotr Caban : msvcp60: Export more complex numbers operators.
by Alexandre Julliard
07 Oct '16
07 Oct '16
Module: wine Branch: stable Commit: bda2bd289a0f0cb372f0a597f4e4501eedcf6197 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bda2bd289a0f0cb372f0a597f…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 14 15:55:27 2016 +0100 msvcp60: Export more complex numbers operators. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 14529012da91580119c1712cd24fcf67c780789b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp60/msvcp60.spec | 240 +++++++++++++++++++++++----------------------- 1 file changed, 120 insertions(+), 120 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=bda2bd289a0f0cb372f0a…
1
0
0
0
Akihiro Sagawa : comctl32: Prevent invalid focus change notifications from LVS_OWNERDATA lists.
by Alexandre Julliard
07 Oct '16
07 Oct '16
Module: wine Branch: stable Commit: ba1cf6c3a4da2a55518a4178e8063128b5d03671 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ba1cf6c3a4da2a55518a4178e…
Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 20 22:34:42 2016 +0900 comctl32: Prevent invalid focus change notifications from LVS_OWNERDATA lists. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit af4a757ad2cacbd238486632d0f7bd6f0a94483f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 68a5515..419a823 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8808,6 +8808,7 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl if (infoPtr->dwStyle & LVS_OWNERDATA) { INT nOldCount = infoPtr->nItemCount; + infoPtr->nItemCount = nItems; if (nItems < nOldCount) { @@ -8820,7 +8821,6 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl } } - infoPtr->nItemCount = nItems; LISTVIEW_UpdateScroll(infoPtr); /* the flags are valid only in ownerdata report and list modes */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index acfcd20..1e992cf 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3418,6 +3418,28 @@ static void test_ownerdata(void) style = GetWindowLongPtrA(hwnd, GWL_STYLE); ok(style & LVS_SORTDESCENDING, "Expected LVS_SORTDESCENDING to be set\n"); DestroyWindow(hwnd); + + /* The focused item is updated after the invalidation */ + hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 3, 0); + expect(TRUE, res); + + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 0, 0); + expect(TRUE, res); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "ownerdata setitemcount", FALSE); + + res = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + expect(-1, res); + DestroyWindow(hwnd); } static void test_norecompute(void)
1
0
0
0
Stefan Dösinger : d3d8: Don' t validate 2D texture lock coordinates.
by Alexandre Julliard
07 Oct '16
07 Oct '16
Module: wine Branch: stable Commit: a302e5872ed28242bd70588dcf00fc49164f3fde URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a302e5872ed28242bd70588dc…
Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 18 22:20:05 2016 +0000 d3d8: Don't validate 2D texture lock coordinates. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a2d3b3a5a58cdacb8bf09cb927a3421d9e3cc32a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/surface.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 679f094..ec263b1 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -204,26 +204,36 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, struct wined3d_box box; struct wined3d_map_desc map_desc; HRESULT hr; + D3DRESOURCETYPE type; TRACE("iface %p, locked_rect %p, rect %s, flags %#x.\n", iface, locked_rect, wine_dbgstr_rect(rect), flags); wined3d_mutex_lock(); + + if (surface->texture) + type = IDirect3DBaseTexture8_GetType(&surface->texture->IDirect3DBaseTexture8_iface); + else + type = D3DRTYPE_SURFACE; + if (rect) { D3DSURFACE_DESC desc; IDirect3DSurface8_GetDesc(iface, &desc); - if ((rect->left < 0) + if (type != D3DRTYPE_TEXTURE + && ((rect->left < 0) || (rect->top < 0) || (rect->left >= rect->right) || (rect->top >= rect->bottom) || (rect->right > desc.Width) - || (rect->bottom > desc.Height)) + || (rect->bottom > desc.Height))) { WARN("Trying to lock an invalid rectangle, returning D3DERR_INVALIDCALL\n"); wined3d_mutex_unlock(); + locked_rect->Pitch = 0; + locked_rect->pBits = NULL; return D3DERR_INVALIDCALL; } box.left = rect->left; @@ -243,7 +253,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, locked_rect->Pitch = map_desc.row_pitch; locked_rect->pBits = map_desc.data; } - else + else if (type != D3DRTYPE_TEXTURE) { locked_rect->Pitch = 0; locked_rect->pBits = NULL;
1
0
0
0
Piotr Caban : msvcp100: Add numeric_limits<*>::lowest implementation.
by Alexandre Julliard
07 Oct '16
07 Oct '16
Module: wine Branch: stable Commit: 3a5960ce6b34e2ff106f8d2b78ab54d95018bf6b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3a5960ce6b34e2ff106f8d2b7…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 14 15:55:16 2016 +0100 msvcp100: Add numeric_limits<*>::lowest implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2633496a7473baf4f0ae2f6a812f8a5e39e094ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 32 +++++++++++++++--------------- dlls/msvcp90/math.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index d2b75f4..357ca83 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2113,22 +2113,22 @@ @ cdecl -arch=win64 ?length@?$codecvt@GDH@std@@QEBAHAEBHPEBD1_K@Z(ptr ptr str str long) codecvt_wchar_length @ thiscall -arch=win32 ?length@?$codecvt@_WDH@std@@QBEHABHPBD1I@Z(ptr ptr str str long) codecvt_wchar_length @ cdecl -arch=win64 ?length@?$codecvt@_WDH@std@@QEBAHAEBHPEBD1_K@Z(ptr ptr str str long) codecvt_wchar_length -@ stub ?lowest@?$numeric_limits@C@std@@SACXZ -@ stub ?lowest@?$numeric_limits@D@std@@SADXZ -@ stub ?lowest@?$numeric_limits@E@std@@SAEXZ -@ stub ?lowest@?$numeric_limits@F@std@@SAFXZ -@ stub ?lowest@?$numeric_limits@G@std@@SAGXZ -@ stub ?lowest@?$numeric_limits@H@std@@SAHXZ -@ stub ?lowest@?$numeric_limits@I@std@@SAIXZ -@ stub ?lowest@?$numeric_limits@J@std@@SAJXZ -@ stub ?lowest@?$numeric_limits@K@std@@SAKXZ -@ stub ?lowest@?$numeric_limits@M@std@@SAMXZ -@ stub ?lowest@?$numeric_limits@N@std@@SANXZ -@ stub ?lowest@?$numeric_limits@O@std@@SAOXZ -@ stub ?lowest@?$numeric_limits@_J@std@@SA_JXZ -@ stub ?lowest@?$numeric_limits@_K@std@@SA_KXZ -@ stub ?lowest@?$numeric_limits@_N@std@@SA_NXZ -@ stub ?lowest@?$numeric_limits@_W@std@@SA_WXZ +@ cdecl ?lowest@?$numeric_limits@C@std@@SACXZ() std_numeric_limits_signed_char_lowest +@ cdecl ?lowest@?$numeric_limits@D@std@@SADXZ() std_numeric_limits_char_lowest +@ cdecl ?lowest@?$numeric_limits@E@std@@SAEXZ() std_numeric_limits_unsigned_char_lowest +@ cdecl ?lowest@?$numeric_limits@F@std@@SAFXZ() std_numeric_limits_short_lowest +@ cdecl ?lowest@?$numeric_limits@G@std@@SAGXZ() std_numeric_limits_unsigned_short_lowest +@ cdecl ?lowest@?$numeric_limits@H@std@@SAHXZ() std_numeric_limits_int_lowest +@ cdecl ?lowest@?$numeric_limits@I@std@@SAIXZ() std_numeric_limits_unsigned_int_lowest +@ cdecl ?lowest@?$numeric_limits@J@std@@SAJXZ() std_numeric_limits_long_lowest +@ cdecl ?lowest@?$numeric_limits@K@std@@SAKXZ() std_numeric_limits_unsigned_long_lowest +@ cdecl ?lowest@?$numeric_limits@M@std@@SAMXZ() std_numeric_limits_float_lowest +@ cdecl ?lowest@?$numeric_limits@N@std@@SANXZ() std_numeric_limits_double_lowest +@ cdecl ?lowest@?$numeric_limits@O@std@@SAOXZ() std_numeric_limits_long_double_lowest +@ cdecl -ret64 ?lowest@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_lowest +@ cdecl -ret64 ?lowest@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_lowest +@ cdecl ?lowest@?$numeric_limits@_N@std@@SA_NXZ() std_numeric_limits_bool_lowest +@ cdecl ?lowest@?$numeric_limits@_W@std@@SA_WXZ() std_numeric_limits_wchar_t_lowest @ cdecl ?max@?$numeric_limits@C@std@@SACXZ() std_numeric_limits_signed_char_max @ cdecl ?max@?$numeric_limits@D@std@@SADXZ() std_numeric_limits_char_max @ cdecl ?max@?$numeric_limits@E@std@@SAEXZ() std_numeric_limits_unsigned_char_max diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 6c3a33a..99f6727 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -659,6 +659,54 @@ BOOLEAN __cdecl std_numeric_limits_bool_min(void) { return FALSE; } /* ?min@?$numeric_limits@_W@std@@SA_WXZ -> public: static wchar_t __cdecl std::numeric_limits<wchar_t>::min(void) */ WCHAR __cdecl std_numeric_limits_wchar_t_min(void) { return 0; } +/* ?lowest@?$numeric_limits@C@std@@SACXZ */ +signed char __cdecl std_numeric_limits_signed_char_lowest(void) { return SCHAR_MIN; } + +/* ?lowest@?$numeric_limits@D@std@@SADXZ */ +char __cdecl std_numeric_limits_char_lowest(void) { return CHAR_MIN; } + +/* ?lowest@?$numeric_limits@E@std@@SAEXZ */ +unsigned char __cdecl std_numeric_limits_unsigned_char_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits@F@std@@SAFXZ */ +short __cdecl std_numeric_limits_short_lowest(void) { return SHRT_MIN; } + +/* ?lowest@?$numeric_limits@G@std@@SAGXZ */ +unsigned short __cdecl std_numeric_limits_unsigned_short_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits@H@std@@SAHXZ */ +int __cdecl std_numeric_limits_int_lowest(void) { return INT_MIN; } + +/* ?lowest@?$numeric_limits@I@std@@SAIXZ */ +unsigned int __cdecl std_numeric_limits_unsigned_int_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits@J@std@@SAJXZ */ +LONG __cdecl std_numeric_limits_long_lowest(void) { return LONG_MIN; } + +/* ?lowest@?$numeric_limits@K@std@@SAKXZ */ +ULONG __cdecl std_numeric_limits_unsigned_long_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits@M@std@@SAMXZ */ +float __cdecl std_numeric_limits_float_lowest(void) { return -FLT_MAX; } + +/* ?lowest@?$numeric_limits@N@std@@SANXZ */ +double __cdecl std_numeric_limits_double_lowest(void) { return -DBL_MAX; } + +/* ?lowest@?$numeric_limits@O@std@@SAOXZ */ +LDOUBLE __cdecl std_numeric_limits_long_double_lowest(void) { return -LDBL_MAX; } + +/* ?lowest@?$numeric_limits@_J@std@@SA_JXZ */ +__int64 __cdecl std_numeric_limits_int64_lowest(void) { return I64_MIN; } + +/* ?lowest@?$numeric_limits@_K@std@@SA_KXZ */ +unsigned __int64 __cdecl std_numeric_limits_unsigned_int64_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits@_N@std@@SA_NXZ */ +BOOLEAN __cdecl std_numeric_limits_bool_lowest(void) { return FALSE; } + +/* ?lowest@?$numeric_limits@_W@std@@SA_WXZ */ +WCHAR __cdecl std_numeric_limits_wchar_t_lowest(void) { return 0; } + /* ?quiet_NaN@?$numeric_limits@C@std@@SACXZ -> public: static signed char __cdecl std::numeric_limits<signed char>::quiet_NaN(void) */ signed char __cdecl std_numeric_limits_signed_char_quiet_NaN(void) { return 0; }
1
0
0
0
Andrew Church : dinput: Report DIDOI_ASPECTPOSITION flag for axes objects.
by Alexandre Julliard
07 Oct '16
07 Oct '16
Module: wine Branch: stable Commit: c3502c8fbdcb87367b105c327c0cc11ed3eaa97d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c3502c8fbdcb87367b105c327…
Author: Andrew Church <achurch(a)achurch.org> Date: Tue Aug 16 17:28:34 2016 -0300 dinput: Report DIDOI_ASPECTPOSITION flag for axes objects. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5ce8a1a91b5462bc90629385d618ceb6b75cd2c9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 807199d..c02a559 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -498,9 +498,10 @@ HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - if (pdidoi->dwType & DIDFT_AXIS) + if (pdidoi->dwType & DIDFT_AXIS) { sprintfW(pdidoi->tszName, axisW, DIDFT_GETINSTANCE(pdidoi->dwType)); - else if (pdidoi->dwType & DIDFT_POV) + pdidoi->dwFlags |= DIDOI_ASPECTPOSITION; + } else if (pdidoi->dwType & DIDFT_POV) sprintfW(pdidoi->tszName, povW, DIDFT_GETINSTANCE(pdidoi->dwType)); else if (pdidoi->dwType & DIDFT_BUTTON) sprintfW(pdidoi->tszName, buttonW, DIDFT_GETINSTANCE(pdidoi->dwType));
1
0
0
0
← Newer
1
...
29
30
31
32
33
34
35
...
46
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
Results per page:
10
25
50
100
200