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
December 2007
----- 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
3 participants
824 discussions
Start a n
N
ew thread
Jeremy White : wintab32: Do not offset the physical device id by the cursor number.
by Alexandre Julliard
24 Dec '07
24 Dec '07
Module: wine Branch: master Commit: ee0554b737b817c3009e33e764f976464590809f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ee0554b737b817c3009e33e76…
Author: Jeremy White <jwhite(a)winehq.org> Date: Sun Dec 23 10:55:25 2007 -0600 wintab32: Do not offset the physical device id by the cursor number. --- dlls/winex11.drv/wintab.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index f0ded3d..5f7beb3 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -1096,7 +1096,6 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) { DWORD id; id = tgtcursor->PHYSID; - id += (wCategory - WTI_CURSORS); rc = CopyTabletData(lpOutput,&id,sizeof(DWORD)); } break;
1
0
0
0
Jeremy White : wintab32: Store and use the physical device id to match device to cursor.
by Alexandre Julliard
24 Dec '07
24 Dec '07
Module: wine Branch: master Commit: c9fcb15b11773c5d37d0bf5546dffe7939d8596a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c9fcb15b11773c5d37d0bf554…
Author: Jeremy White <jwhite(a)winehq.org> Date: Sun Dec 23 10:55:19 2007 -0600 wintab32: Store and use the physical device id to match device to cursor. --- dlls/winex11.drv/wintab.c | 55 +++++++++++++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index db78a91..f0ded3d 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -419,7 +419,7 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) PK_NORMAL_PRESSURE | PK_TANGENT_PRESSURE | PK_ORIENTATION; - cursor->PHYSID = cursor_target; + cursor->PHYSID = target->id; cursor->NPBUTTON = 1; cursor->NPBTNMARKS[0] = 0 ; cursor->NPBTNMARKS[1] = 1 ; @@ -574,12 +574,12 @@ static int figure_deg(int x, int y) return rc; } -static int get_button_state(int deviceid) +static int get_button_state(int curnum) { - return button_state[deviceid]; + return button_state[curnum]; } -static void set_button_state(XID deviceid) +static void set_button_state(int curnum, XID deviceid) { struct x11drv_thread_data *data = x11drv_thread_data(); XDevice *device; @@ -614,23 +614,40 @@ static void set_button_state(XID deviceid) } pXFreeDeviceState(state); wine_tsx11_unlock(); - button_state[deviceid] = rc; + button_state[curnum] = rc; +} + +static int cursor_from_device(DWORD deviceid, LPWTI_CURSORS_INFO *cursorp) +{ + int i; + for (i = 0; i < gNumCursors; i++) + if (gSysCursor[i].PHYSID == deviceid) + { + *cursorp = &gSysCursor[i]; + return i; + } + + ERR("Could not map device id %d to a cursor\n", (int) deviceid); + return -1; } static void motion_event( HWND hwnd, XEvent *event ) { XDeviceMotionEvent *motion = (XDeviceMotionEvent *)event; - LPWTI_CURSORS_INFO cursor = &gSysCursor[motion->deviceid]; + LPWTI_CURSORS_INFO cursor; + int curnum = cursor_from_device(motion->deviceid, &cursor); + if (curnum < 0) + return; memset(&gMsgPacket,0,sizeof(WTPACKET)); - TRACE("Received tablet motion event (%p)\n",hwnd); + TRACE("Received tablet motion event (%p); device id %d, cursor num %d\n",hwnd, (int) motion->deviceid, curnum); /* Set cursor to inverted if cursor is the eraser */ gMsgPacket.pkStatus = (cursor->TYPE == 0xc85a ?TPS_INVERT:0); gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(motion->time); gMsgPacket.pkSerialNumber = gSerial++; - gMsgPacket.pkCursor = motion->deviceid; + gMsgPacket.pkCursor = curnum; gMsgPacket.pkX = motion->axis_data[0]; gMsgPacket.pkY = motion->axis_data[1]; gMsgPacket.pkOrientation.orAzimuth = figure_deg(motion->axis_data[3],motion->axis_data[4]); @@ -639,14 +656,17 @@ static void motion_event( HWND hwnd, XEvent *event ) abs(motion->axis_data[4]))) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = motion->axis_data[2]; - gMsgPacket.pkButtons = get_button_state(motion->deviceid); + gMsgPacket.pkButtons = get_button_state(curnum); SendMessageW(hwndTabletDefault,WT_PACKET,0,(LPARAM)hwnd); } static void button_event( HWND hwnd, XEvent *event ) { XDeviceButtonEvent *button = (XDeviceButtonEvent *) event; - LPWTI_CURSORS_INFO cursor = &gSysCursor[button->deviceid]; + LPWTI_CURSORS_INFO cursor; + int curnum = cursor_from_device(button->deviceid, &cursor); + if (curnum < 0) + return; memset(&gMsgPacket,0,sizeof(WTPACKET)); @@ -654,10 +674,10 @@ static void button_event( HWND hwnd, XEvent *event ) /* Set cursor to inverted if cursor is the eraser */ gMsgPacket.pkStatus = (cursor->TYPE == 0xc85a ?TPS_INVERT:0); - set_button_state(button->deviceid); + set_button_state(curnum, button->deviceid); gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(button->time); gMsgPacket.pkSerialNumber = gSerial++; - gMsgPacket.pkCursor = button->deviceid; + gMsgPacket.pkCursor = curnum; gMsgPacket.pkX = button->axis_data[0]; gMsgPacket.pkY = button->axis_data[1]; gMsgPacket.pkOrientation.orAzimuth = figure_deg(button->axis_data[3],button->axis_data[4]); @@ -665,7 +685,7 @@ static void button_event( HWND hwnd, XEvent *event ) abs(button->axis_data[4]))) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = button->axis_data[2]; - gMsgPacket.pkButtons = get_button_state(button->deviceid); + gMsgPacket.pkButtons = get_button_state(curnum); SendMessageW(hwndTabletDefault,WT_PACKET,0,(LPARAM)hwnd); } @@ -680,7 +700,10 @@ static void key_event( HWND hwnd, XEvent *event ) static void proximity_event( HWND hwnd, XEvent *event ) { XProximityNotifyEvent *proximity = (XProximityNotifyEvent *) event; - LPWTI_CURSORS_INFO cursor = &gSysCursor[proximity->deviceid]; + LPWTI_CURSORS_INFO cursor; + int curnum = cursor_from_device(proximity->deviceid, &cursor); + if (curnum < 0) + return; memset(&gMsgPacket,0,sizeof(WTPACKET)); @@ -690,7 +713,7 @@ static void proximity_event( HWND hwnd, XEvent *event ) gMsgPacket.pkStatus |= (event->type==proximity_out_type)?TPS_PROXIMITY:0; gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(proximity->time); gMsgPacket.pkSerialNumber = gSerial++; - gMsgPacket.pkCursor = proximity->deviceid; + gMsgPacket.pkCursor = curnum; gMsgPacket.pkX = proximity->axis_data[0]; gMsgPacket.pkY = proximity->axis_data[1]; gMsgPacket.pkOrientation.orAzimuth = figure_deg(proximity->axis_data[3],proximity->axis_data[4]); @@ -698,7 +721,7 @@ static void proximity_event( HWND hwnd, XEvent *event ) abs(proximity->axis_data[4]))) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = proximity->axis_data[2]; - gMsgPacket.pkButtons = get_button_state(proximity->deviceid); + gMsgPacket.pkButtons = get_button_state(curnum); SendMessageW(hwndTabletDefault, WT_PROXIMITY, (event->type == proximity_in_type), (LPARAM)hwnd); }
1
0
0
0
Alistair Leslie-Hughes : msxml3: Fix memory leaks in tests.
by Alexandre Julliard
24 Dec '07
24 Dec '07
Module: wine Branch: master Commit: 3b43ea73ef6961bf9e5e0054663adbbfbad2fe36 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3b43ea73ef6961bf9e5e00546…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Dec 24 12:52:52 2007 +1100 msxml3: Fix memory leaks in tests. --- dlls/msxml3/tests/domdoc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8b4f546..c226ad3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -750,6 +750,7 @@ todo_wine r = IXMLDOMNode_get_baseName( next, &str ); ok( r == S_FALSE, "get_baseName returned wrong code\n"); ok( str == NULL, "basename was wrong\n"); + SysFreeString(str); } else ok( FALSE, "no next\n"); @@ -840,6 +841,7 @@ todo_wine r = IXMLDOMNode_get_baseName( node, &str ); ok( r == S_OK, "get_baseName returned wrong code\n"); ok( lstrcmpW(str,szbs) == 0, "basename was wrong\n"); + SysFreeString(str); } else ok( FALSE, "no node\n");
1
0
0
0
Alexander Dorofeyev : ole32: Fix wrong timeout check.
by Alexandre Julliard
24 Dec '07
24 Dec '07
Module: wine Branch: master Commit: 188ef4e4f93c3610c7ddacacbcd0302228bdaf9e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=188ef4e4f93c3610c7ddacacb…
Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Dec 24 02:23:06 2007 -0800 ole32: Fix wrong timeout check. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 5339db2..6c837a1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3429,7 +3429,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, DWORD now = GetTickCount(); DWORD res; - if ((dwTimeout != INFINITE) && (start_time + dwTimeout >= now)) + if (now - start_time > dwTimeout) { hr = RPC_S_CALLPENDING; break;
1
0
0
0
Eric Pouech : valgrind: Made Wine compliant will latest Valgrind macros ( the one removed from 3.3.0 and deprecated since 3.2.0).
by Alexandre Julliard
24 Dec '07
24 Dec '07
Module: wine Branch: master Commit: aff968fb472efd773b2c84d081d5a38429a01ac0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aff968fb472efd773b2c84d08…
Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 23 14:57:36 2007 +0100 valgrind: Made Wine compliant will latest Valgrind macros (the one removed from 3.3.0 and deprecated since 3.2.0). --- dlls/ntdll/heap.c | 16 ++++++++++++---- dlls/ntdll/signal_i386.c | 4 +++- loader/kthread.c | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0c80f83..198c5b1 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -140,7 +140,9 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, DWORD flags, LPCVOID block, BOOL qu static inline void mark_block_free( void *ptr, SIZE_T size ) { if (TRACE_ON(heap) || WARN_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size ); -#ifdef VALGRIND_MAKE_NOACCESS +#if defined(VALGRIND_MAKE_MEM_NOACCESS) + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size )); +#elif defined( VALGRIND_MAKE_NOACCESS) VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); #endif } @@ -148,7 +150,9 @@ static inline void mark_block_free( void *ptr, SIZE_T size ) /* mark a block of memory as initialized for debugging purposes */ static inline void mark_block_initialized( void *ptr, SIZE_T size ) { -#ifdef VALGRIND_MAKE_READABLE +#if defined(VALGRIND_MAKE_MEM_DEFINED) + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_DEFINED( ptr, size )); +#elif defined(VALGRIND_MAKE_READABLE) VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size )); #endif } @@ -156,13 +160,17 @@ static inline void mark_block_initialized( void *ptr, SIZE_T size ) /* mark a block of memory as uninitialized for debugging purposes */ static inline void mark_block_uninitialized( void *ptr, SIZE_T size ) { -#ifdef VALGRIND_MAKE_WRITABLE +#if defined(VALGRIND_MAKE_MEM_UNDEFINED) + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); +#elif defined(VALGRIND_MAKE_WRITABLE) VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); #endif if (TRACE_ON(heap) || WARN_ON(heap)) { memset( ptr, ARENA_INUSE_FILLER, size ); -#ifdef VALGRIND_MAKE_WRITABLE +#if defined(VALGRIND_MAKE_MEM_UNDEFINED) + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); +#elif defined(VALGRIND_MAKE_WRITABLE) /* make it uninitialized to valgrind again */ VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); #endif diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 993936e..f70544d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -936,7 +936,9 @@ static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func fun } stack--; /* push the stack_layout structure */ -#ifdef HAVE_VALGRIND_MEMCHECK_H +#if defined(VALGRIND_MAKE_MEM_UNDEFINED) + VALGRIND_MAKE_MEM_UNDEFINED(stack, sizeof(*stack)); +#elif defined(VALGRIND_MAKE_WRITABLE) VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack)); #endif stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ diff --git a/loader/kthread.c b/loader/kthread.c index 2b64e27..efffd99 100644 --- a/loader/kthread.c +++ b/loader/kthread.c @@ -150,7 +150,7 @@ static inline void writejump( const char *symbol, void *dest ) *(int *)(addr+1) = (unsigned char *)dest - (addr + 5); mprotect((void*)((unsigned int)addr & ~(getpagesize()-1)), 5, PROT_READ|PROT_EXEC); -# ifdef HAVE_VALGRIND_MEMCHECK_H +# ifdef VALGRIND_DISCARD_TRANSLATIONS VALGRIND_DISCARD_TRANSLATIONS( addr, 5 ); # endif #endif /* __GLIBC__ && __i386__ */
1
0
0
0
Rob Shearman : widl: Fix the generation of temporary variables for declared arrays.
by Alexandre Julliard
24 Dec '07
24 Dec '07
Module: wine Branch: master Commit: 7f3abe7757d799052bfb0dd2bd2e3260a8e7f18f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7f3abe7757d799052bfb0dd2b…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 22 01:40:05 2007 +0000 widl: Fix the generation of temporary variables for declared arrays. These need to include their array part so use var->type instead of var->ref->type. --- tools/widl/typegen.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d245c97..ea7e317 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3073,7 +3073,8 @@ void declare_stub_args( FILE *file, int indent, const func_t *func ) if (!in_attr && !var->type->size_is && !is_string) { print_file(file, indent, ""); - write_type_decl(file, var->type->ref, "_W%u", i++); + write_type_decl(file, var->type->declarray ? var->type : var->type->ref, + "_W%u", i++); fprintf(file, ";\n"); }
1
0
0
0
Andrew Talbot : msvcrt: Remove unneeded cast.
by Alexandre Julliard
24 Dec '07
24 Dec '07
Module: wine Branch: master Commit: edaa0fbc1391d1a575c53c6e075b32ee52e8e240 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=edaa0fbc1391d1a575c53c6e0…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 21 17:05:36 2007 +0000 msvcrt: Remove unneeded cast. --- dlls/msvcrt/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8bacffa..b4ccdc0 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2223,7 +2223,7 @@ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) } else j = MSVCRT__filbuf(file); if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT) - || ((j != '\r') || (file->_cnt && ((char *)file->_ptr)[0] != '\n'))) + || ((j != '\r') || (file->_cnt && file->_ptr[0] != '\n'))) return j; } while(1); }
1
0
0
0
Andrew Talbot : msi: Remove unneeded cast.
by Alexandre Julliard
24 Dec '07
24 Dec '07
Module: wine Branch: master Commit: 15d6436295c9b41a8fff91d9c9bdae5f97c4e726 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=15d6436295c9b41a8fff91d9c…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 21 17:05:33 2007 +0000 msi: Remove unneeded cast. --- dlls/msi/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 4cc5ed4..f56702d 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -585,7 +585,7 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, if (value!=NULL) { LPBYTE nd2; - TRACE("value %s, chunk %i size %i\n",debugstr_w((LPWSTR)value), + TRACE("value %s, chunk %i size %i\n",debugstr_w(value), chunk, size); if (size) nd2= msi_realloc(newdata,(size + chunk));
1
0
0
0
Andrew Talbot : msacm32: Remove unneeded casts.
by Alexandre Julliard
24 Dec '07
24 Dec '07
Module: wine Branch: master Commit: 0d6bc9076f6c60550ee634e39c616b79ec4ec7d4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0d6bc9076f6c60550ee634e39…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 21 17:05:29 2007 +0000 msacm32: Remove unneeded casts. --- dlls/msacm32/driver.c | 2 +- dlls/msacm32/pcmconverter.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index 086eef2..481daf0 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -299,7 +299,7 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, D if (mmr == MMSYSERR_NOERROR) { ACMDRIVERDETAILSW paddw; paddw.cbStruct = sizeof(paddw); - mmr = (MMRESULT)MSACM_Message(acmDrvr, ACMDM_DRIVER_DETAILS, (LPARAM)&paddw, 0); + mmr = MSACM_Message(acmDrvr, ACMDM_DRIVER_DETAILS, (LPARAM)&paddw, 0); acmDriverClose(acmDrvr, 0); paddw.cbStruct = min(padd->cbStruct, sizeof(*padd)); diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index 4b8fdfe..62c359c 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -1006,8 +1006,8 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER if (adsi->fdwDriver & PCM_RESAMPLE) { DWORD nsrc2 = nsrc; DWORD ndst2 = ndst; - apd->cvt.cvtChangeRate((DWORD)adsi->pwfxSrc->nSamplesPerSec, adsh->pbSrc, &nsrc2, - (DWORD)adsi->pwfxDst->nSamplesPerSec, adsh->pbDst, &ndst2); + apd->cvt.cvtChangeRate(adsi->pwfxSrc->nSamplesPerSec, adsh->pbSrc, &nsrc2, + adsi->pwfxDst->nSamplesPerSec, adsh->pbDst, &ndst2); nsrc -= nsrc2; ndst -= ndst2; } else {
1
0
0
0
Stefan Leichter : kernel32: Silence a fixme in GetNativeSystemInfo.
by Alexandre Julliard
24 Dec '07
24 Dec '07
Module: wine Branch: master Commit: 20c0ba23413de5a945ecdaaab2a8f78b12fb5a70 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=20c0ba23413de5a945ecdaaab…
Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Dec 23 11:06:22 2007 +0100 kernel32: Silence a fixme in GetNativeSystemInfo. --- dlls/kernel32/cpu.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index c7d366e..eed4cdd 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -808,7 +808,12 @@ VOID WINAPI GetSystemInfo( VOID WINAPI GetNativeSystemInfo( LPSYSTEM_INFO si /* [out] Destination for system information, may not be NULL */) { - FIXME("(%p) using GetSystemInfo()\n", si); + static BOOL reported = FALSE; + if (!reported) { + FIXME("(%p) using GetSystemInfo()\n", si); + reported = TRUE; + } else + TRACE("(%p) using GetSystemInfo()\n", si); GetSystemInfo(si); }
1
0
0
0
← Newer
1
...
12
13
14
15
16
17
18
...
83
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
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
Results per page:
10
25
50
100
200