Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70842: [AVIFIL32] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 18:31:48 2016 New Revision: 70842 URL: http://svn.reactos.org/svn/reactos?rev=70842&view=rev Log: [AVIFIL32] Sync with Wine Staging 1.9.4. CORE-10912 Added: trunk/reactos/dll/win32/avifil32/avifile_ifaces.idl (with props) Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifil32.idl trunk/reactos/dll/win32/avifil32/avifile_private.h trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/dll/win32/avifil32/getframe.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -2,9 +2,10 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -DENTRY_PREFIX=avifil32_) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(avifil32.dll avifil32.spec ADD_IMPORTLIB) +add_rpcproxy_files(avifil32.idl) list(APPEND SOURCE acmstream.c @@ -17,16 +18,18 @@ icmstream.c tmpfile.c wavfile.c + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c avifile_private.h) add_library(avifil32 SHARED ${SOURCE} guid.c rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/avifil32_p.c ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) set_module_type(avifil32 win32dll) -target_link_libraries(avifil32 wine) -add_importlibs(avifil32 msacm32 msvfw32 winmm ole32 user32 advapi32 msvcrt kernel32 ntdll) +target_link_libraries(avifil32 wine ${PSEH_LIB}) +add_importlibs(avifil32 msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) add_pch(avifil32 avifile_private.h SOURCE) add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -2256,7 +2256,7 @@ HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - va_list vl; + __ms_va_list vl; int i; HRESULT ret; PAVISTREAM *streams; @@ -2267,8 +2267,8 @@ if (nStreams <= 0) return AVIERR_BADPARAM; - streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); - options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*streams)); + options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*options)); if (!streams || !options) { ret = AVIERR_MEMORY; @@ -2278,13 +2278,13 @@ streams[0] = pavi; options[0] = lpOptions; - va_start(vl, lpOptions); + __ms_va_start(vl, lpOptions); for (i = 1; i < nStreams; i++) { - streams[i] = va_arg(vl, void *); - options[i] = va_arg(vl, void *); + streams[i] = va_arg(vl, PAVISTREAM); + options[i] = va_arg(vl, PAVICOMPRESSOPTIONS); } - va_end(vl); + __ms_va_end(vl); for (i = 0; i < nStreams; i++) TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]); @@ -2299,7 +2299,7 @@ HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - va_list vl; + __ms_va_list vl; int i; HRESULT ret; PAVISTREAM *streams; @@ -2310,8 +2310,8 @@ if (nStreams <= 0) return AVIERR_BADPARAM; - streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); - options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*streams)); + options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*options)); if (!streams || !options) { ret = AVIERR_MEMORY; @@ -2321,13 +2321,13 @@ streams[0] = pavi; options[0] = lpOptions; - va_start(vl, lpOptions); + __ms_va_start(vl, lpOptions); for (i = 1; i < nStreams; i++) { - streams[i] = va_arg(vl, void *); - options[i] = va_arg(vl, void *); + streams[i] = va_arg(vl, PAVISTREAM); + options[i] = va_arg(vl, PAVICOMPRESSOPTIONS); } - va_end(vl); + __ms_va_end(vl); for (i = 0; i < nStreams; i++) TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]); Modified: trunk/reactos/dll/win32/avifil32/avifil32.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.idl [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -18,39 +18,42 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy #pragma makedep register + +#include "avifile_ifaces.idl" + +[ + helpstring("IAVIStream & IAVIFile Proxy"), + threading(both), + uuid(0002000d-0000-0000-c000-000000000046) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } [ helpstring("Microsoft AVI Files"), - threading(apartment), + threading(both), uuid(00020000-0000-0000-C000-000000000046) ] coclass AVIFile { interface IAVIFile; } [ helpstring("AVI Compressed Stream"), - threading(apartment), + threading(both), uuid(00020001-0000-0000-c000-000000000046) ] coclass ICMStream { interface IAVIStream; } [ helpstring("Microsoft Wave File"), - threading(apartment), + threading(both), uuid(00020003-0000-0000-c000-000000000046) ] coclass WAVFile { interface IAVIFile; } [ - helpstring("IAVIStream & IAVIFile Proxy"), - threading(apartment), - uuid(0002000d-0000-0000-c000-000000000046) -] -coclass AVIProxy { } - -[ helpstring("ACM Compressed Audio Stream"), - threading(apartment), + threading(both), uuid(0002000f-0000-0000-c000-000000000046) ] coclass ACMStream { interface IAVIStream; } Added: trunk/reactos/dll/win32/avifil32/avifile_ifaces.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_ifaces.idl (added) +++ trunk/reactos/dll/win32/avifil32/avifile_ifaces.idl [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -0,0 +1,105 @@ +/* + * Proxy support for avifil32 + * + * Copyright 2016 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * These interface descriptions are supposed to be used for automatic proxy + * generation by an IDL compiler. + * + * While it's possible to convert include/vfw.h to an .idl, that's proved to + * be a major waste of an effort because the resulting interface descriptions + * can't be used for automatic proxy generation since they are not compatible + * with IDL compiler restrictions for proxies, and fixing them up would make + * generated vfw.h source incompatible with PSDK's equivalent. + */ + +import "wtypes.idl"; +import "unknwn.idl"; + +typedef struct _AVISTREAMINFOW +{ + DWORD fccType; + DWORD fccHandler; + DWORD dwFlags; + DWORD dwCaps; + WORD wPriority; + WORD wLanguage; + DWORD dwScale; + DWORD dwRate; + DWORD dwStart; + DWORD dwLength; + DWORD dwInitialFrames; + DWORD dwSuggestedBufferSize; + DWORD dwQuality; + DWORD dwSampleSize; + RECT rcFrame; + DWORD dwEditCount; + DWORD dwFormatChangeCount; + WCHAR szName[64]; +} AVISTREAMINFOW; + +[ + object, + uuid(00020021-0000-0000-c000-000000000046) +] +interface IAVIStream : IUnknown +{ + HRESULT Create(LPARAM lParam1, LPARAM lParam2); + HRESULT Info(AVISTREAMINFOW *psi, LONG lSize); + LONG FindSample(LONG lPos, LONG lFlags); + HRESULT ReadFormat(LONG lPos, [out,size_is(*lpcbFormat)] char *lpFormat, [in,out] LONG *lpcbFormat); + HRESULT SetFormat(LONG lPos, [in,size_is(cbFormat)] char *lpFormat, LONG cbFormat); + HRESULT Read(LONG lStart, LONG lSamples, [out,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, LONG *plBytes, LONG *plSamples); + HRESULT Write(LONG lStart, LONG lSamples, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, DWORD dwFlags, LONG *plSampWritten, LONG *plBytesWritten); + HRESULT Delete(LONG lStart, LONG lSamples); + HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); + HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); + HRESULT SetInfo(AVISTREAMINFOW *plInfo, LONG cbInfo); +}; + +typedef struct _AVIFILEINFOW +{ + DWORD dwMaxBytesPerSec; + DWORD dwFlags; + DWORD dwCaps; + DWORD dwStreams; + DWORD dwSuggestedBufferSize; + DWORD dwWidth; + DWORD dwHeight; + DWORD dwScale; + DWORD dwRate; + DWORD dwLength; + DWORD dwEditCount; + WCHAR szFileType[64]; +} AVIFILEINFOW; + +[ + object, + uuid(00020020-0000-0000-c000-000000000046) +] +interface IAVIFile : IUnknown +{ + HRESULT Info(AVIFILEINFOW *pfi, LONG lSize); + HRESULT GetStream(IAVIStream **ppStream, DWORD fccType, LONG lParam); + HRESULT CreateStream(IAVIStream **ppStream, AVISTREAMINFOW *psi); + HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); + HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); + HRESULT EndRecord(void); + HRESULT DeleteStream(DWORD fccType, LONG lParam); +}; Propchange: trunk/reactos/dll/win32/avifil32/avifile_ifaces.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -70,5 +70,6 @@ extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN; extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN; +extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) DECLSPEC_HIDDEN; #endif /* __AVIFILE_PRIVATE_H */ Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -179,12 +179,18 @@ */ HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) { + HRESULT hr; + TRACE("(%s,%s,%p)\n", debugstr_guid(pclsid), debugstr_guid(piid), ppv); if (pclsid == NULL || piid == NULL || ppv == NULL) return E_FAIL; - return AVIFILE_CreateClassFactory(pclsid,piid,ppv); + hr = AVIFILE_CreateClassFactory(pclsid,piid,ppv); + if (SUCCEEDED(hr)) + return hr; + + return avifil32_DllGetClassObject(pclsid,piid,ppv); } /***************************************************************************** Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getfram… ============================================================================== --- trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -394,8 +394,6 @@ lpbi->biSize + lpbi->biClrUsed * sizeof(RGBQUAD)); if (lpbi->biBitCount <= 8) ICDecompressGetPalette(This->hic, This->lpInFormat, This->lpOutFormat); - - return AVIERR_OK; } else { if (bBestDisplay) { ICGetDisplayFormat(This->hic, This->lpInFormat, @@ -405,64 +403,64 @@ AVIFILE_CloseCompressor(This); return AVIERR_NOCOMPRESSOR; } - - /* check output format */ - if (This->lpOutFormat->biClrUsed == 0 && - This->lpOutFormat->biBitCount <= 8) - This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; - if (This->lpOutFormat->biSizeImage == 0 && - This->lpOutFormat->biCompression == BI_RGB) { - This->lpOutFormat->biSizeImage = - DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; - } - - if (lpBits == NULL) { - DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); - - size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; - This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); - if (This->lpOutFormat == NULL) { - AVIFILE_CloseCompressor(This); - return AVIERR_MEMORY; - } - This->lpOutBuffer = DIBPTR(This->lpOutFormat); - } else - This->lpOutBuffer = lpBits; - - /* for user size was irrelevant */ - if (dx == -1) - dx = This->lpOutFormat->biWidth; - if (dy == -1) - dy = This->lpOutFormat->biHeight; - - /* need to resize? */ - if (x != 0 || y != 0) { - if (dy == This->lpOutFormat->biHeight && - dx == This->lpOutFormat->biWidth) - This->bResize = FALSE; - else - This->bResize = TRUE; - } - - if (This->bResize) { - This->x = x; - This->y = y; - This->dx = dx; - This->dy = dy; - - if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, - 0,This->lpInFormat->biWidth, - This->lpInFormat->biHeight,This->lpOutFormat, - This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) - return AVIERR_OK; - } else if (ICDecompressBegin(This->hic, This->lpInFormat, - This->lpOutFormat) == ICERR_OK) + } + + /* check output format */ + if (This->lpOutFormat->biClrUsed == 0 && + This->lpOutFormat->biBitCount <= 8) + This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; + if (This->lpOutFormat->biSizeImage == 0 && + This->lpOutFormat->biCompression == BI_RGB) { + This->lpOutFormat->biSizeImage = + DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; + } + + if (lpBits == NULL) { + DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); + + size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; + This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); + if (This->lpOutFormat == NULL) { + AVIFILE_CloseCompressor(This); + return AVIERR_MEMORY; + } + This->lpOutBuffer = DIBPTR(This->lpOutFormat); + } else + This->lpOutBuffer = lpBits; + + /* for user size was irrelevant */ + if (dx == -1) + dx = This->lpOutFormat->biWidth; + if (dy == -1) + dy = This->lpOutFormat->biHeight; + + /* need to resize? */ + if (x != 0 || y != 0) { + if (dy == This->lpOutFormat->biHeight && + dx == This->lpOutFormat->biWidth) + This->bResize = FALSE; + else + This->bResize = TRUE; + } + + if (This->bResize) { + This->x = x; + This->y = y; + This->dx = dx; + This->dy = dy; + + if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, + 0,This->lpInFormat->biWidth, + This->lpInFormat->biHeight,This->lpOutFormat, + This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) return AVIERR_OK; - - AVIFILE_CloseCompressor(This); - - return AVIERR_COMPRESSOR; - } + } else if (ICDecompressBegin(This->hic, This->lpInFormat, + This->lpOutFormat) == ICERR_OK) + return AVIERR_OK; + + AVIFILE_CloseCompressor(This); + + return AVIERR_COMPRESSOR; } static const struct IGetFrameVtbl igetframeVtbl = { 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 18:31:48 2016 @@ -48,7 +48,7 @@ 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 +reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.4 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.4 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to WineStaging-1.9.4

