winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2014
----- 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
4 participants
378 discussions
Start a n
N
ew thread
Bruno Jesus : kernel32: Limit the environment variable size to 32767 in GetEnvironmentVariable.
by Alexandre Julliard
12 Jun '14
12 Jun '14
Module: wine Branch: master Commit: 515b8bebb6dfdf173f65beda6eb5f62f7e84c87d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=515b8bebb6dfdf173f65beda6…
Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri May 30 21:59:08 2014 -0300 kernel32: Limit the environment variable size to 32767 in GetEnvironmentVariable. --- dlls/kernel32/environ.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index b6b3124..14283f8 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -176,6 +176,8 @@ DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size ) return 0; } + /* limit the size to sane values */ + size = min(size, 32767); if (!(valueW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)))) return 0;
1
0
0
0
Damjan Jovanovic : winex11.drv: Use the clipboard to import text/ html XDND selections.
by Alexandre Julliard
12 Jun '14
12 Jun '14
Module: wine Branch: master Commit: b6d0df6a31e2b88c66d67937a10928bdec846bf0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b6d0df6a31e2b88c66d67937a…
Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:23:21 2014 +0200 winex11.drv: Use the clipboard to import text/html XDND selections. --- dlls/winex11.drv/xdnd.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 3941900..2184a42 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -74,7 +74,6 @@ static HWND XDNDLastDropTargetWnd; static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len); static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); -static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len); static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); @@ -569,8 +568,6 @@ static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int pr X11DRV_XDND_DeconstructTextURIList(property, data, len); else if (property == x11drv_atom(text_plain)) X11DRV_XDND_DeconstructTextPlain(property, data, len); - else if (property == x11drv_atom(text_html)) - X11DRV_XDND_DeconstructTextHTML(property, data, len); else { /* use the clipboard import functions for other types */ @@ -698,26 +695,6 @@ static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len) /************************************************************************** - * X11DRV_XDND_DeconstructTextHTML - * - * Interpret text/html data and add records to <dndfmt> linked list - */ -static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len) -{ - char* dostext; - - X11DRV_XDND_UnixToDos(&dostext, data, len); - - X11DRV_XDND_InsertXDNDData(property, - RegisterClipboardFormatA("HTML Format"), dostext, strlen(dostext)); - - TRACE("HTML Format: %s\n", dostext); - - return 1; -} - - -/************************************************************************** * X11DRV_XDND_SendDropFiles */ static void X11DRV_XDND_SendDropFiles(HWND hwnd)
1
0
0
0
Damjan Jovanovic : winex11.drv: Use the clipboard functions and formats to import selections that XDND doesn 't support.
by Alexandre Julliard
12 Jun '14
12 Jun '14
Module: wine Branch: master Commit: e339e0d476a8eae572493a7c83f6f972b41793f1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e339e0d476a8eae572493a7c8…
Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:22:07 2014 +0200 winex11.drv: Use the clipboard functions and formats to import selections that XDND doesn't support. --- dlls/winex11.drv/clipboard.c | 18 ++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xdnd.c | 26 +++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 730b6c9..350eeab 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1519,6 +1519,24 @@ static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, A return hClipData; } +/************************************************************************** + * X11DRV_CLIPBOARD_ImportSelection + * + * Import the X selection into the clipboard format registered for the given X target. + */ +HANDLE X11DRV_CLIPBOARD_ImportSelection(Display *d, Atom target, Window w, Atom prop, UINT *windowsFormat) +{ + WINE_CLIPFORMAT *clipFormat; + + clipFormat = X11DRV_CLIPBOARD_LookupProperty(NULL, target); + if (clipFormat) + { + *windowsFormat = clipFormat->wFormatID; + return clipFormat->lpDrvImportFunc(d, w, prop); + } + return NULL; +} + /************************************************************************** X11DRV_CLIPBOARD_ExportClipboardData diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7a3374d..bcbfe14 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -238,6 +238,7 @@ extern void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) DECL extern void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; +extern HANDLE X11DRV_CLIPBOARD_ImportSelection(Display *d, Atom target, Window w, Atom prop, UINT *windowsFormat) DECLSPEC_HIDDEN; /************************************************************************** * X11 GDI driver diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 4db938f..3941900 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -75,7 +75,7 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len); -static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len); +static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); static void X11DRV_XDND_SendDropFiles(HWND hwnd); @@ -497,7 +497,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, XGetWindowProperty(display, xwin, x11drv_atom(XdndTarget), 0, 65535, FALSE, AnyPropertyType, &acttype, &actfmt, &icount, &bytesret, &data); - X11DRV_XDND_MapFormat(types[i], data, get_property_size( actfmt, icount )); + X11DRV_XDND_MapFormat(display, xwin, types[i], data, get_property_size( actfmt, icount )); XFree(data); } @@ -554,7 +554,7 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns * * Map XDND MIME format to windows clipboard format. */ -static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len) +static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len) { void* xdata; @@ -571,6 +571,26 @@ static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, in X11DRV_XDND_DeconstructTextPlain(property, data, len); else if (property == x11drv_atom(text_html)) X11DRV_XDND_DeconstructTextHTML(property, data, len); + else + { + /* use the clipboard import functions for other types */ + HANDLE *contents; + UINT windowsFormat; + contents = X11DRV_CLIPBOARD_ImportSelection(display, property, xwin, x11drv_atom(XdndTarget), &windowsFormat); + if (contents) + { + void *data = HeapAlloc(GetProcessHeap(), 0, GlobalSize(contents)); + if (data) + { + memcpy(data, GlobalLock(contents), GlobalSize(contents)); + GlobalUnlock(contents); + X11DRV_XDND_InsertXDNDData(property, windowsFormat, data, GlobalSize(contents)); + } + else + ERR("out of memory\n"); + GlobalFree(contents); + } + } }
1
0
0
0
Damjan Jovanovic : winex11.drv: Use the global memory functions to allocate the memory for STGMEDIUM' s hGlobal.
by Alexandre Julliard
12 Jun '14
12 Jun '14
Module: wine Branch: master Commit: 8e32b5f8870ce9ffa7097c985f328e011513d5e4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8e32b5f8870ce9ffa7097c985…
Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:21:53 2014 +0200 winex11.drv: Use the global memory functions to allocate the memory for STGMEDIUM's hGlobal. --- dlls/winex11.drv/xdnd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index eb98215..4db938f 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -977,10 +977,11 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetData(IDataObject *dataObject, if (current->cf_win == formatEtc->cfFormat) { pMedium->tymed = TYMED_HGLOBAL; - pMedium->u.hGlobal = HeapAlloc(GetProcessHeap(), 0, current->size); + pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, current->size); if (pMedium->u.hGlobal == NULL) return E_OUTOFMEMORY; - memcpy(pMedium->u.hGlobal, current->data, current->size); + memcpy(GlobalLock(pMedium->u.hGlobal), current->data, current->size); + GlobalUnlock(pMedium->u.hGlobal); pMedium->pUnkForRelease = 0; return S_OK; }
1
0
0
0
Damjan Jovanovic : winex11.drv: Don' t bother counting how many XDND selections are converted.
by Alexandre Julliard
12 Jun '14
12 Jun '14
Module: wine Branch: master Commit: a8499c0803ccace80b1b753a7d53c5969be9743a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a8499c0803ccace80b1b753a7…
Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:21:44 2014 +0200 winex11.drv: Don't bother counting how many XDND selections are converted. --- dlls/winex11.drv/xdnd.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 5ed0787..eb98215 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -75,9 +75,9 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len); -static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len); +static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, - Atom *types, unsigned long *count); + Atom *types, unsigned long count); static void X11DRV_XDND_SendDropFiles(HWND hwnd); static void X11DRV_XDND_FreeDragDropOp(void); static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len); @@ -257,7 +257,7 @@ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) /* Do a one-time data read and cache results */ X11DRV_XDND_ResolveProperty(event->display, event->window, - event->data.l[1], xdndtypes, &count); + event->data.l[1], xdndtypes, count); if (event->data.l[1] & 1) XFree(xdndtypes); @@ -454,7 +454,7 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) * Resolve all MIME types to windows clipboard formats. All data is cached. */ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, - Atom *types, unsigned long *count) + Atom *types, unsigned long count) { unsigned int i, j; BOOL res; @@ -462,16 +462,15 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom acttype; int actfmt; unsigned long bytesret, icount; - int entries = 0; unsigned char* data = NULL; XDNDDATA *current, *next; BOOL haveHDROP = FALSE; - TRACE("count(%ld)\n", *count); + TRACE("count(%ld)\n", count); X11DRV_XDND_FreeDragDropOp(); /* Clear previously cached data */ - for (i = 0; i < *count; i++) + for (i = 0; i < count; i++) { TRACE("requesting atom %ld from xwin %ld\n", types[i], xwin); @@ -498,7 +497,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, XGetWindowProperty(display, xwin, x11drv_atom(XdndTarget), 0, 65535, FALSE, AnyPropertyType, &acttype, &actfmt, &icount, &bytesret, &data); - entries += X11DRV_XDND_MapFormat(types[i], data, get_property_size( actfmt, icount )); + X11DRV_XDND_MapFormat(types[i], data, get_property_size( actfmt, icount )); XFree(data); } @@ -522,12 +521,9 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, list_remove(¤t->entry); HeapFree(GetProcessHeap(), 0, current->data); HeapFree(GetProcessHeap(), 0, current); - --entries; } } } - - *count = entries; } @@ -558,10 +554,9 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns * * Map XDND MIME format to windows clipboard format. */ -static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len) +static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len) { void* xdata; - int count = 0; TRACE("%d: %s\n", property, data); @@ -569,16 +564,13 @@ static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int xdata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); memcpy(xdata, data, len); X11DRV_XDND_InsertXDNDData(property, property, xdata, len); - count++; if (property == x11drv_atom(text_uri_list)) - count += X11DRV_XDND_DeconstructTextURIList(property, data, len); + X11DRV_XDND_DeconstructTextURIList(property, data, len); else if (property == x11drv_atom(text_plain)) - count += X11DRV_XDND_DeconstructTextPlain(property, data, len); + X11DRV_XDND_DeconstructTextPlain(property, data, len); else if (property == x11drv_atom(text_html)) - count += X11DRV_XDND_DeconstructTextHTML(property, data, len); - - return count; + X11DRV_XDND_DeconstructTextHTML(property, data, len); }
1
0
0
0
Damjan Jovanovic : winex11.drv: text/html should be imported as CF_HTML (" HTML Format"), not CFSTR_INETURL ("UniformResourceLocator").
by Alexandre Julliard
12 Jun '14
12 Jun '14
Module: wine Branch: master Commit: d0360402f0bf9d50df862a2ebf13498f7e0a0d6a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d0360402f0bf9d50df862a2eb…
Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:21:40 2014 +0200 winex11.drv: text/html should be imported as CF_HTML ("HTML Format"), not CFSTR_INETURL ("UniformResourceLocator"). --- dlls/winex11.drv/xdnd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index dbe87e8..5ed0787 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -697,9 +697,9 @@ static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len) X11DRV_XDND_UnixToDos(&dostext, data, len); X11DRV_XDND_InsertXDNDData(property, - RegisterClipboardFormatA("UniformResourceLocator"), dostext, strlen(dostext)); + RegisterClipboardFormatA("HTML Format"), dostext, strlen(dostext)); - TRACE("UniformResourceLocator: %s\n", dostext); + TRACE("HTML Format: %s\n", dostext); return 1; }
1
0
0
0
Bruno Jesus : ws2_32/tests: Initialize a test buffer (valgrind).
by Alexandre Julliard
12 Jun '14
12 Jun '14
Module: wine Branch: master Commit: 79d29e2347b7d1780bc1b71f2dd6c64e564f6e61 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=79d29e2347b7d1780bc1b71f2…
Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 12 01:30:38 2014 -0300 ws2_32/tests: Initialize a test buffer (valgrind). --- dlls/ws2_32/tests/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0bbce27..fb5ee1d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6833,6 +6833,7 @@ static void test_completion_port(void) GUID acceptExGuid = WSAID_ACCEPTEX; LPFN_ACCEPTEX pAcceptEx = NULL; + memset(buf, 0, sizeof(buf)); previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError());
1
0
0
0
Henri Verbeet : ddraw: Properly support creating compressed user memory surfaces.
by Alexandre Julliard
12 Jun '14
12 Jun '14
Module: wine Branch: master Commit: b0f1feb4f068e4181f3be5621f2e0f68974e6355 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b0f1feb4f068e4181f3be5621…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:31 2014 +0200 ddraw: Properly support creating compressed user memory surfaces. --- dlls/ddraw/ddraw_private.h | 7 +++ dlls/ddraw/surface.c | 105 ++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw4.c | 106 ++++++++++++++++++++++++++++++++++++++++---- dlls/ddraw/tests/ddraw7.c | 106 ++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 276 insertions(+), 48 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0f1feb4f068e4181f3be…
1
0
0
0
Henri Verbeet : ddraw: Use wined3d_surface_get_pitch() to calculate dwLinearSize for compressed surfaces.
by Alexandre Julliard
12 Jun '14
12 Jun '14
Module: wine Branch: master Commit: e2d9cb69ba9a8b7e4e909ab5a26fb40843f71391 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e2d9cb69ba9a8b7e4e909ab5a…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:30 2014 +0200 ddraw: Use wined3d_surface_get_pitch() to calculate dwLinearSize for compressed surfaces. --- dlls/ddraw/surface.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 21ca19f..4ffad8f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6120,10 +6120,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s { desc->dwFlags |= DDSD_LINEARSIZE; desc->dwFlags &= ~DDSD_PITCH; - if (wined3d_desc.format == WINED3DFMT_DXT1) - surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight) / 2; - else - surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight); + desc->u1.dwLinearSize = wined3d_surface_get_pitch(wined3d_surface) * ((desc->dwHeight + 3) / 4); } else if (!(desc->dwFlags & DDSD_LPSURFACE)) {
1
0
0
0
Henri Verbeet : ddraw: Clear DDSD_PITCH on compressed surfaces.
by Alexandre Julliard
12 Jun '14
12 Jun '14
Module: wine Branch: master Commit: 92ea79a198d315777a9876fb88f557192e48615a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=92ea79a198d315777a9876fb8…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:29 2014 +0200 ddraw: Clear DDSD_PITCH on compressed surfaces. --- dlls/ddraw/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a326404..21ca19f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6118,7 +6118,8 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s || wined3d_desc.format == WINED3DFMT_DXT3 || wined3d_desc.format == WINED3DFMT_DXT4 || wined3d_desc.format == WINED3DFMT_DXT5) { - surface->surface_desc.dwFlags |= DDSD_LINEARSIZE; + desc->dwFlags |= DDSD_LINEARSIZE; + desc->dwFlags &= ~DDSD_PITCH; if (wined3d_desc.format == WINED3DFMT_DXT1) surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight) / 2; else
1
0
0
0
← Newer
1
...
23
24
25
26
27
28
29
...
38
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
Results per page:
10
25
50
100
200