Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[akhaldi] 68514: [INETCPL] Let the default homepage be our website.
by akhaldi＠svn.reactos.org 21 Jul '15

21 Jul '15

Author: akhaldi Date: Tue Jul 21 23:16:24 2015 New Revision: 68514 URL: http://svn.reactos.org/svn/reactos?rev=68514&view=rev Log: [INETCPL] Let the default homepage be our website. Modified: trunk/reactos/dll/cpl/inetcpl/general.c Modified: trunk/reactos/dll/cpl/inetcpl/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/general.c?… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/general.c [iso-8859-1] Tue Jul 21 23:16:24 2015 @@ -25,7 +25,11 @@ #include <shlobj.h> static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; +#ifdef __REACTOS__ +static const WCHAR default_home[] = {'h','t','t','p',':','/','/','w','w','w','.','r','e','a','c','t','o','s','.','o','r','g',0}; +#else static const WCHAR default_home[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; +#endif static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\',

1 0

[akhaldi] 68513: [INETCPL] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 21 Jul '15

21 Jul '15

Author: akhaldi Date: Tue Jul 21 23:07:30 2015 New Revision: 68513 URL: http://svn.reactos.org/svn/reactos?rev=68513&view=rev Log: [INETCPL] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/cpl/inetcpl/general.c trunk/reactos/dll/cpl/inetcpl/inetcpl.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/cpl/inetcpl/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/general.c?… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/general.c [iso-8859-1] Tue Jul 21 23:07:30 2015 @@ -25,6 +25,7 @@ #include <shlobj.h> static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; +static const WCHAR default_home[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -33,7 +34,6 @@ /* list of unimplemented buttons */ static DWORD disabled_general_buttons[] = {IDC_HOME_CURRENT, - IDC_HOME_DEFAULT, IDC_HISTORY_SETTINGS, 0}; static DWORD disabled_delhist_buttons[] = {IDC_DELETE_FORM_DATA, @@ -177,6 +177,10 @@ SetDlgItemTextW(hwnd, IDC_HOME_EDIT, about_blank); break; + case MAKEWPARAM(IDC_HOME_DEFAULT, BN_CLICKED): + SetDlgItemTextW(hwnd, IDC_HOME_EDIT, default_home); + break; + case MAKEWPARAM(IDC_HISTORY_DELETE, BN_CLICKED): DialogBoxW(hcpl, MAKEINTRESOURCEW(IDD_DELETE_HISTORY), hwnd, delhist_dlgproc); Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.c?… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.c [iso-8859-1] Tue Jul 21 23:07:30 2015 @@ -34,8 +34,10 @@ switch (reason) { - /* case DLL_WINE_PREATTACH: - return FALSE; prefer native version */ +#ifndef __REACTOS__ + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ +#endif case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); 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 Jul 21 23:07:30 2015 @@ -225,7 +225,7 @@ reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.7.37 reactos/dll/win32/xmllite # Synced to WineStaging-1.7.37 -reactos/dll/cpl/inetcpl # Synced to WineStaging-1.7.37 +reactos/dll/cpl/inetcpl # Synced to WineStaging-1.7.47 ReactOS shares the following programs with Winehq.

1 0

[akhaldi] 68512: [DXSDK] Add missing D3DXDisassembleEffect declaration.
by akhaldi＠svn.reactos.org 21 Jul '15

21 Jul '15

Author: akhaldi Date: Tue Jul 21 23:06:36 2015 New Revision: 68512 URL: http://svn.reactos.org/svn/reactos?rev=68512&view=rev Log: [DXSDK] Add missing D3DXDisassembleEffect declaration. Modified: trunk/reactos/include/dxsdk/d3dx9effect.h Modified: trunk/reactos/include/dxsdk/d3dx9effect.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9effect.… ============================================================================== --- trunk/reactos/include/dxsdk/d3dx9effect.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/d3dx9effect.h [iso-8859-1] Tue Jul 21 23:06:36 2015 @@ -425,6 +425,8 @@ ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors); #define D3DXCreateEffectCompilerFromResource WINELIB_NAME_AW(D3DXCreateEffectCompilerFromResource) +HRESULT WINAPI D3DXDisassembleEffect(ID3DXEffect *effect, BOOL enable_color_code, ID3DXBuffer **disassembly); + #ifdef __cplusplus } #endif

1 0

[cfinck] 68511: [WINPRINT] Add traces
by cfinck＠svn.reactos.org 21 Jul '15

21 Jul '15

Author: cfinck Date: Tue Jul 21 13:19:14 2015 New Revision: 68511 URL: http://svn.reactos.org/svn/reactos?rev=68511&view=rev Log: [WINPRINT] Add traces Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] Tue Jul 21 13:19:14 2015 @@ -32,6 +32,8 @@ DWORD dwErrorCode; PWINPRINT_HANDLE pHandle; + TRACE("ClosePrintProcessor(%p)\n", hPrintProcessor); + // Sanity checks if (!hPrintProcessor) { @@ -66,6 +68,8 @@ BOOL WINAPI ControlPrintProcessor(HANDLE hPrintProcessor, DWORD Command) { + TRACE("ControlPrintProcessor(%p, %lu)\n", hPrintProcessor, Command); + UNIMPLEMENTED; return FALSE; } @@ -104,7 +108,7 @@ * A more specific error code can be obtained through GetLastError. */ BOOL WINAPI -EnumPrintProcessorDatatypesW(LPWSTR pName, LPWSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +EnumPrintProcessorDatatypesW(PWSTR pName, PWSTR pPrintProcessorName, DWORD Level, PBYTE pDatatypes, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { DWORD cbDatatype; DWORD dwDatatypeCount = 0; @@ -113,6 +117,8 @@ PCWSTR* pCurrentDatatype; PDWORD pCurrentOffset = dwOffsets; + TRACE("EnumPrintProcessorDatatypesW(%S, %S, %lu, %p, %lu, %p, %p)\n", pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); + // Sanity checks if (Level != 1 || !pcbNeeded || !pcReturned) { @@ -166,6 +172,8 @@ DWORD WINAPI GetPrintProcessorCapabilities(PWSTR pValueName, DWORD dwAttributes, PBYTE pData, DWORD nSize, PDWORD pcbNeeded) { + TRACE("GetPrintProcessorCapabilities(%S, %lu, %p, %lu, %p)\n", pValueName, dwAttributes, pData, nSize, pcbNeeded); + UNIMPLEMENTED; return 0; } @@ -191,6 +199,8 @@ DWORD dwErrorCode; HANDLE hReturnValue = NULL; PWINPRINT_HANDLE pHandle = NULL; + + TRACE("OpenPrintProcessor(%S, %p)\n", pPrinterName, pPrintProcessorOpenData); // Sanity checks // This time a datatype needs to be given. We can't fall back to a default here. @@ -255,6 +265,8 @@ DWORD dwErrorCode; PWINPRINT_HANDLE pHandle; + TRACE("PrintDocumentOnPrintProcessor(%p, %S)\n", hPrintProcessor, pDocumentName); + // Sanity checks if (!hPrintProcessor) {

1 0

[cfinck] 68510: [LOCALMON, LOCALSPL] Fix a nasty stack corruption due to a *ppwsz[cch] vs. (*ppwsz)[cch] case. But actually, we don't even need this line for null-terminating the string at all, bec...
by cfinck＠svn.reactos.org 21 Jul '15

21 Jul '15

Author: cfinck Date: Tue Jul 21 10:46:29 2015 New Revision: 68510 URL: http://svn.reactos.org/svn/reactos?rev=68510&view=rev Log: [LOCALMON, LOCALSPL] Fix a nasty stack corruption due to a *ppwsz[cch] vs. (*ppwsz)[cch] case. But actually, we don't even need this line for null-terminating the string at all, because we operate on zero-initialized buffers. Remove it in another location as well. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c [iso-8859-1] Tue Jul 21 10:46:29 2015 @@ -141,25 +141,26 @@ DWORD GetPortNameWithoutColon(PCWSTR pwszPortName, PWSTR* ppwszPortNameWithoutColon) { - DWORD cchPortName; + DWORD cchPortNameWithoutColon; // Compute the string length of pwszPortNameWithoutColon. - cchPortName = wcslen(pwszPortName) - 1; + cchPortNameWithoutColon = wcslen(pwszPortName) - 1; // Check if pwszPortName really has a colon as the last character. - if (pwszPortName[cchPortName] != L':') + if (pwszPortName[cchPortNameWithoutColon] != L':') return ERROR_INVALID_PARAMETER; - // It has, so allocate a buffer and copy the port name without colon into it. - *ppwszPortNameWithoutColon = DllAllocSplMem((cchPortName + 1) * sizeof(WCHAR)); + // Allocate the output buffer. + *ppwszPortNameWithoutColon = DllAllocSplMem((cchPortNameWithoutColon + 1) * sizeof(WCHAR)); if (!*ppwszPortNameWithoutColon) { ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); return ERROR_NOT_ENOUGH_MEMORY; } - CopyMemory(*ppwszPortNameWithoutColon, pwszPortName, cchPortName * sizeof(WCHAR)); - *ppwszPortNameWithoutColon[cchPortName] = 0; + // Copy the port name without colon into the buffer. + // The buffer is already zero-initialized, so no additional null-termination is necessary. + CopyMemory(*ppwszPortNameWithoutColon, pwszPortName, cchPortNameWithoutColon * sizeof(WCHAR)); return ERROR_SUCCESS; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Tue Jul 21 10:46:29 2015 @@ -579,9 +579,9 @@ if (cchFirstParameter) { // Yes, extract it. + // No null-termination is necessary here, because DllAllocSplMem returns a zero-initialized buffer. pwszFirstParameter = DllAllocSplMem((cchFirstParameter + 1) * sizeof(WCHAR)); CopyMemory(pwszFirstParameter, lpPrinterName, cchFirstParameter * sizeof(WCHAR)); - pwszFirstParameter[cchFirstParameter] = 0; } // Do we have a second parameter?

1 0

[aandrejevic] 68509: Forgot to commit this file.
by aandrejevic＠svn.reactos.org 21 Jul '15

21 Jul '15

Author: aandrejevic Date: Tue Jul 21 00:49:11 2015 New Revision: 68509 URL: http://svn.reactos.org/svn/reactos?rev=68509&view=rev Log: Forgot to commit this file. Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/CMak… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] Tue Jul 21 00:49:11 2015 @@ -8,6 +8,7 @@ list(APPEND SOURCE bios/bios32/bios32.c bios/bios32/kbdbios32.c + bios/bios32/vbe.c bios/bios32/vidbios32.c bios/bios32/moubios32.c bios/bios.c

1 0

[aandrejevic] 68508: [NTVDM] Start implementing VESA BIOS Extensions (VBE) for our emulated Cirrus Logic CL-GD5434.
by aandrejevic＠svn.reactos.org 21 Jul '15

21 Jul '15

Author: aandrejevic Date: Tue Jul 21 00:46:12 2015 New Revision: 68508 URL: http://svn.reactos.org/svn/reactos?rev=68508&view=rev Log: [NTVDM] Start implementing VESA BIOS Extensions (VBE) for our emulated Cirrus Logic CL-GD5434. Added: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c (with props) trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h (with props) Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h Added: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] Tue Jul 21 00:46:12 2015 @@ -0,0 +1,189 @@ +/* + * COPYRIGHT: GPLv2+ - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: vbe.c + * PURPOSE: VDM VESA BIOS Extensions (for the Cirrus CL-GD5434 emulated card) + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "ntvdm.h" +#include "emulator.h" +#include "cpu/cpu.h" + +#include "vbe.h" + +#include "io.h" + +/* PRIVATE VARIABLES **********************************************************/ + +static const VBE_MODE Modes[VBE_MODE_COUNT] = { + { 0x00, 0x00, NULL /* TODO */, NULL /* VGA */ }, + { 0x01, 0x01, NULL /* TODO */, NULL /* VGA */ }, + { 0x02, 0x02, NULL /* TODO */, NULL /* VGA */ }, + { 0x03, 0x03, NULL /* TODO */, NULL /* VGA */ }, + { 0x04, 0x04, NULL /* TODO */, NULL /* VGA */ }, + { 0x05, 0x05, NULL /* TODO */, NULL /* VGA */ }, + { 0x06, 0x06, NULL /* TODO */, NULL /* VGA */ }, + { 0x07, 0x07, NULL /* TODO */, NULL /* VGA */ }, + { 0x0D, 0x0D, NULL /* TODO */, NULL /* VGA */ }, + { 0x0E, 0x0E, NULL /* TODO */, NULL /* VGA */ }, + { 0x0F, 0x0F, NULL /* TODO */, NULL /* VGA */ }, + { 0x10, 0x10, NULL /* TODO */, NULL /* VGA */ }, + { 0x11, 0x11, NULL /* TODO */, NULL /* VGA */ }, + { 0x12, 0x12, NULL /* TODO */, NULL /* VGA */ }, + { 0x13, 0x13, NULL /* TODO */, NULL /* VGA */ }, + { 0x14, 0xFFFF, NULL /* TODO */, NULL /* TODO */ }, + { 0x54, 0x10A, NULL /* TODO */, NULL /* TODO */ }, + { 0x55, 0x109, NULL /* TODO */, NULL /* TODO */ }, + { 0x58, 0x102, NULL /* TODO */, NULL /* TODO */ }, + { 0x5C, 0x103, NULL /* TODO */, NULL /* TODO */ }, + { 0x5D, 0x104, NULL /* TODO */, NULL /* TODO */ }, + { 0x5E, 0x100, NULL /* TODO */, NULL /* TODO */ }, + { 0x5F, 0x101, NULL /* TODO */, NULL /* TODO */ }, + { 0x60, 0x105, NULL /* TODO */, NULL /* TODO */ }, + { 0x64, 0x111, NULL /* TODO */, NULL /* TODO */ }, + { 0x65, 0x114, NULL /* TODO */, NULL /* TODO */ }, + { 0x66, 0x110, NULL /* TODO */, NULL /* TODO */ }, + { 0x67, 0x113, NULL /* TODO */, NULL /* TODO */ }, + { 0x68, 0x116, NULL /* TODO */, NULL /* TODO */ }, + { 0x69, 0x119, NULL /* TODO */, NULL /* TODO */ }, + { 0x6C, 0x106, NULL /* TODO */, NULL /* TODO */ }, + { 0x6D, 0x107, NULL /* TODO */, NULL /* TODO */ }, + { 0x71, 0x112, NULL /* TODO */, NULL /* TODO */ }, + { 0x72, 0xFFFF, NULL /* TODO */, NULL /* TODO */ }, + { 0x73, 0xFFFF, NULL /* TODO */, NULL /* TODO */ }, + { 0x74, 0x117, NULL /* TODO */, NULL /* TODO */ }, + { 0x75, 0x11A, NULL /* TODO */, NULL /* TODO */ }, + { 0x76, 0xFFFF, NULL /* TODO */, NULL /* TODO */ }, + { 0x78, 0x115, NULL /* TODO */, NULL /* TODO */ }, + { 0x79, 0x118, NULL /* TODO */, NULL /* TODO */ }, +}; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID WINAPI VbeService(LPWORD Stack) +{ + INT i; + + switch (getAL()) + { + /* Get VBE Information */ + case 0x00: + { + VBE_INFORMATION Info; + PWORD Data = (PWORD)&Info; + + /* Function recognized */ + setAL(0x4F); + + ZeroMemory(&Info, sizeof(VBE_INFORMATION)); + Info.Signature = 'ASEV'; + Info.Version = 0x0102; + Info.OemName = OEM_NAME_PTR; + Info.Capabilities = 0; + Info.ModeList = MAKELONG(LOWORD(getDI() + + FIELD_OFFSET(VBE_INFORMATION, ModeListBuffer)), + getES()); + Info.VideoMemory = HIWORD(SVGA_BANK_SIZE * VGA_NUM_BANKS); + + /* Fill the mode list */ + for (i = 0; i < VBE_MODE_COUNT; i++) + { + /* Some modes don't have VESA numbers */ + if (Modes[i].VesaNumber != 0xFFFF) + { + Info.ModeListBuffer[i] = Modes[i].VesaNumber; + } + } + + Info.ModeListBuffer[VBE_MODE_COUNT] = 0xFFFF; + + /* Copy the data to the caller */ + for (i = 0; i < sizeof(VBE_INFORMATION) / sizeof(WORD); i++) + { + *(PWORD)SEG_OFF_TO_PTR(getES(), LOWORD(getDI() + i * 2)) = Data[i]; + } + + setAH(0); + break; + } + + /* Get VBE Mode Information */ + case 0x01: + { + WORD ModeNumber = getCX() & 0x1FF; + PWORD Data = NULL; + + /* Function recognized */ + setAL(0x4F); + + /* Find the mode */ + for (i = 0; i < VBE_MODE_COUNT; i++) + { + if ((!(ModeNumber & 0x100) && (ModeNumber == Modes[i].Number)) + || ((ModeNumber & 0x100) && (ModeNumber == Modes[i].VesaNumber))) + { + Data = (PWORD)Modes[i].Info; + + if (Data == NULL) + { + DPRINT1("WARNING: The mode information for mode %02X (%03X) is missing!\n", + Modes[i].Number, + Modes[i].VesaNumber); + } + } + } + + if (Data == NULL) + { + /* Mode not found */ + setAH(1); + break; + } + + /* Clear the buffer */ + for (i = 0; i < 128; i++) + { + *(PWORD)SEG_OFF_TO_PTR(getES(), LOWORD(getDI() + i * 2)) = 0; + } + + /* Copy the data to the caller */ + for (i = 0; i < sizeof(VBE_MODE_INFO) / sizeof(WORD); i++) + { + *(PWORD)SEG_OFF_TO_PTR(getES(), LOWORD(getDI() + i * 2)) = Data[i]; + } + + setAH(0); + break; + } + + default: + { + DPRINT1("VESA BIOS Extensions function %02Xh NOT IMPLEMENTED!\n", getAL()); + break; + } + } +} + +BOOLEAN VbeInitialize(VOID) +{ + BOOLEAN Success; + BYTE SeqIndex = IOReadB(VGA_SEQ_INDEX); + + /* Store the OEM name */ + strcpy(FAR_POINTER(OEM_NAME_PTR), OEM_NAME); + + /* Unlock SVGA extensions on the card */ + IOWriteB(VGA_SEQ_INDEX, SVGA_SEQ_UNLOCK_REG); + IOWriteB(VGA_SEQ_DATA, SVGA_SEQ_UNLOCKED); + + /* Check if it worked */ + Success = IOReadB(VGA_SEQ_DATA) == SVGA_SEQ_UNLOCKED; + + IOWriteB(VGA_SEQ_INDEX, SeqIndex); + return Success; +} Propchange: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h [iso-8859-1] Tue Jul 21 00:46:12 2015 @@ -0,0 +1,108 @@ +/* + * COPYRIGHT: GPLv2+ - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: vbe.h + * PURPOSE: VDM VESA BIOS Extensions (for the Cirrus CL-GD5434 emulated card) + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _VBE_H_ +#define _VBE_H_ + +#include "hardware/video/svga.h" + +/* DEFINITIONS ****************************************************************/ + +#define OEM_NAME "Cirrus Logic GD-5434 VGA" +#define OEM_NAME_PTR 0xF01D5091 + +#define VBE_MODE_COUNT 40 + +/* VBE Mode Attribute Flags */ +#define VBE_MODE_SUPPORTED (1 << 0) +#define VBE_MODE_OPTIONAL_INFO (1 << 1) +#define VBE_MODE_BIOS_SUPPORT (1 << 2) +#define VBE_MODE_COLOR (1 << 3) +#define VBE_MODE_GRAPHICS (1 << 4) + +/* VBE Window Attribute Flags */ +#define VBE_WINDOW_EXISTS (1 << 0) +#define VBE_WINDOW_READABLE (1 << 1) +#define VBE_WINDOW_WRITABLE (1 << 2) + +/* VBE Memory Models */ +#define VBE_MODEL_TEXT 0 +#define VBE_MODEL_CGA 1 +#define VBE_MODEL_HGC 2 +#define VBE_MODEL_EGA 3 +#define VBE_MODEL_PACKED 4 +#define VBE_MODEL_UNCHAINED 5 +#define VBE_MODEL_DIRECT 6 +#define VBE_MODEL_YUV 7 + +#pragma pack(push, 1) + +typedef struct _VBE_INFORMATION +{ + DWORD Signature; + WORD Version; + DWORD OemName; + DWORD Capabilities; + DWORD ModeList; + WORD VideoMemory; + WORD ModeListBuffer[118]; +} VBE_INFORMATION, *PVBE_INFORMATION; + +C_ASSERT(sizeof(VBE_INFORMATION) == 256); + +typedef struct _VBE_MODE_INFO +{ + WORD Attributes; + BYTE WindowAttrA; + BYTE WindowAttrB; + WORD WindowGranularity; + WORD WindowSize; + WORD WindowSegmentA; + WORD WindowSegmentB; + DWORD WindowPosFunc; + WORD BytesPerScanline; + WORD Width; + WORD Height; + BYTE CellWidth; + BYTE CellHeight; + BYTE NumPlanes; + BYTE BitsPerPixel; + BYTE NumBanks; + BYTE MemoryModel; + BYTE BankSize; + BYTE ImagePages; + BYTE Reserved; + BYTE RedMaskSize; + BYTE RedFieldPosition; + BYTE GreenMaskSize; + BYTE GreenFieldPosition; + BYTE BlueMaskSize; + BYTE BlueFieldPosition; + BYTE ReservedMaskSize; + BYTE ReservedFieldPosition; + BYTE DirectColorInfo; +} VBE_MODE_INFO, *PVBE_MODE_INFO; + +C_ASSERT(sizeof(VBE_MODE_INFO) % sizeof(WORD) == 0); + +#pragma pack(pop) + +typedef struct _VBE_MODE +{ + BYTE Number; + WORD VesaNumber; + PVBE_MODE_INFO Info; + PSVGA_REGISTERS Registers; // NULL means "forward to VGABIOS" +} VBE_MODE, *PVBE_MODE; + +/* FUNCTIONS ******************************************************************/ + +VOID WINAPI VbeService(LPWORD Stack); +BOOLEAN VbeInitialize(VOID); + +#endif // _VBE_H_ Propchange: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h ------------------------------------------------------------------------------ svn:eol-style = native 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 Jul 21 00:46:12 2015 @@ -18,6 +18,7 @@ #include "memory.h" #include "bios.h" +#include "bios32/vbe.h" // #include "vidbios.h" #include "io.h" @@ -1953,6 +1954,7 @@ (((ModeNumber) >= 0x00 && (ModeNumber) <= 0x03) || ((ModeNumber) == 0x07)) static PVGA_STATIC_FUNC_TABLE VgaStaticFuncTable; +static BOOLEAN VbeInitialized = FALSE; /* PRIVATE FUNCTIONS **********************************************************/ @@ -3816,6 +3818,13 @@ break; } + /* VESA BIOS Extensions */ + case 0x4F: + { + if (VbeInitialized) VbeService(Stack); + break; + } + default: { DPRINT1("BIOS Function INT 10h, AH = 0x%02X, AL = 0x%02X, BH = 0x%02X NOT IMPLEMENTED\n", @@ -3909,6 +3918,10 @@ /* Register the BIOS support BOPs */ RegisterBop(BOP_VIDEO_INT, VidBiosVideoService); + /* Initialize VBE */ + VbeInitialized = VbeInitialize(); + if (!VbeInitialized) DPRINT1("Couldn't initialize VBE!\n"); + return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] Tue Jul 21 00:46:12 2015 @@ -30,7 +30,7 @@ #define SVGA_IS_UNLOCKED (VgaSeqRegisters[SVGA_SEQ_UNLOCK_REG] == SVGA_SEQ_UNLOCKED) #define SVGA_BANK_SIZE 0x100000 -#define SVGA_SEQ_MAX_UNLOCKED_REG (SVGA_IS_UNLOCKED ? SVGA_SEQ_MAX_REG : VGA_SEQ_MAX_REG) +#define SVGA_SEQ_MAX_UNLOCKED_REG (SVGA_IS_UNLOCKED ? SVGA_SEQ_MAX_REG : SVGA_SEQ_EXT_MODE_REG) #define SVGA_CRTC_MAX_UNLOCKED_REG (SVGA_IS_UNLOCKED ? SVGA_CRTC_MAX_REG : VGA_CRTC_MAX_REG) #define SVGA_GC_MAX_UNLOCKED_REG (SVGA_IS_UNLOCKED ? SVGA_GC_MAX_REG : VGA_GC_MAX_REG) @@ -358,6 +358,15 @@ UCHAR Attribute[VGA_AC_MAX_REG]; } VGA_REGISTERS, *PVGA_REGISTERS; +typedef struct _SVGA_REGISTERS +{ + UCHAR Misc; + UCHAR Hidden; + UCHAR Sequencer[SVGA_SEQ_MAX_REG]; + UCHAR CRT[SVGA_CRTC_MAX_REG]; + UCHAR Graphics[SVGA_GC_MAX_REG]; + UCHAR Attribute[VGA_AC_MAX_REG]; +} SVGA_REGISTERS, *PSVGA_REGISTERS; /* FUNCTIONS ******************************************************************/

1 0

[akhaldi] 68507: [WTSAPI32] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 20 Jul '15

20 Jul '15

Author: akhaldi Date: Mon Jul 20 23:03:32 2015 New Revision: 68507 URL: http://svn.reactos.org/svn/reactos?rev=68507&view=rev Log: [WTSAPI32] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] Mon Jul 20 23:03:32 2015 @@ -65,6 +65,15 @@ } /************************************************************ + * WTSEnableChildSessions (WTSAPI32.@) + */ +BOOL WINAPI WTSEnableChildSessions(BOOL enable) +{ + FIXME("Stub %d\n", enable); + return TRUE; +} + +/************************************************************ * WTSEnumerateProcessesA (WTSAPI32.@) */ BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version, Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec [iso-8859-1] Mon Jul 20 23:03:32 2015 @@ -2,6 +2,7 @@ @ stdcall WTSConnectSessionA(long long ptr long) @ stdcall WTSConnectSessionW(long long ptr long) @ stdcall WTSDisconnectSession(long long long) +@ stdcall WTSEnableChildSessions(long) @ stdcall WTSEnumerateProcessesA(long long long ptr ptr) @ stdcall WTSEnumerateProcessesW(long long long ptr ptr) @ stdcall WTSEnumerateServersA(ptr long long ptr ptr) 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] Mon Jul 20 23:03:32 2015 @@ -217,7 +217,7 @@ reactos/dll/win32/wmi # Synced to WineStaging-1.7.37 reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.37 reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.37 -reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.47 reactos/dll/win32/wuapi # Synced to WineStaging-1.7.37 reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.7.37 reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.7.37

1 0

[akhaldi] 68506: [WINSCARD] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 20 Jul '15

20 Jul '15

Author: akhaldi Date: Mon Jul 20 23:02:36 2015 New Revision: 68506 URL: http://svn.reactos.org/svn/reactos?rev=68506&view=rev Log: [WINSCARD] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/winscard/stubs.c trunk/reactos/dll/win32/winscard/winscard.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/winscard/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winscard/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/winscard/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winscard/stubs.c [iso-8859-1] Mon Jul 20 23:02:36 2015 @@ -448,34 +448,6 @@ */ LONG WINAPI -SCardListReadersA(SCARDCONTEXT Context, - LPCSTR mszGroups, - LPSTR mszReaders, - LPDWORD pcchReaders) -{ - UNIMPLEMENTED; - return SCARD_F_UNKNOWN_ERROR; -} - -/* - * @unimplemented - */ -LONG -WINAPI -SCardListReadersW(SCARDCONTEXT Context, - LPCWSTR mszGroups, - LPWSTR mszReaders, - LPDWORD pcchReaders) -{ - UNIMPLEMENTED; - return SCARD_F_UNKNOWN_ERROR; -} - -/* - * @unimplemented - */ -LONG -WINAPI SCardLocateCardsA(SCARDCONTEXT hContext, LPCSTR mszCards, LPSCARD_READERSTATEA rgReaderStates, Modified: trunk/reactos/dll/win32/winscard/winscard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winscard/winscar… ============================================================================== --- trunk/reactos/dll/win32/winscard/winscard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winscard/winscard.c [iso-8859-1] Mon Jul 20 23:02:36 2015 @@ -123,3 +123,15 @@ { FIXME("stub\n"); } + +LONG WINAPI SCardListReadersA(SCARDCONTEXT context, LPCSTR groups, LPSTR readers, LPDWORD buflen) +{ + FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); + return SCARD_F_INTERNAL_ERROR; +} + +LONG WINAPI SCardListReadersW(SCARDCONTEXT context, LPCWSTR groups, LPWSTR readers, LPDWORD buflen) +{ + FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); + return SCARD_F_INTERNAL_ERROR; +} 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] Mon Jul 20 23:02:36 2015 @@ -211,7 +211,7 @@ reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/winscard # Synced to WineStaging-1.7.37 +reactos/dll/win32/winscard # Synced to WineStaging-1.7.47 reactos/dll/win32/wintrust # Synced to WineStaging-1.7.37 reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.37 reactos/dll/win32/wmi # Synced to WineStaging-1.7.37

1 0

[akhaldi] 68505: [WINEMP3.ACM] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 20 Jul '15

20 Jul '15

Author: akhaldi Date: Mon Jul 20 23:01:25 2015 New Revision: 68505 URL: http://svn.reactos.org/svn/reactos?rev=68505&view=rev Log: [WINEMP3.ACM] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/winemp3.acm/mpegl3.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/winemp3.acm/mpegl3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/mpeg… ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/mpegl3.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/mpegl3.c [iso-8859-1] Mon Jul 20 23:01:25 2015 @@ -658,15 +658,15 @@ { add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC; add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; - add->wMid = 0xFF; - add->wPid = 0x00; + add->wMid = MM_FRAUNHOFER_IIS; + add->wPid = MM_FHGIIS_MPEGLAYER3_DECODE; add->vdwACM = 0x01000000; add->vdwDriver = 0x01000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; add->cFormatTags = 3; /* PCM, MPEG3 */ add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "WINE-MPEG3", -1, + MultiByteToWideChar( CP_ACP, 0, "MPEG Layer-3 Codec", -1, add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, "Wine MPEG3 decoder", -1, add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); 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] Mon Jul 20 23:01:25 2015 @@ -204,7 +204,7 @@ reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.37 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.7.37 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.37 -reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.37 +reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/wing32 # Out of sync reactos/dll/win32/winhttp # Synced to WineStaging-1.7.37 reactos/dll/win32/wininet # Synced to WineStaging-1.7.37

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2015