1 0

[akhaldi] 70841: [QUARTZ_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 18:26:00 2016 New Revision: 70841 URL: http://svn.reactos.org/svn/reactos?rev=70841&view=rev Log: [QUARTZ_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/quartz/filtergraph.c Modified: trunk/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr… ============================================================================== --- trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] Tue Mar 1 18:26:00 2016 @@ -255,6 +255,7 @@ { HRESULT hr; LONGLONG pos = 0xdeadbeef; + GUID format = GUID_NULL; IMediaSeeking *seeking = NULL; IMediaFilter *filter = NULL; IMediaControl *control = NULL; @@ -281,6 +282,26 @@ IMediaFilter_Release(filter); return; } + + format = GUID_NULL; + hr = IMediaSeeking_GetTimeFormat(seeking, &format); + ok(hr == S_OK, "GetTimeFormat failed: %08x\n", hr); + ok(IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME), "GetTimeFormat: unexpected format %s\n", wine_dbgstr_guid(&format)); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, NULL); + ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL); + ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME); + ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr);

1 0

[akhaldi] 70840: [QUARTZ] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 18:25:44 2016 New Revision: 70840 URL: http://svn.reactos.org/svn/reactos?rev=70840&view=rev Log: [QUARTZ] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/directx/wine/quartz/enumfilters.c trunk/reactos/dll/directx/wine/quartz/filesource.c trunk/reactos/dll/directx/wine/quartz/filtergraph.c trunk/reactos/dll/directx/wine/quartz/parser.c trunk/reactos/dll/directx/wine/quartz/pin.c trunk/reactos/dll/directx/wine/quartz/regsvr.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/quartz/enumfilters.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/en… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/enumfilters.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/enumfilters.c [iso-8859-1] Tue Mar 1 18:25:44 2016 @@ -181,7 +181,7 @@ This->uIndex = 0; hr = IGraphVersion_QueryVersion(This->pVersionSource, &currentVersion); - if (!hr) + if (hr == S_OK) This->Version = currentVersion; return S_OK; } Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Tue Mar 1 18:25:44 2016 @@ -637,8 +637,9 @@ hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); if (FAILED(hr)) { - CoTaskMemFree(This->pmt); - This->pmt = NULL; + memcpy(&This->pmt->majortype, &MEDIATYPE_Stream, sizeof(GUID)); + memcpy(&This->pmt->subtype, &MEDIASUBTYPE_NULL, sizeof(GUID)); + hr = S_OK; } } else Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] Tue Mar 1 18:25:44 2016 @@ -1596,7 +1596,7 @@ /* Try to find a match without reading the file first */ hr = GetClassMediaFile(NULL, pszFileName, NULL, NULL, &clsid); - if (!hr) + if (hr == S_OK) return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter); /* Now create a AyncReader instance, to check for signature bytes in the file */ @@ -1638,7 +1638,7 @@ hr = GetClassMediaFile(pReader, pszFileName, NULL, NULL, &clsid); IAsyncReader_Release(pReader); - if (!hr) + if (hr == S_OK) { /* Release the AsyncReader filter and create the matching one */ IBaseFilter_Release(*filter); @@ -2462,6 +2462,9 @@ if (!pSourceFormat) pSourceFormat = &This->timeformatseek; + if (!pTargetFormat) + pTargetFormat = &This->timeformatseek; + if (IsEqualGUID(pTargetFormat, pSourceFormat)) *pTarget = Source; else @@ -2607,6 +2610,11 @@ IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pdRate); + + if (!pdRate) + return E_POINTER; + + *pdRate = 1.0; return S_OK; } Modified: trunk/reactos/dll/directx/wine/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pa… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] Tue Mar 1 18:25:44 2016 @@ -141,8 +141,12 @@ return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) + if (!IsEqualIID(riid, &IID_IPin) && + !IsEqualIID(riid, &IID_IVideoWindow) && + !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) + { FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + } return E_NOINTERFACE; } Modified: trunk/reactos/dll/directx/wine/quartz/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] Tue Mar 1 18:25:44 2016 @@ -835,25 +835,3 @@ return SendFurther( iface, deliver_newsegment, &args, NULL ); } - -static const IPinVtbl PullPin_Vtbl = -{ - PullPin_QueryInterface, - BasePinImpl_AddRef, - PullPin_Release, - BaseInputPinImpl_Connect, - PullPin_ReceiveConnection, - PullPin_Disconnect, - BasePinImpl_ConnectedTo, - BasePinImpl_ConnectionMediaType, - BasePinImpl_QueryPinInfo, - BasePinImpl_QueryDirection, - BasePinImpl_QueryId, - PullPin_QueryAccept, - BasePinImpl_EnumMediaTypes, - BasePinImpl_QueryInternalConnections, - PullPin_EndOfStream, - PullPin_BeginFlush, - PullPin_EndFlush, - PullPin_NewSegment -}; Modified: trunk/reactos/dll/directx/wine/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/re… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] Tue Mar 1 18:25:44 2016 @@ -19,6 +19,8 @@ */ #include "quartz_private.h" + +#include <uuids.h> /* * Near the bottom of this file are the exported DllRegisterServer and @@ -798,6 +800,11 @@ "0, 10, FFFFFF00000080808080, 494433000000000000", NULL } }, + { &MEDIATYPE_Stream, + &MEDIASUBTYPE_MPEG2_PROGRAM, + { "0, 5, FFFFFFFFC0, 000001BA40", + NULL } + }, { &MEDIATYPE_Stream, &MEDIASUBTYPE_QTMovie, { "4, 4, , 6d646174", 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 18:25:44 2016 @@ -39,7 +39,7 @@ reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4 reactos/dll/win32/activeds # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70839: [INCLUDE/WINE] Update winternl.h. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 18:21:47 2016 New Revision: 70839 URL: http://svn.reactos.org/svn/reactos?rev=70839&view=rev Log: [INCLUDE/WINE] Update winternl.h. CORE-10912 Modified: trunk/reactos/include/reactos/wine/winternl.h Modified: trunk/reactos/include/reactos/wine/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winte… ============================================================================== --- trunk/reactos/include/reactos/wine/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winternl.h [iso-8859-1] Tue Mar 1 18:21:47 2016 @@ -843,26 +843,35 @@ SystemVerifierInformation = 51, SystemAddVerifier = 52, SystemSessionProcessesInformation = 53, - Unknown54, - Unknown55, - Unknown56, - Unknown57, - Unknown58, - Unknown59, - Unknown60, - Unknown61, - Unknown62, - Unknown63, - Unknown64, - Unknown65, - Unknown66, - Unknown67, - Unknown68, - Unknown69, - Unknown70, - Unknown71, - Unknown72, + SystemLoadGdiDriverInSystemSpace = 54, + SystemNumaProcessorMap = 55, + SystemPrefetcherInformation = 56, + SystemExtendedProcessInformation = 57, + SystemRecommendedSharedDataAlignment = 58, + SystemComPlusPackage = 59, + SystemNumaAvailableMemory = 60, + SystemProcessorPowerInformation = 61, + SystemEmulationBasicInformation = 62, + SystemEmulationProcessorInformation = 63, + SystemExtendedHandleInformation = 64, + SystemLostDelayedWriteInformation = 65, + SystemBigPoolInformation = 66, + SystemSessionPoolTagInformation = 67, + SystemSessionMappedViewInformation = 68, + SystemHotpatchInformation = 69, + SystemObjectSecurityMode = 70, + SystemWatchdogTimerHandler = 71, + SystemWatchdogTimerInformation = 72, SystemLogicalProcessorInformation = 73, + SystemWow64SharedInformation = 74, + SystemRegisterFirmwareTableInformationHandler = 75, + SystemFirmwareTableInformation = 76, + SystemModuleInformationEx = 77, + SystemVerifierTriageInformation = 78, + SystemSuperfetchInformation = 79, + SystemMemoryListInformation = 80, + SystemFileCacheInformationEx = 81, + SystemLogicalProcessorInformationEx = 107, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; @@ -1912,6 +1921,15 @@ ULONG_PTR SectionSize; UCHAR Data[ANYSIZE_ARRAY]; } LPC_MESSAGE, *PLPC_MESSAGE; + +typedef struct _RTL_USER_PROCESS_INFORMATION +{ + ULONG Length; + HANDLE Process; + HANDLE Thread; + CLIENT_ID ClientId; + SECTION_IMAGE_INFORMATION ImageInformation; +} RTL_USER_PROCESS_INFORMATION, *PRTL_USER_PROCESS_INFORMATION; typedef enum _SHUTDOWN_ACTION { ShutdownNoReboot, @@ -2204,11 +2222,11 @@ NTSYSAPI NTSTATUS WINAPI NtNotifyChangeDirectoryFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtNotifyChangeKey(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtNotifyChangeMultipleKeys(HANDLE,ULONG,OBJECT_ATTRIBUTES*,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtOpenDirectoryObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINAPI NtOpenDirectoryObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); -NTSYSAPI NTSTATUS WINAPI NtOpenEventPair(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINAPI NtOpenEventPair(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG); -NTSYSAPI NTSTATUS WINAPI NtOpenIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINAPI NtOpenIoCompletion(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); NTSYSAPI NTSTATUS WINAPI NtOpenKeyEx(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG); @@ -2222,7 +2240,7 @@ NTSYSAPI NTSTATUS WINAPI NtOpenProcessTokenEx(HANDLE,DWORD,DWORD,HANDLE *); NTSYSAPI NTSTATUS WINAPI NtOpenSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenSemaphore(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtOpenSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINAPI NtOpenSymbolicLinkObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenThread(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); NTSYSAPI NTSTATUS WINAPI NtOpenThreadToken(HANDLE,DWORD,BOOLEAN,HANDLE *); NTSYSAPI NTSTATUS WINAPI NtOpenThreadTokenEx(HANDLE,DWORD,BOOLEAN,DWORD,HANDLE *); @@ -2264,6 +2282,7 @@ NTSYSAPI NTSTATUS WINAPI NtQuerySymbolicLinkObject(HANDLE,PUNICODE_STRING,PULONG); NTSYSAPI NTSTATUS WINAPI NtQuerySystemEnvironmentValue(PUNICODE_STRING,PWCHAR,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQuerySystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS,void*,ULONG,void*,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI NtQuerySystemTime(PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtQueryTimer(HANDLE,TIMER_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryTimerResolution(PULONG,PULONG,PULONG); @@ -2414,6 +2433,7 @@ NTSYSAPI NTSTATUS WINAPI RtlCreateTimer(PHANDLE, HANDLE, RTL_WAITORTIMERCALLBACKFUNC, PVOID, DWORD, DWORD, ULONG); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR); +NTSYSAPI NTSTATUS WINAPI RtlCreateUserProcess(UNICODE_STRING*,ULONG,RTL_USER_PROCESS_PARAMETERS*,SECURITY_DESCRIPTOR*,SECURITY_DESCRIPTOR*,HANDLE,BOOLEAN,HANDLE,HANDLE,RTL_USER_PROCESS_INFORMATION*); NTSYSAPI NTSTATUS WINAPI RtlCreateUserThread(HANDLE,const SECURITY_DESCRIPTOR*,BOOLEAN,PVOID,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*); NTSYSAPI void WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR); NTSYSAPI PVOID WINAPI RtlDecodePointer(PVOID);

1 0

[akhaldi] 70838: [DXSDK] Add missing ksuuids.h inclusion.
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 18:15:48 2016 New Revision: 70838 URL: http://svn.reactos.org/svn/reactos?rev=70838&view=rev Log: [DXSDK] Add missing ksuuids.h inclusion. Modified: trunk/reactos/include/dxsdk/uuids.h Modified: trunk/reactos/include/dxsdk/uuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/uuids.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/uuids.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/uuids.h [iso-8859-1] Tue Mar 1 18:15:48 2016 @@ -278,4 +278,6 @@ OUR_GUID_ENTRY(CLSID_VideoMixingRenderer, 0xb87beb7b, 0x8d29, 0x423f, 0xae, 0x4d, 0x65, 0x82, 0xc1, 0x01, 0x75, 0xac) OUR_GUID_ENTRY(CLSID_VideoMixingRenderer9, 0x51b4abf3, 0x748f, 0x4e3b, 0xa2, 0x76, 0xc8, 0x28, 0x33, 0x0e, 0x92, 0x6a) +#include <ksuuids.h> + #undef OUR_GUID_ENTRY

1 0

[hbelusca] 70837: [USETUP] - bootsup.c/.h, usetup.c: Save the old MBR sector in the system partition (this makes easier to restore the old one). - fslist.c/.h, usetup.h: Fix header inclusion order....
by hbelusca＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: hbelusca Date: Tue Mar 1 15:00:56 2016 New Revision: 70837 URL: http://svn.reactos.org/svn/reactos?rev=70837&view=rev Log: [USETUP] - bootsup.c/.h, usetup.c: Save the old MBR sector in the system partition (this makes easier to restore the old one). - fslist.c/.h, usetup.h: Fix header inclusion order. - partlist.c/.h, usetup.c: On BIOS-PC architectures, the system partition can be formatted in any FS as long as it is the active partition (on the contrary, on architectures where such system partition is required, it is formatted in FAT). We currently do not have write support for all FSes out there (apart for FAT until now), so do a "clever" "trick" to work around this problem: on initialized disks, find the active partition and check its FS. If we support write access to this FS then we're OK, otherwise we change the (active) system partition for the one on which we are going to install ReactOS (which is, by construction, formatted with a FS on which we support write access). The MBR (resp. the VBR) of the disk (resp. of the system partition) are always saved into files, making easy for people to boot on them (using FreeLdr) or restoring them. CORE-10898 Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/bootsup.h trunk/reactos/base/setup/usetup/fslist.c trunk/reactos/base/setup/usetup/fslist.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -626,7 +626,6 @@ return STATUS_SUCCESS; } -static BOOLEAN IsThereAValidBootSector(PWSTR RootPath) { @@ -695,9 +694,8 @@ return (Instruction != 0x00000000); } -static NTSTATUS -SaveCurrentBootSector( +SaveBootSector( PWSTR RootPath, PWSTR DstPath, ULONG Length) @@ -1210,7 +1208,7 @@ NULL, &IoStatusBlock, OrigBootSector, - SECTORSIZE, + sizeof(PARTITION_SECTOR), &FileOffset, NULL); NtClose(FileHandle); @@ -1306,7 +1304,7 @@ NULL, &IoStatusBlock, NewBootSector, - SECTORSIZE, + sizeof(PARTITION_SECTOR), &FileOffset, NULL); NtClose(FileHandle); @@ -2447,10 +2445,10 @@ wcscat(DstPath, BootSectorFileName); DPRINT1("Save bootsector: %S ==> %S\n", SystemRootPath->Buffer, DstPath); - Status = SaveCurrentBootSector(SystemRootPath->Buffer, DstPath, SECTORSIZE); + Status = SaveBootSector(SystemRootPath->Buffer, DstPath, SECTORSIZE); if (!NT_SUCCESS(Status)) { - DPRINT1("SaveCurrentBootSector() failed (Status %lx)\n", Status); + DPRINT1("SaveBootSector() failed (Status %lx)\n", Status); return Status; } } @@ -2582,10 +2580,10 @@ wcscat(DstPath, L"\\bootsect.old"); DPRINT1("Save bootsector: %S ==> %S\n", SystemRootPath->Buffer, DstPath); - Status = SaveCurrentBootSector(SystemRootPath->Buffer, DstPath, sizeof(EXT2_BOOTSECTOR)); + Status = SaveBootSector(SystemRootPath->Buffer, DstPath, sizeof(EXT2_BOOTSECTOR)); if (!NT_SUCCESS(Status)) { - DPRINT1("SaveCurrentBootSector() failed (Status %lx)\n", Status); + DPRINT1("SaveBootSector() failed (Status %lx)\n", Status); return Status; } } Modified: trunk/reactos/base/setup/usetup/bootsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -26,6 +26,15 @@ #pragma once +BOOLEAN +IsThereAValidBootSector(PWSTR RootPath); + +NTSTATUS +SaveBootSector( + PWSTR RootPath, + PWSTR DstPath, + ULONG Length); + NTSTATUS InstallMbrBootCodeToDisk( PWSTR SrcPath, Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -91,7 +91,7 @@ PFILE_SYSTEM_ITEM GetFileSystem( IN PFILE_SYSTEM_LIST FileSystemList, - IN PPARTENTRY PartEntry) + IN struct _PARTENTRY* PartEntry) { PFILE_SYSTEM_ITEM CurrentFileSystem; LPWSTR FileSystemName = NULL; @@ -101,6 +101,8 @@ /* We have a file system, return it */ if (CurrentFileSystem != NULL && CurrentFileSystem->FileSystemName != NULL) return CurrentFileSystem; + + DPRINT1("File system not found, try to guess one...\n"); CurrentFileSystem = NULL; @@ -121,9 +123,9 @@ */ if ((PartEntry->PartitionType == PARTITION_FAT_12) || (PartEntry->PartitionType == PARTITION_FAT_16) || - (PartEntry->PartitionType == PARTITION_HUGE) || + (PartEntry->PartitionType == PARTITION_HUGE ) || (PartEntry->PartitionType == PARTITION_XINT13) || - (PartEntry->PartitionType == PARTITION_FAT32) || + (PartEntry->PartitionType == PARTITION_FAT32 ) || (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) { FileSystemName = L"FAT"; @@ -139,9 +141,9 @@ FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ } - // WARNING: We cannot write on this FS yet! + // HACK: WARNING: We cannot write on this FS yet! if (PartEntry->PartitionType == PARTITION_EXT2 || PartEntry->PartitionType == PARTITION_IFS) - DPRINT1("Recognized FileSystem %S that doesn't support write support yet!\n", FileSystemName); + DPRINT1("Recognized file system %S that doesn't support write support yet!\n", FileSystemName); DPRINT1("GetFileSystem -- PartitionType: 0x%02X ; FileSystemName (guessed): %S\n", PartEntry->PartitionType, FileSystemName); Modified: trunk/reactos/base/setup/usetup/fslist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.h… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -57,10 +57,11 @@ IN PFILE_SYSTEM_LIST List, IN LPWSTR FileSystemName); +struct _PARTENTRY; // Defined in partlist.h PFILE_SYSTEM_ITEM GetFileSystem( IN PFILE_SYSTEM_LIST FileSystemList, - IN PPARTENTRY PartEntry); + IN struct _PARTENTRY* PartEntry); PFILE_SYSTEM_LIST CreateFileSystemList( Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -1731,8 +1731,11 @@ return SELECT_PARTITION_PAGE; } - if (PartitionList->CurrentPartition->BootIndicator) + if (PartitionList->CurrentPartition->BootIndicator || + PartitionList->CurrentPartition == PartitionList->SystemPartition) + { return CONFIRM_DELETE_SYSTEM_PARTITION_PAGE; + } return DELETE_PARTITION_PAGE; } @@ -2553,8 +2556,21 @@ return QUIT_PAGE; } + /*** HACK! ***/ + if (FileSystemList == NULL) + { + FileSystemList = CreateFileSystemList(6, 26, PartitionList->CurrentPartition->New, L"FAT"); + if (FileSystemList == NULL) + { + /* FIXME: show an error dialog */ + return QUIT_PAGE; + } + + /* FIXME: Add file systems to list */ + } + /* Find or set the active system partition */ - CheckActiveSystemPartition(PartitionList); + CheckActiveSystemPartition(PartitionList, FileSystemList); if (PartitionList->SystemDisk == NULL || PartitionList->SystemPartition == NULL) @@ -4130,7 +4146,7 @@ PartitionList->SystemDisk->DiskNumber, PartitionList->SystemPartition->PartitionNumber); RtlCreateUnicodeString(&SystemRootPath, PathBuffer); - DPRINT("SystemRootPath: %wZ\n", &SystemRootPath); + DPRINT1("SystemRootPath: %wZ\n", &SystemRootPath); PartitionType = PartitionList->SystemPartition->PartitionType; @@ -4382,6 +4398,7 @@ NTSTATUS Status; WCHAR DestinationDevicePathBuffer[MAX_PATH]; WCHAR SourceMbrPathBuffer[MAX_PATH]; + WCHAR DstPath[MAX_PATH]; /* Step 1: Write the VBR */ PartitionType = PartitionList->SystemPartition->PartitionType; @@ -4404,8 +4421,23 @@ wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer); wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin"); - DPRINT("Install MBR bootcode: %S ==> %S\n", + DPRINT1("Install MBR bootcode: %S ==> %S\n", SourceMbrPathBuffer, DestinationDevicePathBuffer); + + if (IsThereAValidBootSector(DestinationDevicePathBuffer)) + { + /* Save current MBR */ + wcscpy(DstPath, SystemRootPath.Buffer); + wcscat(DstPath, L"\\mbr.old"); + + DPRINT1("Save MBR: %S ==> %S\n", DestinationDevicePathBuffer, DstPath); + Status = SaveBootSector(DestinationDevicePathBuffer, DstPath, sizeof(PARTITION_SECTOR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SaveBootSector() failed (Status %lx)\n", Status); + // Don't care if we succeeded or not saving the old MBR, just go ahead. + } + } Status = InstallMbrBootCodeToDisk(SourceMbrPathBuffer, DestinationDevicePathBuffer); Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -1430,6 +1430,8 @@ List->SystemDisk = NULL; List->SystemPartition = NULL; + List->OriginalSystemDisk = NULL; + List->OriginalSystemPartition = NULL; List->TempDisk = NULL; List->TempPartition = NULL; @@ -3111,28 +3113,25 @@ VOID CheckActiveSystemPartition( - PPARTLIST List) + IN PPARTLIST List, + IN PFILE_SYSTEM_LIST FileSystemList /* Needed for checking the FS of the candidate system partition */ + ) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; PLIST_ENTRY ListEntry; + PFILE_SYSTEM_ITEM FileSystem; + /* Check for empty disk list */ if (IsListEmpty(&List->DiskListHead)) { List->SystemDisk = NULL; List->SystemPartition = NULL; + List->OriginalSystemDisk = NULL; + List->OriginalSystemPartition = NULL; return; } - -#if 0 - if (List->SystemDisk != NULL && - List->SystemPartition != NULL) - { - /* We already have an active system partition */ - return; - } -#endif /* Choose the currently selected disk */ DiskEntry = List->CurrentDisk; @@ -3142,64 +3141,226 @@ { List->SystemDisk = NULL; List->SystemPartition = NULL; + List->OriginalSystemDisk = NULL; + List->OriginalSystemPartition = NULL; return; } - /* - * Check the first partition of the disk in case it is fresh new, - * and if so, use it as the system partition. - */ - + if (List->SystemDisk != NULL && List->SystemPartition != NULL) + { + /* We already have an active system partition */ + DPRINT1("Use the current system partition %lu in disk %lu, drive letter %c\n", + List->SystemPartition->PartitionNumber, + List->SystemDisk->DiskNumber, + (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + return; + } + + DPRINT1("We are here (1)!\n"); + + List->SystemDisk = NULL; + List->SystemPartition = NULL; + List->OriginalSystemDisk = NULL; + List->OriginalSystemPartition = NULL; + + /* Retrieve the first partition of the disk */ PartEntry = CONTAINING_RECORD(DiskEntry->PrimaryPartListHead.Flink, PARTENTRY, ListEntry); - - /* Set active system partition */ - if ((DiskEntry->NewDisk == TRUE) || - (PartEntry->BootIndicator == FALSE)) - { - PartEntry->BootIndicator = TRUE; - DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].BootIndicator = TRUE; - DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; - DiskEntry->Dirty = TRUE; - - /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ - List->SystemDisk = DiskEntry; - List->SystemPartition = PartEntry; - - return; - } - - /* Disk is not new, scan all partitions to find a bootable one */ - List->SystemDisk = NULL; - List->SystemPartition = NULL; - + List->SystemDisk = DiskEntry; + List->SystemPartition = PartEntry; + + // + // See: https://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlis… + // + + /* Check if the disk is new and if so, use its first partition as the active system partition */ + if (DiskEntry->NewDisk) + { + if (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED || PartEntry->BootIndicator == FALSE) + { + /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ + List->SystemDisk = DiskEntry; + List->SystemPartition = PartEntry; + + List->OriginalSystemDisk = List->SystemDisk; + List->OriginalSystemPartition = List->SystemPartition; + + DPRINT1("Use new first active system partition %lu in disk %lu, drive letter %c\n", + List->SystemPartition->PartitionNumber, + List->SystemDisk->DiskNumber, + (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + + goto SetSystemPartition; + } + + // FIXME: What to do?? + DPRINT1("NewDisk TRUE but first partition is used?\n"); + } + + DPRINT1("We are here (2)!\n"); + + /* + * The disk is not new, check if any partition is initialized; + * if not, the first one becomes the system partition. + */ ListEntry = DiskEntry->PrimaryPartListHead.Flink; while (ListEntry != &DiskEntry->PrimaryPartListHead) { + /* Retrieve the partition and go to the next one */ PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); - /* Check if it is partitioned */ - if (PartEntry->IsPartitioned) - { - if (PartEntry->PartitionType != PARTITION_ENTRY_UNUSED && - PartEntry->BootIndicator) + /* Check if the partition is partitioned and is used */ + if (PartEntry->PartitionType != PARTITION_ENTRY_UNUSED || PartEntry->BootIndicator != FALSE) + { + break; + } + + /* Go to the next one */ + ListEntry = ListEntry->Flink; + } + if (ListEntry == &DiskEntry->PrimaryPartListHead) + { + /* + * OK we haven't encountered any used and active partition, + * so use the first one as the system partition. + */ + + /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ + List->OriginalSystemDisk = List->SystemDisk; // DiskEntry + List->OriginalSystemPartition = List->SystemPartition; // First PartEntry + + DPRINT1("Use first active system partition %lu in disk %lu, drive letter %c\n", + List->SystemPartition->PartitionNumber, + List->SystemDisk->DiskNumber, + (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + + goto SetSystemPartition; + } + + List->SystemDisk = NULL; + List->SystemPartition = NULL; + List->OriginalSystemDisk = NULL; + List->OriginalSystemPartition = NULL; + + DPRINT1("We are here (3)!\n"); + + /* The disk is not new, scan all partitions to find the (active) system partition */ + ListEntry = DiskEntry->PrimaryPartListHead.Flink; + while (ListEntry != &DiskEntry->PrimaryPartListHead) + { + /* Retrieve the partition and go to the next one */ + PartEntry = CONTAINING_RECORD(ListEntry, + PARTENTRY, + ListEntry); + ListEntry = ListEntry->Flink; + + /* Check if the partition is partitioned and used */ + if (PartEntry->IsPartitioned && + PartEntry->PartitionType != PARTITION_ENTRY_UNUSED) + { + /* Check if the partition is active */ + if (PartEntry->BootIndicator) { /* Yes, we found it */ List->SystemDisk = DiskEntry; List->SystemPartition = PartEntry; - DPRINT("Found bootable partition disk %d, drive letter %c\n", - DiskEntry->DiskNumber, PartEntry->DriveLetter); + DPRINT1("Found active system partition %lu in disk %lu, drive letter %c\n", + PartEntry->PartitionNumber, + DiskEntry->DiskNumber, + (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter); break; } } - - /* Go to the next one */ - ListEntry = ListEntry->Flink; - } + } + + /* Check if we have found the system partition */ + if (List->SystemDisk == NULL || List->SystemPartition == NULL) + { + /* Nothing, use the alternative system partition */ + DPRINT1("No system partition found, use the alternative partition!\n"); + goto UseAlternativeSystemPartition; + } + + /* Save them */ + List->OriginalSystemDisk = List->SystemDisk; + List->OriginalSystemPartition = List->SystemPartition; + + /* + * ADDITIONAL CHECKS / BIG HACK: + * + * Retrieve its file system and check whether we have + * write support for it. If that is the case we are fine + * and we can use it directly. However if we don't have + * write support we will need to change the active system + * partition. + * + * NOTE that this is completely useless on architectures + * where a real system partition is required, as on these + * architectures the partition uses the FAT FS, for which + * we do have write support. + * NOTE also that for those architectures looking for a + * partition boot indicator is insufficient. + */ + FileSystem = GetFileSystem(FileSystemList, List->OriginalSystemPartition); + if (FileSystem == NULL) + { + DPRINT1("System partition %lu in disk %lu with no FS?!\n", + List->OriginalSystemPartition->PartitionNumber, + List->OriginalSystemDisk->DiskNumber); + goto FindAndUseAlternativeSystemPartition; + } + // HACK: WARNING: We cannot write on this FS yet! + // See fslist.c:GetFileSystem() + if (List->OriginalSystemPartition->PartitionType == PARTITION_EXT2 || + List->OriginalSystemPartition->PartitionType == PARTITION_IFS) + { + DPRINT1("Recognized file system %S that doesn't support write support yet!\n", + FileSystem->FileSystemName); + goto FindAndUseAlternativeSystemPartition; + } + + DPRINT1("Use existing active system partition %lu in disk %lu, drive letter %c\n", + List->SystemPartition->PartitionNumber, + List->SystemDisk->DiskNumber, + (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + + return; + +FindAndUseAlternativeSystemPartition: + /* + * We are here because we have not found any (active) candidate + * system partition that we know how to support. What we are going + * to do is to change the existing system partition and use the + * partition on which we install ReactOS as the new system partition, + * and then we will need to add in FreeLdr's entry a boot entry to boot + * from the original system partition. + */ + + /* Unset the old system partition */ + List->SystemPartition->BootIndicator = FALSE; + List->SystemDisk->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].BootIndicator = FALSE; + List->SystemDisk->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].RewritePartition = TRUE; + List->SystemDisk->Dirty = TRUE; + +UseAlternativeSystemPartition: + List->SystemDisk = List->CurrentDisk; + List->SystemPartition = List->CurrentPartition; + + DPRINT1("Use alternative active system partition %lu in disk %lu, drive letter %c\n", + List->SystemPartition->PartitionNumber, + List->SystemDisk->DiskNumber, + (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + +SetSystemPartition: + /* Set the new active system partition */ + List->SystemPartition->BootIndicator = TRUE; + List->SystemDisk->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].BootIndicator = TRUE; + List->SystemDisk->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].RewritePartition = TRUE; + List->SystemDisk->Dirty = TRUE; } Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -155,6 +155,15 @@ /* The system disk and partition where the boot manager resides */ PDISKENTRY SystemDisk; PPARTENTRY SystemPartition; + /* + * The original system disk and partition in case we are redefining them + * because we do not have write support on them. + * Please not that this is partly a HACK and MUST NEVER happen on + * architectures where real system partitions are mandatory (because then + * they are formatted in FAT FS and we support write operation on them). + */ + PDISKENTRY OriginalSystemDisk; + PPARTENTRY OriginalSystemPartition; PDISKENTRY TempDisk; PPARTENTRY TempPartition; @@ -258,7 +267,8 @@ VOID CheckActiveSystemPartition( - PPARTLIST List); + IN PPARTLIST List, + IN PFILE_SYSTEM_LIST FileSystemList); BOOLEAN WritePartitionsToDisk( Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -60,7 +60,6 @@ /* Internal Headers */ #include "interface/consup.h" -#include "partlist.h" #include "inffile.h" #include "inicache.h" #include "progress.h" @@ -70,6 +69,7 @@ #endif #include "registry.h" #include "fslist.h" +#include "partlist.h" #include "cabinet.h" #include "filesup.h" #include "genlist.h"

1 0

[akhaldi] 70836: [STRMBASE] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 13:41:22 2016 New Revision: 70836 URL: http://svn.reactos.org/svn/reactos?rev=70836&view=rev Log: [STRMBASE] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/tran… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] Tue Mar 1 13:41:22 2016 @@ -347,6 +347,8 @@ This->filter.state = State_Stopped; if (This->pFuncsTable->pfnStopStreaming) hr = This->pFuncsTable->pfnStopStreaming(This); + if (SUCCEEDED(hr)) + hr = BaseOutputPinImpl_Inactive(impl_BaseOutputPin_from_IPin(This->ppPins[1])); } LeaveCriticalSection(&This->csReceive); 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 13:41:22 2016 @@ -250,7 +250,7 @@ from Winehq CVS. If you are looking to update something in these files check Wine current sources first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.55 +reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.9.4 reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.55 reactos/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55

1 0

[akhaldi] 70835: [PSDK] Update d3dcommon.idl. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 13:38:40 2016 New Revision: 70835 URL: http://svn.reactos.org/svn/reactos?rev=70835&view=rev Log: [PSDK] Update d3dcommon.idl. CORE-10912 Modified: trunk/reactos/include/psdk/d3dcommon.idl Modified: trunk/reactos/include/psdk/d3dcommon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dcommon.idl… ============================================================================== --- trunk/reactos/include/psdk/d3dcommon.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3dcommon.idl [iso-8859-1] Tue Mar 1 13:38:40 2016 @@ -21,8 +21,8 @@ typedef struct _D3D_SHADER_MACRO { - LPCSTR Name; - LPCSTR Definition; + const char *Name; + const char *Definition; } D3D_SHADER_MACRO; typedef struct _D3D_SHADER_MACRO* LPD3D_SHADER_MACRO; @@ -86,7 +86,24 @@ D3D_FEATURE_LEVEL_10_0 = 0xa000, D3D_FEATURE_LEVEL_10_1 = 0xa100, D3D_FEATURE_LEVEL_11_0 = 0xb000, + D3D_FEATURE_LEVEL_11_1 = 0xb100 } D3D_FEATURE_LEVEL; + +cpp_quote("#define D3D_FL9_1_REQ_TEXTURE1D_U_DIMENSION 2048") +cpp_quote("#define D3D_FL9_3_REQ_TEXTURE1D_U_DIMENSION 4096") +cpp_quote("#define D3D_FL9_1_REQ_TEXTURE2D_U_OR_V_DIMENSION 2048") +cpp_quote("#define D3D_FL9_3_REQ_TEXTURE2D_U_OR_V_DIMENSION 4096") +cpp_quote("#define D3D_FL9_1_REQ_TEXTURECUBE_DIMENSION 512") +cpp_quote("#define D3D_FL9_3_REQ_TEXTURECUBE_DIMENSION 4096") +cpp_quote("#define D3D_FL9_1_REQ_TEXTURE3D_U_V_OR_W_DIMENSION 256") +cpp_quote("#define D3D_FL9_1_DEFAULT_MAX_ANISOTROPY 2") +cpp_quote("#define D3D_FL9_1_IA_PRIMITIVE_MAX_COUNT 65535") +cpp_quote("#define D3D_FL9_2_IA_PRIMITIVE_MAX_COUNT 1048575") +cpp_quote("#define D3D_FL9_1_SIMULTANEOUS_RENDER_TARGET_COUNT 1") +cpp_quote("#define D3D_FL9_3_SIMULTANEOUS_RENDER_TARGET_COUNT 4") +cpp_quote("#define D3D_FL9_1_MAX_TEXTURE_REPEAT 128") +cpp_quote("#define D3D_FL9_2_MAX_TEXTURE_REPEAT 2048") +cpp_quote("#define D3D_FL9_3_MAX_TEXTURE_REPEAT 8192") typedef enum _D3D_SHADER_VARIABLE_CLASS { @@ -108,6 +125,19 @@ D3D11_SVC_INTERFACE_POINTER, D3D_SVC_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_CLASS; + +typedef enum _D3D_SHADER_VARIABLE_FLAGS +{ + D3D_SVF_USERPACKED = 0x01, + D3D_SVF_USED = 0x02, + D3D_SVF_INTERFACE_POINTER = 0x04, + D3D_SVF_INTERFACE_PARAMETER = 0x08, + D3D10_SVF_USERPACKED = D3D_SVF_USERPACKED, + D3D10_SVF_USED = D3D_SVF_USED, + D3D11_SVF_INTERFACE_POINTER = D3D_SVF_INTERFACE_POINTER, + D3D11_SVF_INTERFACE_PARAMETER = D3D_SVF_INTERFACE_PARAMETER, + D3D_SVF_FORCE_DWORD = 0x7fffffff +} D3D_SHADER_VARIABLE_FLAGS; typedef enum _D3D_SHADER_VARIABLE_TYPE { @@ -218,6 +248,22 @@ D3D_SVT_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_TYPE; +typedef enum _D3D_SHADER_INPUT_FLAGS +{ + D3D_SIF_USERPACKED = 0x01, + D3D_SIF_COMPARISON_SAMPLER = 0x02, + D3D_SIF_TEXTURE_COMPONENT_0 = 0x04, + D3D_SIF_TEXTURE_COMPONENT_1 = 0x08, + D3D_SIF_TEXTURE_COMPONENTS = 0x0C, + D3D_SIF_UNUSED = 0x10, + D3D10_SIF_USERPACKED = D3D_SIF_USERPACKED, + D3D10_SIF_COMPARISON_SAMPLER = D3D_SIF_COMPARISON_SAMPLER, + D3D10_SIF_TEXTURE_COMPONENT_0 = D3D_SIF_TEXTURE_COMPONENT_0, + D3D10_SIF_TEXTURE_COMPONENT_1 = D3D_SIF_TEXTURE_COMPONENT_1, + D3D10_SIF_TEXTURE_COMPONENTS = D3D_SIF_TEXTURE_COMPONENTS, + D3D_SIF_FORCE_DWORD = 0x7fffffff +} D3D_SHADER_INPUT_FLAGS; + typedef enum D3D_PRIMITIVE { D3D_PRIMITIVE_UNDEFINED, @@ -618,3 +664,12 @@ D3D11_SIT_UAV_CONSUME_STRUCTURED, D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER, } D3D_SHADER_INPUT_TYPE; + +typedef enum _D3D_SHADER_CBUFFER_FLAGS +{ + D3D_CBF_USERPACKED = 0x01, + D3D10_CBF_USERPACKED = D3D_CBF_USERPACKED, + D3D_CBF_FORCE_DWORD = 0x7fffffff +} D3D_SHADER_CBUFFER_FLAGS; + +cpp_quote("DEFINE_GUID(WKPDID_D3DDebugObjectName,0x429b8c22,0x9188,0x4b0c,0x87,0x42,0xac,0xb0,0xbf,0x85,0xc2,0x00);")

1 0

[akhaldi] 70834: [DXDIAGN_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 13:18:35 2016 New Revision: 70834 URL: http://svn.reactos.org/svn/reactos?rev=70834&view=rev Log: [DXDIAGN_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/dxdiagn/container.c Modified: trunk/rostests/winetests/dxdiagn/container.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dxdiagn/contain… ============================================================================== --- trunk/rostests/winetests/dxdiagn/container.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dxdiagn/container.c [iso-8859-1] Tue Mar 1 13:18:35 2016 @@ -959,6 +959,7 @@ static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0}; static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; + static const WCHAR iAdapter[] = {'i','A','d','a','p','t','e','r',0}; static const struct property_test property_tests[] = { @@ -983,6 +984,7 @@ {b3DAccelerationExists, VT_BOOL}, {b3DAccelerationEnabled, VT_BOOL}, {bDDAccelerationEnabled, VT_BOOL}, + {iAdapter, VT_UI4}, }; IDxDiagContainer *display_cont = NULL;

1 0

[akhaldi] 70833: [DXDIAGN] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 13:17:52 2016 New Revision: 70833 URL: http://svn.reactos.org/svn/reactos?rev=70833&view=rev Log: [DXDIAGN] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/directx/wine/dxdiagn/provider.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dxdiagn/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/p… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/provider.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/provider.c [iso-8859-1] Tue Mar 1 13:17:52 2016 @@ -48,6 +48,8 @@ static const WCHAR dwBpp[] = {'d','w','B','p','p',0}; static const WCHAR szDisplayMemoryLocalized[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','L','o','c','a','l','i','z','e','d',0}; static const WCHAR szDisplayMemoryEnglish[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; +static const WCHAR szDisplayModeLocalized[] = {'s','z','D','i','s','p','l','a','y','M','o','d','e','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR szDisplayModeEnglish[] = {'s','z','D','i','s','p','l','a','y','M','o','d','e','E','n','g','l','i','s','h',0}; static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0}; static const WCHAR szDriverVersion[] = {'s','z','D','r','i','v','e','r','V','e','r','s','i','o','n',0}; static const WCHAR szSubSysId[] = {'s','z','S','u','b','S','y','s','I','d',0}; @@ -57,6 +59,30 @@ static const WCHAR szChipType[] = {'s','z','C','h','i','p','T','y','p','e',0}; static const WCHAR szDACType[] = {'s','z','D','A','C','T','y','p','e',0}; static const WCHAR szRevision[] = {'s','z','R','e','v','i','s','i','o','n',0}; +static const WCHAR szMonitorName[] = {'s','z','M','o','n','i','t','o','r','N','a','m','e',0}; +static const WCHAR szMonitorMaxRes[] = {'s','z','M','o','n','i','t','o','r','M','a','x','R','e','s',0}; +static const WCHAR szDriverAttributes[] = {'s','z','D','r','i','v','e','r','A','t','t','r','i','b','u','t','e','s',0}; +static const WCHAR szDriverLanguageEnglish[] = {'s','z','D','r','i','v','e','r','L','a','n','g','u','a','g','e','E','n','g','l','i','s','h',0}; +static const WCHAR szDriverLanguageLocalized[] = {'s','z','D','r','i','v','e','r','L','a','n','g','u','a','g','e','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR szDriverDateEnglish[] = {'s','z','D','r','i','v','e','r','D','a','t','e','E','n','g','l','i','s','h',0}; +static const WCHAR szDriverDateLocalized[] = {'s','z','D','r','i','v','e','r','D','a','t','e','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR lDriverSize[] = {'l','D','r','i','v','e','r','S','i','z','e',0}; +static const WCHAR szMiniVdd[] = {'s','z','M','i','n','i','V','d','d',0}; +static const WCHAR szMiniVddDateLocalized[] = {'s','z','M','i','n','i','V','d','d','D','a','t','e','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR szMiniVddDateEnglish[] = {'s','z','M','i','n','i','V','d','d','D','a','t','e','E','n','g','l','i','s','h',0}; +static const WCHAR lMiniVddSize[] = {'l','M','i','n','i','V','d','d','S','i','z','e',0}; +static const WCHAR szVdd[] = {'s','z','V','d','d',0}; +static const WCHAR bCanRenderWindow[] = {'b','C','a','n','R','e','n','d','e','r','W','i','n','d','o','w',0}; +static const WCHAR bDriverBeta[] = {'b','D','r','i','v','e','r','B','e','t','a',0}; +static const WCHAR bDriverDebug[] = {'b','D','r','i','v','e','r','D','e','b','u','g',0}; +static const WCHAR bDriverSigned[] = {'b','D','r','i','v','e','r','S','i','g','n','e','d',0}; +static const WCHAR bDriverSignedValid[] = {'b','D','r','i','v','e','r','S','i','g','n','e','d','V','a','l','i','d',0}; +static const WCHAR szDriverSignDate[] = {'s','z','D','r','i','v','e','r','S','i','g','n','D','a','t','e',0}; +static const WCHAR dwDDIVersion[] = {'d','w','D','D','I','V','e','r','s','i','o','n',0}; +static const WCHAR szDDIVersionEnglish[] = {'s','z','D','D','I','V','e','r','s','i','o','n','E','n','g','l','i','s','h',0}; +static const WCHAR szDDIVersionLocalized[] = {'s','z','D','D','I','V','e','r','s','i','o','n','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR iAdapter[] = {'i','A','d','a','p','t','e','r',0}; +static const WCHAR dwWHQLLevel[] = {'d','w','W','H','Q','L','L','e','v','e','l',0}; struct IDxDiagProviderImpl { @@ -314,7 +340,7 @@ return S_OK; } -static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, BOOL data) +static inline HRESULT add_i4_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, LONG data) { IDxDiagContainerImpl_Property *prop; @@ -322,8 +348,8 @@ if (!prop) return E_OUTOFMEMORY; - V_VT(&prop->vProp) = VT_BOOL; - V_BOOL(&prop->vProp) = data ? VARIANT_TRUE : VARIANT_FALSE; + V_VT(&prop->vProp) = VT_I4; + V_I4(&prop->vProp) = data; list_add_tail(&node->properties, &prop->entry); ++node->nProperties; @@ -331,7 +357,7 @@ return S_OK; } -static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, ULONGLONG data ) +static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, BOOL data) { IDxDiagContainerImpl_Property *prop; @@ -339,10 +365,33 @@ if (!prop) return E_OUTOFMEMORY; + V_VT(&prop->vProp) = VT_BOOL; + V_BOOL(&prop->vProp) = data ? VARIANT_TRUE : VARIANT_FALSE; + + list_add_tail(&node->properties, &prop->entry); + ++node->nProperties; + + return S_OK; +} + +static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, ULONGLONG data ) +{ + IDxDiagContainerImpl_Property *prop; + HRESULT hr; + + prop = allocate_property_information(propName); + if (!prop) + return E_OUTOFMEMORY; + V_VT(&prop->vProp) = VT_UI8; V_UI8(&prop->vProp) = data; - VariantChangeType(&prop->vProp, &prop->vProp, 0, VT_BSTR); + hr = VariantChangeType(&prop->vProp, &prop->vProp, 0, VT_BSTR); + if (FAILED(hr)) + { + free_property_information(prop); + return hr; + } list_add_tail(&node->properties, &prop->entry); ++node->nProperties; @@ -907,6 +956,15 @@ static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const WCHAR bNoHardware[] = {'b','N','o','H','a','r','d','w','a','r','e',0}; + static const WCHAR mode_fmtW[] = {'%','d',' ','x',' ','%','d',' ','(','%','d',' ','b','i','t',')',' ','(','%','d','H','z',')',0}; + static const WCHAR gernericPNPMonitorW[] = {'G','e','n','e','r','i','c',' ','P','n','P',' ','M','o','n','i','t','o','r',0}; + static const WCHAR failedToGetParameterW[] = {'F','a','i','l','e','d',' ','t','o',' ','g','e','t',' ','p','a','r','a','m','e','t','e','r',0}; + static const WCHAR driverAttributesW[] = {'F','i','n','a','l',' ','R','e','t','a','i','l',0}; + static const WCHAR englishW[] = {'E','n','g','l','i','s','h',0}; + static const WCHAR driverDateEnglishW[] = {'1','/','1','/','2','0','1','6',' ','1','0',':','0','0',':','0','0',0}; + static const WCHAR driverDateLocalW[] = {'1','/','1','/','2','0','1','6',' ','1','0',':','0','0',':','0','0',' ','A','M',0}; + static const WCHAR naW[] = {'n','/','a',0}; + static const WCHAR ddi11W[] = {'1','1',0}; D3DADAPTER_IDENTIFIER9 adapter_info; D3DDISPLAYMODE adapter_mode; @@ -1003,6 +1061,17 @@ hr = add_ui4_property(display_adapter, dwBpp, depth_for_pixelformat(adapter_mode.Format)); if (FAILED(hr)) goto cleanup; + + snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), mode_fmtW, adapter_mode.Width, adapter_mode.Height, + depth_for_pixelformat(adapter_mode.Format), adapter_mode.RefreshRate); + + hr = add_bstr_property(display_adapter, szDisplayModeLocalized, buffer); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDisplayModeEnglish, buffer); + if (FAILED(hr)) + goto cleanup; } hr = add_bstr_property(display_adapter, szKeyDeviceKey, szEmpty); @@ -1054,6 +1123,102 @@ goto cleanup; hr = add_bool_property(display_adapter, bNoHardware, FALSE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bCanRenderWindow, TRUE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMonitorName, gernericPNPMonitorW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMonitorMaxRes, failedToGetParameterW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverAttributes, driverAttributesW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverLanguageEnglish, englishW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverLanguageLocalized, englishW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverDateEnglish, driverDateEnglishW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverDateLocalized, driverDateLocalW); + if (FAILED(hr)) + goto cleanup; + + hr = add_i4_property(display_adapter, lDriverSize, 10 * 1024 * 1024); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMiniVdd, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMiniVddDateLocalized, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMiniVddDateEnglish, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_i4_property(display_adapter, lMiniVddSize, 0); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szVdd, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDriverBeta, FALSE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDriverDebug, FALSE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDriverSigned, TRUE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDriverSignedValid, TRUE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverSignDate, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(display_adapter, dwDDIVersion, 11); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDDIVersionEnglish, ddi11W); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDDIVersionLocalized, ddi11W); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(display_adapter, iAdapter, index); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(display_adapter, dwWHQLLevel, 0); if (FAILED(hr)) goto cleanup; } 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 13:17:52 2016 @@ -36,7 +36,7 @@ reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 -reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.55

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs