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
August 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
1085 discussions
Start a n
N
ew thread
Francois Gouget : winapi: Remove some dead code.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: 088c30c79a68a2c77bd82a9b5e11ab835fde9865 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=088c30c79a68a2c77bd82a9b5…
Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 19:03:33 2007 +0200 winapi: Remove some dead code. --- tools/winapi/c_parser.pm | 39 --------------------------------------- 1 files changed, 0 insertions(+), 39 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 270334f..37f0db3 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -2090,45 +2090,6 @@ sub parse_c_variable($$$$$$$) { # $output->write("$type: $name: '$_'\n"); - if(1 || $finished) { - # Nothing - } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*\(.*?\)', \$_, \$line, \$column, \$match)) { - $type = "<type>"; - $name = "<name>"; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+)\s* - (?:\*\s*)*(\w+|\s*\*?\s*\w+\s*\))\s*(?:\[[^\]]*\]|\([^\)]*\))? - (?:,\s*(?:\*\s*)*(\w+)\s*(?:\[[^\]]*\])?)* - \s*(?:=|$)//sx) - { - $self->_update_c_position($&, \$line, \$column); - - $type = $1; - $name = $2; - - $type =~ s/\s//g; - $type =~ s/^struct/struct /; - } elsif(/^(enum|interface|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*((?:\*\s*)*)(\w+)\s*(?:=|$)/s) { - $self->_update_c_position($&, \$line, \$column); - - my $kind = $1; - my $_name= $2; - my $stars = $3; - $name = $4; - - if(defined($_name)) { - $type = "struct $_name { }"; - } else { - $type = "struct { }"; - } - - $stars =~ s/\s//g; - if($stars) { - $type .= " $type"; - } - } else { - return 0; - } - $$refcurrent = $_; $$refline = $line; $$refcolumn = $column;
1
0
0
0
Francois Gouget : crypt32: Add FIXMEs for a couple of missing includes.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: db895bb51aaf7d80618c31a18d98fc2e2d41135c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=db895bb51aaf7d80618c31a18…
Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 19:02:23 2007 +0200 crypt32: Add FIXMEs for a couple of missing includes. --- include/wincrypt.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 51e7f51..4b4f389 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -24,6 +24,9 @@ extern "C" { #endif +/* FIXME: #include <bcrypt.h> */ +/* FIXME: #include <ncrypt.h> */ + /* some typedefs for function parameters */ typedef unsigned int ALG_ID; typedef unsigned long HCRYPTPROV;
1
0
0
0
Francois Gouget : crypt32: Add some missing CERT_XXX_ID constants.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: fa489d08d34bbcbd84cbc0b1ef7cb168156a4ff8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fa489d08d34bbcbd84cbc0b1e…
Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 19:02:31 2007 +0200 crypt32: Add some missing CERT_XXX_ID constants. --- include/wincrypt.h | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 8700f56..51e7f51 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2182,7 +2182,25 @@ static const WCHAR CERT_PHYSICAL_STORE_AUTH_ROOT_NAME[] = #define CERT_ARCHIVED_KEY_HASH_PROP_ID 65 #define CERT_AUTO_ENROLL_RETRY_PROP_ID 66 #define CERT_AIA_URL_RETRIEVED_PROP_ID 67 -#define CERT_FIRST_RESERVED_PROP_ID 68 +#define CERT_AUTHORITY_INFO_ACCESS_PROP_ID 68 +#define CERT_BACKED_UP_PROP_ID 69 +#define CERT_OCSP_RESPONSE_PROP_ID 70 +#define CERT_REQUEST_ORIGINATOR_PROP_ID 71 +#define CERT_SOURCE_LOCATION_PROP_ID 72 +#define CERT_SOURCE_URL_PROP_ID 73 +#define CERT_NEW_KEY_PROP_ID 74 +#define CERT_OCSP_CACHE_PREFIX_PROP_ID 75 +#define CERT_SMART_CARD_ROOT_INFO_PROP_ID 76 +#define CERT_NO_AUTO_EXPIRE_CHECK_PROP_ID 77 +#define CERT_NCRYPT_KEY_HANDLE_PROP_ID 78 +#define CERT_HCRYPTPROV_OR_NCRYPT_KEY_HANDLE_PROP_ID 79 +#define CERT_SUBJECT_INFO_ACCESS_PROP_ID 80 +#define CERT_CA_OCSP_AUTHORITY_INFO_ACCESS_PROP_ID 81 +#define CERT_CA_DISABLE_CRL_PROP_ID 82 +#define CERT_ROOT_PROGRAM_CERT_POLICIES_PROP_ID 83 +#define CERT_ROOT_PROGRAM_NAME_CONSTRAINTS_PROP_ID 84 + +#define CERT_FIRST_RESERVED_PROP_ID 85 #define CERT_LAST_RESERVED_PROP_ID 0x00007fff #define CERT_FIRST_USER_PROP_ID 0x00008000 #define CERT_LAST_USER_PROP_ID 0x0000ffff
1
0
0
0
Francois Gouget : crypt32: Fix the CryptReleaseContext() prototype.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: a33993bcbd960a4024a81a1009ae6c6c5b5a4019 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a33993bcbd960a4024a81a100…
Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 19:02:53 2007 +0200 crypt32: Fix the CryptReleaseContext() prototype. --- dlls/advapi32/crypt.c | 4 ++-- include/wincrypt.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index a7273b9..60131bb 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -568,12 +568,12 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - TRACE("(0x%lx, %08x)\n", hProv, dwFlags); + TRACE("(0x%lx, %08lx)\n", hProv, dwFlags); if (!pProv) { diff --git a/include/wincrypt.h b/include/wincrypt.h index 46bc094..8700f56 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3383,7 +3383,7 @@ BOOL WINAPI CryptHashData (HCRYPTHASH hHash, CONST BYTE *pbData, DWORD dwDataLen BOOL WINAPI CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags); BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey); -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags); +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags); BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); BOOL WINAPI CryptSetProviderA (LPCSTR pszProvName, DWORD dwProvType);
1
0
0
0
Francois Gouget : comctl32: According to the PSDK, DrawShadowText() takes a non-const RECT pointer.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: 22d09f78fc1d8e25027dd71e7f8dbd5aa63d21b8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=22d09f78fc1d8e25027dd71e7…
Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 19:01:00 2007 +0200 comctl32: According to the PSDK, DrawShadowText() takes a non-const RECT pointer. --- dlls/comctl32/commctrl.c | 8 +++----- include/commctrl.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index c09bc04..4bfe1a5 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1528,12 +1528,10 @@ LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet) * * Draw text with shadow. */ -int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, const RECT *pRect, DWORD dwFlags, +int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, RECT *rect, DWORD dwFlags, COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset) { - RECT rect = *pRect; - - FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, pRect, dwFlags, + FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, rect, dwFlags, crText, crShadow, ixOffset, iyOffset); - return DrawTextW(hdc, pszText, cch, &rect, DT_LEFT); + return DrawTextW(hdc, pszText, cch, rect, DT_LEFT); } diff --git a/include/commctrl.h b/include/commctrl.h index a1e82a9..2a49e00 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -713,7 +713,7 @@ BOOL WINAPI GetWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR*); BOOL WINAPI RemoveWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR); LRESULT WINAPI DefSubclassProc(HWND, UINT, WPARAM, LPARAM); -int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, const RECT*, DWORD, COLORREF, COLORREF, int, int); +int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, RECT*, DWORD, COLORREF, COLORREF, int, int); /* Header control */
1
0
0
0
Francois Gouget : dxdiagn: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: ed366f22a291ca72af1eba0966063dacff96dd0a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ed366f22a291ca72af1eba096…
Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 18:59:43 2007 +0200 dxdiagn: Fix compilation on systems that don't support nameless unions. --- dlls/dxdiagn/provider.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index fe0543c..c30600b 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -20,9 +20,9 @@ */ #include "config.h" -#include "wine/debug.h" #define COBJMACROS +#define NONAMELESSUNION #include "dxdiag_private.h" #include "wine/unicode.h" #include "winver.h" @@ -33,6 +33,8 @@ #include "mmddk.h" #include <ddraw.h> +#include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); /* IDxDiagProvider IUnknown parts follow: */ @@ -478,7 +480,7 @@ static HRESULT DXDiag_InitDXDiagDisplayContainer(IDxDiagContainer* pSubCont) if (surface_descr.dwFlags & DDSD_HEIGHT) add_prop_ui4( pDisplayAdapterSubCont, dwHeight, surface_descr.dwHeight ); if (surface_descr.dwFlags & DDSD_PIXELFORMAT) - add_prop_ui4( pDisplayAdapterSubCont, dwBpp, surface_descr.ddpfPixelFormat.dwRGBBitCount ); + add_prop_ui4( pDisplayAdapterSubCont, dwBpp, surface_descr.u4.ddpfPixelFormat.u1.dwRGBBitCount ); } add_prop_str( pDisplayAdapterSubCont, szVendorId, szEmpty );
1
0
0
0
Robert Reif : msvcrt: Add _aligned_malloc functions.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: fc77a467cddd3dfd29110a777c87a043baeb9c3f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fc77a467cddd3dfd29110a777…
Author: Robert Reif <reif(a)earthlink.net> Date: Fri Jul 27 20:02:23 2007 -0400 msvcrt: Add _aligned_malloc functions. --- dlls/msvcrt/heap.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 5 ++ include/msvcrt/malloc.h | 6 ++ 3 files changed, 166 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index ab6dd01..d51675d 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -23,6 +23,7 @@ #include "msvcrt.h" #include "mtdll.h" +#include "msvcrt/errno.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -31,6 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define LOCK_HEAP _mlock( _HEAP_LOCK ) #define UNLOCK_HEAP _munlock( _HEAP_LOCK ) +/* _aligned */ +#define SAVED_PTR(x) ((void *)((DWORD_PTR)((char *)x - sizeof(void *)) & \ + ~(sizeof(void *) - 1))) +#define ALIGN_PTR(ptr, alignment, offset) ((void *) \ + ((((DWORD_PTR)((char *)ptr + alignment + sizeof(void *) + offset)) & \ + ~(alignment - 1)) - offset)) + typedef void (*MSVCRT_new_handler_func)(unsigned long size); @@ -314,3 +322,150 @@ int CDECL _set_sbh_threshold(size_t threshold) MSVCRT_sbh_threshold = threshold; return 1; } + +/********************************************************************* + * _aligned_free (MSVCRT.@) + */ +void CDECL _aligned_free(void *memblock) +{ + TRACE("(%p)\n", memblock); + + if (memblock) + { + void **saved = SAVED_PTR(memblock); + MSVCRT_free(*saved); + } +} + +/********************************************************************* + * _aligned_offset_malloc (MSVCRT.@) + */ +void * CDECL _aligned_offset_malloc(size_t size, size_t alignment, + size_t offset) +{ + void *memblock, *temp, **saved; + TRACE("(%u, %u, %u)\n", size, alignment, offset); + + /* alignment must be a power of 2 */ + if ((alignment & (alignment - 1)) != 0) + { + msvcrt_set_errno(EINVAL); + return NULL; + } + + /* offset must be less than size */ + if (offset >= size) + { + msvcrt_set_errno(EINVAL); + return NULL; + } + + /* don't align to less than void pointer size */ + if (alignment < sizeof(void *)) + alignment = sizeof(void *); + + /* allocate enough space for void pointer and alignment */ + temp = MSVCRT_malloc(size + alignment + sizeof(void *)); + + if (!temp) + return NULL; + + /* adjust pointer for proper alignment and offset */ + memblock = ALIGN_PTR(temp, alignment, offset); + + /* Save the real allocation address below returned address */ + /* so it can be found later to free. */ + saved = SAVED_PTR(memblock); + *saved = temp; + + return memblock; +} + +/********************************************************************* + * _aligned_malloc (MSVCRT.@) + */ +void * CDECL _aligned_malloc(size_t size, size_t alignment) +{ + TRACE("(%u, %u)\n", size, alignment); + return _aligned_offset_malloc(size, alignment, 0); +} + +/********************************************************************* + * _aligned_offset_realloc (MSVCRT.@) + */ +void * CDECL _aligned_offset_realloc(void *memblock, size_t size, + size_t alignment, size_t offset) +{ + void * temp, **saved; + size_t old_padding, new_padding; + TRACE("(%p, %u, %u, %u)\n", memblock, size, alignment, offset); + + if (!memblock) + return _aligned_offset_malloc(size, alignment, offset); + + /* alignment must be a power of 2 */ + if ((alignment & (alignment - 1)) != 0) + { + msvcrt_set_errno(EINVAL); + return NULL; + } + + /* offset must be less than size */ + if (offset >= size) + { + msvcrt_set_errno(EINVAL); + return NULL; + } + + if (size == 0) + { + _aligned_free(memblock); + return NULL; + } + + /* don't align to less than void pointer size */ + if (alignment < sizeof(void *)) + alignment = sizeof(void *); + + /* make sure alignment and offset didn't change */ + saved = SAVED_PTR(memblock); + if (memblock != ALIGN_PTR(*saved, alignment, offset)) + { + msvcrt_set_errno(EINVAL); + return NULL; + } + + old_padding = (char *)*saved - (char *)memblock; + + temp = MSVCRT_realloc(*saved, size + alignment + sizeof(void *)); + + if (!temp) + return NULL; + + /* adjust pointer for proper alignment and offset */ + memblock = ALIGN_PTR(temp, alignment, offset); + + /* Save the real allocation address below returned address */ + /* so it can be found later to free. */ + saved = SAVED_PTR(memblock); + + /* a new start address may require different padding to get the */ + /* proper alignment */ + new_padding = (char *)temp - (char *)memblock; + if (new_padding != old_padding) + memmove((char *)memblock + old_padding, (char *)memblock + new_padding, size); + + *saved = temp; + + return memblock; +} + +/********************************************************************* + * _aligned_realloc (MSVCRT.@) + */ +void * CDECL _aligned_realloc(void *memblock, size_t size, + size_t alignment) +{ + TRACE("(%p, %u, %u)\n", memblock, size, alignment); + return _aligned_offset_realloc(memblock, size, alignment, 0); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index cb427ab..fc81898 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -163,6 +163,11 @@ @ cdecl _adj_fptan() @ extern _adjust_fdiv MSVCRT__adjust_fdiv # extern _aexit_rtn +@ cdecl _aligned_free(ptr) +@ cdecl _aligned_malloc(long long) +@ cdecl _aligned_offset_malloc(long long long) +@ cdecl _aligned_offset_realloc(ptr long long long) +@ cdecl _aligned_realloc(ptr long long) @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) MSVCRT__assert @ stub _atodbl #(ptr str) diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h index 25ae615..bee2173 100644 --- a/include/msvcrt/malloc.h +++ b/include/msvcrt/malloc.h @@ -86,6 +86,12 @@ void free(void*); void* malloc(size_t); void* realloc(void*,size_t); +void _aligned_free(void*); +void* _aligned_malloc(size_t,size_t); +void* _aligned_offset_malloc(size_t,size_t,size_t); +void* _aligned_realloc(void*,size_t,size_t); +void* _aligned_offset_realloc(void*,size_t,size_t,size_t); + size_t _get_sbh_threshold(void); int _set_sbh_threshold(size_t size);
1
0
0
0
Roderick Colenbrander : wined3d: Compile against standard GL headers.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: 2c12c17ab62596fcb42436c609f41b0461bc6f65 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2c12c17ab62596fcb42436c60…
Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Jul 31 11:34:22 2007 +0200 wined3d: Compile against standard GL headers. --- dlls/wined3d/state.c | 2 +- include/wine/wined3d_gl.h | 109 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 106 insertions(+), 5 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c12c17ab62596fcb4243…
1
0
0
0
Dmitry Timoshkov : gdi32: Make GetFontData traces more readable.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: 991d2d2632e8144c0461004896e8172632719015 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=991d2d2632e8144c046100489…
Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jul 31 19:42:27 2007 +0900 gdi32: Make GetFontData traces more readable. --- dlls/gdi32/freetype.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cdd23ef..8615fb7 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4373,8 +4373,9 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, FT_ULong len; FT_Error err; - TRACE("font=%p, table=%08x, offset=%08x, buf=%p, cbData=%x\n", - font, table, offset, buf, cbData); + TRACE("font=%p, table=%c%c%c%c, offset=0x%x, buf=%p, cbData=0x%x\n", + font, LOBYTE(LOWORD(table)), HIBYTE(LOWORD(table)), + LOBYTE(HIWORD(table)), HIBYTE(HIWORD(table)), offset, buf, cbData); if(!FT_IS_SFNT(ft_face)) return GDI_ERROR;
1
0
0
0
Robert Reif : msvcrt/tests: Add _aligned_malloc tests.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: cf7c156fe3a54b64b9339754de9dab8fb8e45199 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cf7c156fe3a54b64b9339754d…
Author: Robert Reif <reif(a)earthlink.net> Date: Fri Jul 27 20:04:25 2007 -0400 msvcrt/tests: Add _aligned_malloc tests. --- dlls/msvcrt/tests/heap.c | 315 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 315 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf7c156fe3a54b64b9339…
1
0
0
0
← Newer
1
...
105
106
107
108
109
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
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
Results per page:
10
25
50
100
200