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 2010
----- 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
884 discussions
Start a n
N
ew thread
Octavian Voicu : mozactivex: Update url and file size.
by Alexandre Julliard
27 Aug '10
27 Aug '10
Module: tools Branch: master Commit: 2b6a69def753522e48de5ed7f425f3b57d4caad2 URL:
http://source.winehq.org/git/tools.git/?a=commit;h=2b6a69def753522e48de5ed7…
Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Fri Aug 27 02:40:43 2010 +0300 mozactivex: Update url and file size. --- mozactivex.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozactivex.php b/mozactivex.php index 96da243..b0fc40e 100644 --- a/mozactivex.php +++ b/mozactivex.php @@ -14,10 +14,10 @@ // Name of the file -$sFileName = "MozillaControl1712-ReactOS.exe"; +$sFileName = "Support%20Files/Mozilla%20ActiveX%20Control/MozillaControl1712.exe"; // Exact size of the file: -$iFileSize = 4735160; +$iFileSize = 4771240; // List of additional locations (commonly used locations are already in download.inc.php) $aList = array();
1
0
0
0
Octavian Voicu : winegecko: Update url generation to include correct folder .
by Alexandre Julliard
27 Aug '10
27 Aug '10
Module: tools Branch: master Commit: c31cc0c78b0298bb6be07b1cc239f0d4ba3f65f6 URL:
http://source.winehq.org/git/tools.git/?a=commit;h=c31cc0c78b0298bb6be07b1c…
Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Fri Aug 27 02:40:42 2010 +0300 winegecko: Update url generation to include correct folder. --- winegecko.php | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/winegecko.php b/winegecko.php index 986a235..4440279 100644 --- a/winegecko.php +++ b/winegecko.php @@ -12,20 +12,28 @@ * Copyright (c) 2006 Jonathan Ernst */ +// Default version if none given +$sVersion = '0.0.1'; + +// Suffix appended to base name of file +$sFileSuffix = ''; + +// Folder which contains wine gecko files +$sFolder = 'Wine%20Gecko'; + // Check if a specific version was passed if(isset($_GET['v'])) { $sVersion = $_GET['v']; if(isset($_GET['arch'])) - $sVersion = $sVersion.'-'.$_GET['arch']; + $sFileSuffix = $sVersion.'-'.$_GET['arch']; } // Name of the file -$sFileName = "wine_gecko".($sVersion?'-'.$sVersion:'').".cab"; +$sFileName = sprintf('%s/%s/wine_gecko-%s.cab', $sFolder, $sVersion, $sFileSuffix ? $sFileSuffix : $sVersion); // Size array $aFileSizes = array( - 'default'=>5219822, '0.0.1'=>5219822, '0.1.0'=>5746895, '0.9.0'=>7806669, @@ -36,7 +44,7 @@ $aFileSizes = array( ); // Exact size of the file: -$iFileSize = $aFileSizes[$sVersion ? $sVersion : 'default']; +$iFileSize = $aFileSizes[$sFileSuffix ? $sFileSuffix : $sVersion]; if(!$iFileSize) { header("HTTP/1.0 404 Not Found"); exit;
1
0
0
0
Octavian Voicu : download: Fix and update mirror list.
by Alexandre Julliard
27 Aug '10
27 Aug '10
Module: tools Branch: master Commit: b4501f1f6226229b81d88828d756def064067f49 URL:
http://source.winehq.org/git/tools.git/?a=commit;h=b4501f1f6226229b81d88828…
Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Fri Aug 27 02:40:41 2010 +0300 download: Fix and update mirror list. --- download.inc.php | 52 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 22 deletions(-) diff --git a/download.inc.php b/download.inc.php index 727a685..06e5b81 100644 --- a/download.inc.php +++ b/download.inc.php @@ -6,28 +6,36 @@ */ // List of common locations for files -$aList += array("
http://switch.dl.sourceforge.net/sourceforge/wine/
", - "
http://surfnet.dl.sourceforge.net/sourceforge/wine/
", - "
http://citkit.dl.sourceforge.net/sourceforge/wine/
", - "
http://keihanna.dl.sourceforge.net/sourceforge/wine/
", - "
http://heanet.dl.sourceforge.net/sourceforge/wine/
", - "
http://easynews.dl.sourceforge.net/sourceforge/wine/
", - "
http://ovh.dl.sourceforge.net/sourceforge/wine/
", - "
http://jaist.dl.sourceforge.net/sourceforge/wine/
", - "
http://puzzle.dl.sourceforge.net/sourceforge/wine/
", - "
http://nchc.dl.sourceforge.net/sourceforge/wine/
", - "
http://switch.dl.sourceforge.net/sourceforge/wine/
", - "
http://kent.dl.sourceforge.net/sourceforge/wine/
", - "
http://optusnet.dl.sourceforge.net/sourceforge/wine/
", - "
http://mesh.dl.sourceforge.net/sourceforge/wine/
", - "
http://internap.dl.sourceforge.net/sourceforge/wine/
", - "
http://superb-east.dl.sourceforge.net/sourceforge/wine/
", - "
http://optusnet.dl.sourceforge.net/sourceforge/wine/
", - "
http://superb-west.dl.sourceforge.net/sourceforge/wine/
", - "
http://nchc.dl.sourceforge.net/sourceforge/wine/
", - "
http://umn.dl.sourceforge.net/sourceforge/wine/
", - "
http://belnet.dl.sourceforge.net/sourceforge/wine/
", - "
http://ufpr.dl.sourceforge.net/sourceforge/wine/
" +$aList += array("
http://freefr.dl.sourceforge.net/project/wine/
", + "
http://heanet.dl.sourceforge.net/project/wine/
", + "
http://garr.dl.sourceforge.net/project/wine/
", + "
http://mesh.dl.sourceforge.net/project/wine/
", + "
http://puzzle.dl.sourceforge.net/project/wine/
", + "
http://switch.dl.sourceforge.net/project/wine/
", + "
http://kent.dl.sourceforge.net/project/wine/
", + "
http://netcologne.dl.sourceforge.net/project/wine/
", + "
http://ignum.dl.sourceforge.net/project/wine/
", + "
http://ovh.dl.sourceforge.net/project/wine/
", + "
http://sunet.dl.sourceforge.net/project/wine/
", + "
http://surfnet.dl.sourceforge.net/project/wine/
", + "
http://citylan.dl.sourceforge.net/project/wine/
", + "
http://space.dl.sourceforge.net/project/wine/
", + "
http://iweb.dl.sourceforge.net/project/wine/
", + "
http://voxel.dl.sourceforge.net/project/wine/
", + "
http://cdnetworks-kr-1.dl.sourceforge.net/project/wine/
", + "
http://cdnetworks-kr-2.dl.sourceforge.net/project/wine/
", + "
http://nchc.dl.sourceforge.net/project/wine/
", + "
http://ncu.dl.sourceforge.net/project/wine/
", + "
http://jaist.dl.sourceforge.net/project/wine/
", + "
http://superb-sea2.dl.sourceforge.net/project/wine/
", + "
http://softlayer.dl.sourceforge.net/project/wine/
", + "
http://biznetnetworks.dl.sourceforge.net/project/wine/
", + "
http://ufpr.dl.sourceforge.net/project/wine/
", + "
http://cdnetworks-us-2.dl.sourceforge.net/project/wine/
", + "
http://cdnetworks-us-1.dl.sourceforge.net/project/wine/
", + "
http://waix.dl.sourceforge.net/project/wine/
", + "
http://internode.dl.sourceforge.net/project/wine/
", + "
http://transact.dl.sourceforge.net/project/wine/
" );
1
0
0
0
Frédéric Delanoy : Fix French Ubuntu software sources screenshot
by Jeremy Newman
26 Aug '10
26 Aug '10
Module: website Branch: master Commit: 3b16dd299f953d08715b67ec9d95cbf02bfb9711 URL:
http://source.winehq.org/git/website.git/?a=commit;h=3b16dd299f953d08715b67…
Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 26 15:37:03 2010 +0200 Fix French Ubuntu software sources screenshot --- images/distro/fr_ubuntu-ppa.png | Bin 46815 -> 52043 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/distro/fr_ubuntu-ppa.png b/images/distro/fr_ubuntu-ppa.png index 4fcdf46..ed47780 100644 Binary files a/images/distro/fr_ubuntu-ppa.png and b/images/distro/fr_ubuntu-ppa.png differ
1
0
0
0
Alexandre Julliard : shell32: Add missing WINAPI to SHGetPropertyStoreFromParsingName.
by Alexandre Julliard
26 Aug '10
26 Aug '10
Module: wine Branch: master Commit: f6bcd27baa8509ec3196684ddc4bf24c8987ef7c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f6bcd27baa8509ec3196684dd…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 26 18:08:23 2010 +0200 shell32: Add missing WINAPI to SHGetPropertyStoreFromParsingName. --- dlls/shell32/shell32_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index a166150..7d78ab5 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -860,7 +860,7 @@ VOID WINAPI Printers_UnregisterWindow(HANDLE hClassPidl, HWND hwnd) /************************************************************************* * SHGetPropertyStoreFromParsingName [SHELL32.@] */ -HRESULT SHGetPropertyStoreFromParsingName(PCWSTR pszPath, IBindCtx *pbc, GETPROPERTYSTOREFLAGS flags, REFIID riid, void **ppv) +HRESULT WINAPI SHGetPropertyStoreFromParsingName(PCWSTR pszPath, IBindCtx *pbc, GETPROPERTYSTOREFLAGS flags, REFIID riid, void **ppv) { FIXME("(%s %p %u %p %p) stub!\n", debugstr_w(pszPath), pbc, flags, riid, ppv); return E_NOTIMPL;
1
0
0
0
Alexandre Julliard : ntdll: Fix the protection state of writable sections.
by Alexandre Julliard
26 Aug '10
26 Aug '10
Module: wine Branch: master Commit: 5393f0a947a24c92fb0f6c654f5ac64a423e5081 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5393f0a947a24c92fb0f6c654…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 26 18:06:10 2010 +0200 ntdll: Fix the protection state of writable sections. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 51c56fe..a42ed5f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1278,7 +1278,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz size = ROUND_SIZE( sec->VirtualAddress, sec->SizeOfRawData ); if (sec->Characteristics & IMAGE_SCN_MEM_READ) vprot |= VPROT_READ; - if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_READ|VPROT_WRITECOPY; + if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_READ|VPROT_WRITE; if (sec->Characteristics & IMAGE_SCN_MEM_EXECUTE) vprot |= VPROT_EXEC; /* Dumb game crack lets the AOEP point into a data section. Adjust. */
1
0
0
0
Alexandre Julliard : ntdll/tests: Add a test for the protection state of the read-write data section.
by Alexandre Julliard
26 Aug '10
26 Aug '10
Module: wine Branch: master Commit: 8e2e95ed7e42915415c81e10f35623ef1248917b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8e2e95ed7e42915415c81e10f…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 26 18:05:55 2010 +0200 ntdll/tests: Add a test for the protection state of the read-write data section. --- dlls/ntdll/tests/info.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f30c6ab..ffeb22a 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1073,6 +1073,7 @@ static void test_queryvirtualmemory(void) NTSTATUS status; SIZE_T readcount; static const char teststring[] = "test string"; + static char datatestbuf[42] = "abc"; static char rwtestbuf[42]; MEMORY_BASIC_INFORMATION mbi; char stackbuf[42]; @@ -1112,7 +1113,15 @@ static void test_queryvirtualmemory(void) if (mbi.Protect != PAGE_READONLY) todo_wine ok( mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READONLY); - trace("Check flags of read-write global data (.bss) at %p\n", rwtestbuf); + trace("Check flags of read-write data at %p\n", datatestbuf); + status = pNtQueryVirtualMemory(NtCurrentProcess(), datatestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); + ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); + + trace("Check flags of read-write uninitialized data (.bss) at %p\n", rwtestbuf); status = pNtQueryVirtualMemory(NtCurrentProcess(), rwtestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
1
0
0
0
André Hentschel : user32: Optimize the storage of default color values.
by Alexandre Julliard
26 Aug '10
26 Aug '10
Module: wine Branch: master Commit: ed69ddb37e8d7adeb4a9d9539e86d7a6c87ea86c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ed69ddb37e8d7adeb4a9d9539…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 25 17:33:26 2010 +0200 user32: Optimize the storage of default color values. --- dlls/user32/sysparams.c | 83 +++++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 39 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8c6367e..dcf11ef 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -92,39 +92,43 @@ enum spi_index SPI_INDEX_COUNT }; -static const char * const DefSysColors[] = -{ - "Scrollbar", "212 208 200", /* COLOR_SCROLLBAR */ - "Background", "58 110 165", /* COLOR_BACKGROUND */ - "ActiveTitle", "10 36 106", /* COLOR_ACTIVECAPTION */ - "InactiveTitle", "128 128 128", /* COLOR_INACTIVECAPTION */ - "Menu", "212 208 200", /* COLOR_MENU */ - "Window", "255 255 255", /* COLOR_WINDOW */ - "WindowFrame", "0 0 0", /* COLOR_WINDOWFRAME */ - "MenuText", "0 0 0", /* COLOR_MENUTEXT */ - "WindowText", "0 0 0", /* COLOR_WINDOWTEXT */ - "TitleText", "255 255 255", /* COLOR_CAPTIONTEXT */ - "ActiveBorder", "212 208 200", /* COLOR_ACTIVEBORDER */ - "InactiveBorder", "212 208 200", /* COLOR_INACTIVEBORDER */ - "AppWorkSpace", "128 128 128", /* COLOR_APPWORKSPACE */ - "Hilight", "10 36 106", /* COLOR_HIGHLIGHT */ - "HilightText", "255 255 255", /* COLOR_HIGHLIGHTTEXT */ - "ButtonFace", "212 208 200", /* COLOR_BTNFACE */ - "ButtonShadow", "128 128 128", /* COLOR_BTNSHADOW */ - "GrayText", "128 128 128", /* COLOR_GRAYTEXT */ - "ButtonText", "0 0 0", /* COLOR_BTNTEXT */ - "InactiveTitleText", "212 208 200", /* COLOR_INACTIVECAPTIONTEXT */ - "ButtonHilight", "255 255 255", /* COLOR_BTNHIGHLIGHT */ - "ButtonDkShadow", "64 64 64", /* COLOR_3DDKSHADOW */ - "ButtonLight", "212 208 200", /* COLOR_3DLIGHT */ - "InfoText", "0 0 0", /* COLOR_INFOTEXT */ - "InfoWindow", "255 255 225", /* COLOR_INFOBK */ - "ButtonAlternateFace", "181 181 181", /* COLOR_ALTERNATEBTNFACE */ - "HotTrackingColor", "0 0 128", /* COLOR_HOTLIGHT */ - "GradientActiveTitle", "166 202 240", /* COLOR_GRADIENTACTIVECAPTION */ - "GradientInactiveTitle", "192 192 192", /* COLOR_GRADIENTINACTIVECAPTION */ - "MenuHilight", "10 36 106", /* COLOR_MENUHILIGHT */ - "MenuBar", "212 208 200" /* COLOR_MENUBAR */ +static const struct +{ + const char *name; + COLORREF rgb; +} DefSysColors[] = +{ + {"Scrollbar", RGB(212, 208, 200)}, /* COLOR_SCROLLBAR */ + {"Background", RGB(58, 110, 165)}, /* COLOR_BACKGROUND */ + {"ActiveTitle", RGB(10, 36, 106)}, /* COLOR_ACTIVECAPTION */ + {"InactiveTitle", RGB(128, 128, 128)}, /* COLOR_INACTIVECAPTION */ + {"Menu", RGB(212, 208, 200)}, /* COLOR_MENU */ + {"Window", RGB(255, 255, 255)}, /* COLOR_WINDOW */ + {"WindowFrame", RGB(0, 0, 0)}, /* COLOR_WINDOWFRAME */ + {"MenuText", RGB(0, 0, 0)}, /* COLOR_MENUTEXT */ + {"WindowText", RGB(0, 0, 0)}, /* COLOR_WINDOWTEXT */ + {"TitleText", RGB(255, 255, 255)}, /* COLOR_CAPTIONTEXT */ + {"ActiveBorder", RGB(212, 208, 200)}, /* COLOR_ACTIVEBORDER */ + {"InactiveBorder", RGB(212, 208, 200)}, /* COLOR_INACTIVEBORDER */ + {"AppWorkSpace", RGB(128, 128, 128)}, /* COLOR_APPWORKSPACE */ + {"Hilight", RGB(10, 36, 106)}, /* COLOR_HIGHLIGHT */ + {"HilightText", RGB(255, 255, 255)}, /* COLOR_HIGHLIGHTTEXT */ + {"ButtonFace", RGB(212, 208, 200)}, /* COLOR_BTNFACE */ + {"ButtonShadow", RGB(128, 128, 128)}, /* COLOR_BTNSHADOW */ + {"GrayText", RGB(128, 128, 128)}, /* COLOR_GRAYTEXT */ + {"ButtonText", RGB(0, 0, 0)}, /* COLOR_BTNTEXT */ + {"InactiveTitleText", RGB(212, 208, 200)}, /* COLOR_INACTIVECAPTIONTEXT */ + {"ButtonHilight", RGB(255, 255, 255)}, /* COLOR_BTNHIGHLIGHT */ + {"ButtonDkShadow", RGB(64, 64, 64)}, /* COLOR_3DDKSHADOW */ + {"ButtonLight", RGB(212, 208, 200)}, /* COLOR_3DLIGHT */ + {"InfoText", RGB(0, 0, 0)}, /* COLOR_INFOTEXT */ + {"InfoWindow", RGB(255, 255, 225)}, /* COLOR_INFOBK */ + {"ButtonAlternateFace", RGB(181, 181, 181)}, /* COLOR_ALTERNATEBTNFACE */ + {"HotTrackingColor", RGB(0, 0, 128)}, /* COLOR_HOTLIGHT */ + {"GradientActiveTitle", RGB(166, 202, 240)}, /* COLOR_GRADIENTACTIVECAPTION */ + {"GradientInactiveTitle", RGB(192, 192, 192)}, /* COLOR_GRADIENTINACTIVECAPTION */ + {"MenuHilight", RGB(10, 36, 106)}, /* COLOR_MENUHILIGHT */ + {"MenuBar", RGB(212, 208, 200)} /* COLOR_MENUBAR */ }; /** @@ -927,21 +931,22 @@ void SYSPARAMS_Init(void) if (hkey) { DWORD dwDataSize = sizeof(buffer); - if (!(RegQueryValueExA(hkey,DefSysColors[i*2], 0, 0, (LPBYTE) buffer, &dwDataSize))) + if (!(RegQueryValueExA(hkey,DefSysColors[i].name, 0, 0, (LPBYTE) buffer, &dwDataSize))) if (sscanf( buffer, "%d %d %d", &r, &g, &b ) == 3) bOk = TRUE; } /* second try, win.ini */ if (!bOk) { - GetProfileStringA( "colors", DefSysColors[i*2], DefSysColors[i*2+1], buffer, 100 ); + GetProfileStringA( "colors", DefSysColors[i].name, NULL, buffer, 100 ); if (sscanf( buffer, " %d %d %d", &r, &g, &b ) == 3) bOk = TRUE; } - /* last chance, take the default */ - if (!bOk) sscanf( DefSysColors[i*2+1], " %d %d %d", &r, &g, &b ); - - SYSPARAMS_SetSysColor( i, RGB(r,g,b) ); + /* else, take the default */ + if (!bOk) + SYSPARAMS_SetSysColor( i, DefSysColors[i].rgb ); + else + SYSPARAMS_SetSysColor( i, RGB(r,g,b) ); } if (hkey) RegCloseKey( hkey );
1
0
0
0
Alexandre Julliard : rpcrt4: Retrieve the stack argument pointer in a more portable way in NdrClientCall .
by Alexandre Julliard
26 Aug '10
26 Aug '10
Module: wine Branch: master Commit: 9de9cbb3244bf373416d6acfe1ed114ff43133d6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9de9cbb3244bf373416d6acfe…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 26 17:03:50 2010 +0200 rpcrt4: Retrieve the stack argument pointer in a more portable way in NdrClientCall. --- dlls/rpcrt4/ndr_stubless.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 243c55a..82a72aa 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -580,6 +580,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma PFORMAT_STRING pHandleFormat; /* correlation cache */ ULONG_PTR NdrCorrCache[256]; + __ms_va_list args; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); @@ -618,11 +619,9 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma TRACE("MIDL stub version = 0x%x\n", pStubDesc->MIDLVersion); /* needed for conformance of top-level objects */ -#ifdef __i386__ - stubMsg.StackTop = *(unsigned char **)(&pFormat+1); -#else -# warning Stack not retrieved for your CPU architecture -#endif + __ms_va_start( args, pFormat ); + stubMsg.StackTop = va_arg( args, unsigned char * ); + __ms_va_end( args ); pHandleFormat = pFormat; @@ -1654,6 +1653,7 @@ LONG_PTR WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc, const NDR_PROC_HEADER * pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; /* -Oif or -Oicf generated format */ BOOL bV2Format = FALSE; + __ms_va_list args; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); @@ -1705,13 +1705,10 @@ LONG_PTR WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc, TRACE("MIDL stub version = 0x%x\n", pStubDesc->MIDLVersion); /* needed for conformance of top-level objects */ -#ifdef __i386__ pStubMsg->StackTop = I_RpcAllocate(async_call_data->stack_size); - /* FIXME: this may read one more DWORD than is necessary, but it shouldn't hurt */ - memcpy(pStubMsg->StackTop, *(unsigned char **)(&pFormat+1), async_call_data->stack_size); -#else -# warning Stack not retrieved for your CPU architecture -#endif + __ms_va_start( args, pFormat ); + memcpy(pStubMsg->StackTop, va_arg( args, unsigned char * ), async_call_data->stack_size); + __ms_va_end( args ); pAsync = *(RPC_ASYNC_STATE **)pStubMsg->StackTop; pAsync->StubInfo = async_call_data;
1
0
0
0
Alexandre Julliard : rpcrt4: Fix cfi annotations for the stubless proxy entry point.
by Alexandre Julliard
26 Aug '10
26 Aug '10
Module: wine Branch: master Commit: e095467b3c1ed9d2fc13c46e43cbdacd8c130522 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e095467b3c1ed9d2fc13c46e4…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 26 17:03:31 2010 +0200 rpcrt4: Fix cfi annotations for the stubless proxy entry point. --- dlls/rpcrt4/cproxy.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 59ec80d..b07dd7c 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -65,7 +65,7 @@ static const IRpcProxyBufferVtbl StdProxy_Vtbl; #include "pshpack1.h" struct thunk { - BYTE push; + BYTE mov_eax; DWORD index; BYTE jmp; LONG handler; @@ -75,9 +75,12 @@ struct thunk { extern void call_stubless_func(void); __ASM_GLOBAL_FUNC(call_stubless_func, + "pushl %eax\n\t" /* method index */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl %esp\n\t" /* pointer to index */ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "call " __ASM_NAME("ObjectStubless") __ASM_STDCALL(4) "\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") "popl %edx\n\t" /* args size */ __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") "movl (%esp),%ecx\n\t" /* return address */ @@ -115,7 +118,7 @@ static const struct thunk *allocate_block( unsigned int num ) for (i = 0; i < BLOCK_SIZE; i++) { - block[i].push = 0x68; /* pushl */ + block[i].mov_eax = 0xb8; /* movl $n,%eax */ block[i].index = BLOCK_SIZE * num + i + 3; block[i].jmp = 0xe9; /* jmp */ block[i].handler = (char *)call_stubless_func - (char *)(&block[i].handler + 1);
1
0
0
0
← Newer
1
...
13
14
15
16
17
18
19
...
89
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
Results per page:
10
25
50
100
200