Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[akhaldi] 70827: [ATL] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 12:14:12 2016 New Revision: 70827 URL: http://svn.reactos.org/svn/reactos?rev=70827&view=rev Log: [ATL] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/atl/atl_ax.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] Tue Mar 1 12:14:12 2016 @@ -1019,15 +1019,15 @@ } /*********************************************************************** - * AtlAxCreateControlEx [atl100.@] + * AtlAxCreateControlLicEx [atl100.@] * * REMARKS * See http://www.codeproject.com/com/cwebpage.asp for some background * */ -HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, +HRESULT WINAPI AtlAxCreateControlLicEx(LPCOLESTR lpszName, HWND hWnd, IStream *pStream, IUnknown **ppUnkContainer, IUnknown **ppUnkControl, - REFIID iidSink, IUnknown *punkSink) + REFIID iidSink, IUnknown *punkSink, BSTR lic) { CLSID controlId; HRESULT hRes; @@ -1037,8 +1037,11 @@ IUnknown *pContainer = NULL; enum content content; - TRACE("(%s %p %p %p %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream, - ppUnkContainer, ppUnkControl, iidSink, punkSink); + TRACE("(%s %p %p %p %p %p %p %s)\n", debugstr_w(lpszName), hWnd, pStream, + ppUnkContainer, ppUnkControl, iidSink, punkSink, debugstr_w(lic)); + + if (lic) + FIXME("semi stub\n"); if (ppUnkContainer) *ppUnkContainer = NULL; if (ppUnkControl) *ppUnkControl = NULL; @@ -1411,28 +1414,21 @@ return 0; } -#if _ATL_VER >= _ATL_VER_80 - /*********************************************************************** * AtlAxCreateControlLic [atl100.59] * */ HRESULT WINAPI AtlAxCreateControlLic(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, IUnknown **container, BSTR lic) { - FIXME("(%s %p %p %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, debugstr_w(lic)); - return E_NOTIMPL; + return AtlAxCreateControlLicEx(lpTricsData, hwnd, stream, container, NULL, NULL, NULL, lic); } /*********************************************************************** - * AtlAxCreateControlLicEx [atl100.60] - * - */ -HRESULT WINAPI AtlAxCreateControlLicEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, - IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink, BSTR lic) -{ - FIXME("(%s %p %p %p %p %s %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, control, - debugstr_guid(iidSink), punkSink, debugstr_w(lic)); - return E_NOTIMPL; -} - -#endif + * AtlAxCreateControlEx [atl100.@] + * + */ +HRESULT WINAPI AtlAxCreateControlEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, + IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink) +{ + return AtlAxCreateControlLicEx(lpTricsData, hwnd, stream, container, control, iidSink, punkSink, NULL); +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Mar 1 12:14:12 2016 @@ -45,7 +45,7 @@ reactos/dll/win32/activeds # Synced to WineStaging-1.7.55 reactos/dll/win32/actxprxy # Synced to WineStaging-1.7.55 reactos/dll/win32/advpack # Synced to WineStaging-1.7.55 -reactos/dll/win32/atl # Synced to WineStaging-1.7.55 +reactos/dll/win32/atl # Synced to WineStaging-1.9.4 reactos/dll/win32/atl80 # Synced to WineStaging-1.7.55 reactos/dll/win32/atl100 # Synced to WineStaging-1.7.55 reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.55

8 years, 9 months

[akhaldi] 70826: [CABINET] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 12:12:48 2016 New Revision: 70826 URL: http://svn.reactos.org/svn/reactos?rev=70826&view=rev Log: [CABINET] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/cabinet/fdi.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Tue Mar 1 12:12:48 2016 @@ -489,7 +489,7 @@ break; } /* The buffer is too small for the string. Reset the file to the point - * were we started, free the buffer and increase the size for the next try + * where we started, free the buffer and increase the size for the next try */ fdi->seek(hf, base, SEEK_SET); fdi->free(buf); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Mar 1 12:12:48 2016 @@ -51,7 +51,7 @@ reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.55 reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.55 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to WineStaging-1.7.55 +reactos/dll/win32/cabinet # Synced to WineStaging-1.9.4 reactos/dll/win32/clusapi # Synced to WineStaging-1.7.55 reactos/dll/win32/comcat # Synced to WineStaging-1.7.55 reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.55

8 years, 9 months

[aandrejevic] 70825: [NTVDM] Some programs expect an 8x8 font at F000:FA6E. CORE-10877 #comment Works rather well as of r70825.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Mar 1 00:44:20 2016 New Revision: 70825 URL: http://svn.reactos.org/svn/reactos?rev=70825&view=rev Log: [NTVDM] Some programs expect an 8x8 font at F000:FA6E. CORE-10877 #comment Works rather well as of r70825. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Tue Mar 1 00:44:20 2016 @@ -3987,6 +3987,9 @@ RtlMoveMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, FONT_8x14_OFFSET), Font8x14, sizeof(Font8x14)); + /* Make another copy of the lower half of the 8x8 font at F000:FA6E for compatibility */ + RtlMoveMemory(SEG_OFF_TO_PTR(BIOS_SEGMENT, FONT_8x8_COMPAT_OFFSET), Font8x8, sizeof(Font8x8) / 2); + VidBios32Initialize(); /* Compute the ROM checksum and store it */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] Tue Mar 1 00:44:20 2016 @@ -30,6 +30,8 @@ #define FONT_8x8_HIGH_OFFSET 0x0500 #define FONT_8x16_OFFSET 0x0900 #define FONT_8x14_OFFSET 0x1900 + +#define FONT_8x8_COMPAT_OFFSET 0xFA6E #define VIDEO_STATE_INFO_OFFSET 0x3000 // == 0x1900 + (sizeof(Font8x14) == 0x0E00) + 0x0900 for padding

8 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2016