Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[akhaldi] 70044: [XDK] Add missing THREAD_QUERY_LIMITED_INFORMATION.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Nov 23 08:51:18 2015 New Revision: 70044 URL: http://svn.reactos.org/svn/reactos?rev=70044&view=rev Log: [XDK] Add missing THREAD_QUERY_LIMITED_INFORMATION. Modified: trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Mon Nov 23 08:51:18 2015 @@ -335,6 +335,7 @@ #define THREAD_SET_THREAD_TOKEN 128 #define THREAD_IMPERSONATE 256 #define THREAD_DIRECT_IMPERSONATION 0x200 +#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 #define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3FF) #define MUTANT_QUERY_STATE 0x0001 #define MUTANT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|MUTANT_QUERY_STATE)

9 years, 1 month

[akhaldi] 70043: [PSDK] Update SYSGEOTYPE.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Nov 22 22:28:45 2015 New Revision: 70043 URL: http://svn.reactos.org/svn/reactos?rev=70043&view=rev Log: [PSDK] Update SYSGEOTYPE. Modified: trunk/reactos/include/psdk/winnls.h Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Sun Nov 22 22:28:45 2015 @@ -546,7 +546,10 @@ GEO_TIMEZONES, GEO_OFFICIALLANGUAGES, GEO_ISO_UN_NUMBER, - GEO_PARENT + GEO_PARENT, + GEO_DIALINGCODE, + GEO_CURRENCYCODE, + GEO_CURRENCYSYMBOL }; typedef struct _cpinfo {

9 years, 1 month

[tfaber] 70042: [FASTFAT] - Don't leak FCBs, Arch ;)

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Nov 22 21:46:58 2015 New Revision: 70042 URL: http://svn.reactos.org/svn/reactos?rev=70042&view=rev Log: [FASTFAT] - Don't leak FCBs, Arch ;) Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun Nov 22 21:46:58 2015 @@ -592,9 +592,6 @@ if (!OpenTargetDir) { Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject, RequestedDisposition, RequestedOptions, &ParentFcb); - if (Status == STATUS_ACCESS_DENIED || - Status == STATUS_OBJECT_NAME_COLLISION) - return Status; } else { @@ -703,7 +700,9 @@ */ if (Status == STATUS_OBJECT_PATH_NOT_FOUND || Status == STATUS_INVALID_PARAMETER || - Status == STATUS_DELETE_PENDING) + Status == STATUS_DELETE_PENDING || + Status == STATUS_ACCESS_DENIED || + Status == STATUS_OBJECT_NAME_COLLISION) { if (ParentFcb) {

9 years, 1 month

[dreimer] 70041: [RAPPS] Fix typo.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Nov 22 21:31:35 2015 New Revision: 70041 URL: http://svn.reactos.org/svn/reactos?rev=70041&view=rev Log: [RAPPS] Fix typo. Modified: trunk/reactos/media/rapps/pingus.txt Modified: trunk/reactos/media/rapps/pingus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pingus.txt?rev… ============================================================================== --- trunk/reactos/media/rapps/pingus.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/pingus.txt [iso-8859-1] Sun Nov 22 21:31:35 2015 @@ -1,4 +1,4 @@ -; UTF-8 +ï»¿; UTF-8 ; Polish translation by wojo664 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) ; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) @@ -16,7 +16,7 @@ CDPath = none [Section.0407] -Description = Freies Lemings-Ã¤hnliches Puzzle Spiel. +Description = Freies Lemmings-Ã¤hnliches Puzzle Spiel. [Section.0a] Description = Un juego de puzles parecido a los Lemmings.

9 years, 1 month

[tfaber] 70040: [SHELL][RAPPS_NEW] - Don't call placement new on static objects. The constructors work just fine. CORE-10562 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Nov 22 21:13:14 2015 New Revision: 70040 URL: http://svn.reactos.org/svn/reactos?rev=70040&view=rev Log: [SHELL][RAPPS_NEW] - Don't call placement new on static objects. The constructors work just fine. CORE-10562 #resolve Modified: trunk/reactos/base/applications/rapps_new/winmain.cpp trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/rshell/misc.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp trunk/reactos/dll/shellext/stobject/stobject.cpp trunk/reactos/dll/win32/browseui/browseui.cpp trunk/reactos/dll/win32/shell32/shell32.cpp Modified: trunk/reactos/base/applications/rapps_new/winmain.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/winmain.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/winmain.cpp [iso-8859-1] Sun Nov 22 21:13:14 2015 @@ -40,12 +40,6 @@ { if (bInitialize) { - /* HACK - the global constructors don't run, so I placement new them here */ - new (&gModule) CRAppsModule; - new (&gWinModule) CAtlWinModule; - new (&_AtlBaseModule) CAtlBaseModule; - new (&_AtlComModule) CAtlComModule; - gModule.Init(ObjectMap, hInstance, NULL); } else Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Sun Nov 22 21:13:14 2015 @@ -45,12 +45,6 @@ { if (bInitialize) { - /* HACK - the global constructors don't run, so I placement new them here */ - new (&gModule) CExplorerModule; - new (&gWinModule) CAtlWinModule; - new (&_AtlBaseModule) CAtlBaseModule; - new (&_AtlComModule) CAtlComModule; - gModule.Init(ObjectMap, hInstance, NULL); } else Modified: trunk/reactos/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/misc.cpp… ============================================================================== --- trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] Sun Nov 22 21:13:14 2015 @@ -118,12 +118,6 @@ if (dwReason == DLL_PROCESS_ATTACH) { g_hRShell = hInstance; - - /* HACK - the global constructors don't run, so I placement new them here */ - new (&gModule) CRShellModule; - new (&gWinModule) CAtlWinModule; - new (&_AtlBaseModule) CAtlBaseModule; - new (&_AtlComModule) CAtlComModule; gModule.Init(NULL, hInstance, NULL); DisableThreadLibraryCalls(hInstance); Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] Sun Nov 22 21:13:14 2015 @@ -33,12 +33,6 @@ g_hInstance = hinstDLL; DisableThreadLibraryCalls(g_hInstance); - /* HACK - the global constructors don't run, so I placement new them here */ - new (&g_Module) CComModule; - new (&_AtlWinModule) CAtlWinModule; - new (&_AtlBaseModule) CAtlBaseModule; - new (&_AtlComModule) CAtlComModule; - g_Module.Init(ObjectMap, g_hInstance, NULL); } else if (fdwReason == DLL_PROCESS_DETACH) Modified: trunk/reactos/dll/shellext/stobject/stobject.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… ============================================================================== --- trunk/reactos/dll/shellext/stobject/stobject.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/stobject.cpp [iso-8859-1] Sun Nov 22 21:13:14 2015 @@ -34,12 +34,6 @@ g_hInstance = hinstDLL; DisableThreadLibraryCalls(g_hInstance); - /* HACK - the global constructors don't run, so I placement new them here */ - new (&g_Module) CComModule; - new (&_AtlWinModule) CAtlWinModule; - new (&_AtlBaseModule) CAtlBaseModule; - new (&_AtlComModule) CAtlComModule; - g_Module.Init(ObjectMap, g_hInstance, NULL); } else if (fdwReason == DLL_PROCESS_DETACH) Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Sun Nov 22 21:13:14 2015 @@ -60,12 +60,6 @@ if (dwReason == DLL_PROCESS_ATTACH) { - /* HACK - the global constructors don't run, so I placement new them here */ - new (&gModule) CBrowseUIModule; - new (&gWinModule) CAtlWinModule; - new (&_AtlBaseModule) CAtlBaseModule; - new (&_AtlComModule) CAtlComModule; - gModule.Init(ObjectMap, hInstance, NULL); DisableThreadLibraryCalls (hInstance); } Modified: trunk/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Sun Nov 22 21:13:14 2015 @@ -290,12 +290,6 @@ TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad); if (dwReason == DLL_PROCESS_ATTACH) { - /* HACK - the global constructors don't run, so I placement new them here */ - new (&gModule) CShell32Module; - new (&_AtlWinModule) CAtlWinModule; - new (&_AtlBaseModule) CAtlBaseModule; - new (&_AtlComModule) CAtlComModule; - shell32_hInstance = hInstance; gModule.Init(ObjectMap, hInstance, NULL);

9 years, 1 month

[tfaber] 70039: [CRT] - Don't call global constructors twice on MSVC builds CORE-10562

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Nov 22 20:49:47 2015 New Revision: 70039 URL: http://svn.reactos.org/svn/reactos?rev=70039&view=rev Log: [CRT] - Don't call global constructors twice on MSVC builds CORE-10562 Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscmai… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] Sun Nov 22 20:49:47 2015 @@ -20,31 +20,6 @@ #error Unsupported platform #endif -/* - * Initializer / constructor handling - * see http://msdn.microsoft.com/en-us/library/bb918180.aspx - * Destructors are registered from the initializers using atexit() - */ - -extern _PVFV __xi_a[]; -extern _PVFV __xi_z[]; -extern _PVFV __xc_a[]; -extern _PVFV __xc_z[]; - -static -void -__do_xtors( - _PVFV *start, - _PVFV *end) -{ - _PVFV *current; - for (current = start; current < end; current++) - { - if (*current != NULL) - (*current)(); - } -} - void _pei386_runtime_relocator(void) { } @@ -53,13 +28,6 @@ { /* Nothing to do */ return 1; -} - -void -__do_global_ctors(void) -{ - __do_xtors(__xi_a, __xi_z); - __do_xtors(__xc_a, __xc_z); } BOOL @@ -114,8 +82,6 @@ initialized = 1; _RTC_Initialize(); - - __do_global_ctors (); } }

9 years, 1 month

[tfaber] 70038: [BASESRV] - Return the unique ID from BaseSrvGetTempFile instead of an NTSTATUS. Fixes GetTempFile when using kernel32.dll from Windows.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Nov 22 18:15:49 2015 New Revision: 70038 URL: http://svn.reactos.org/svn/reactos?rev=70038&view=rev Log: [BASESRV] - Return the unique ID from BaseSrvGetTempFile instead of an NTSTATUS. Fixes GetTempFile when using kernel32.dll from Windows. Modified: trunk/reactos/subsystems/win/basesrv/proc.c Modified: trunk/reactos/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/pro… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] Sun Nov 22 18:15:49 2015 @@ -61,7 +61,7 @@ DPRINT("Returning: %u\n", GetTempFile->UniqueID); - return STATUS_SUCCESS; + return GetTempFile->UniqueID; } CSR_API(BaseSrvCreateProcess)

9 years, 1 month

[ekohl] 70037: [KERNEL32] GetDriveTypeW: Use neither CreateFileW nor InternalOpenDirW to open the drive, because both functions call SetLastError upon failure. This can cause failing checks in line...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Nov 22 17:55:40 2015 New Revision: 70037 URL: http://svn.reactos.org/svn/reactos?rev=70037&view=rev Log: [KERNEL32] GetDriveTypeW: Use neither CreateFileW nor InternalOpenDirW to open the drive, because both functions call SetLastError upon failure. This can cause failing checks in lines 23, 44 and 59 of the kernel32_apitest:GetDriveType test. Use NtOpenFile instead. Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] Sun Nov 22 17:55:40 2015 @@ -377,15 +377,19 @@ GetDriveTypeW(IN LPCWSTR lpRootPathName) { FILE_FS_DEVICE_INFORMATION FileFsDevice; + OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - HANDLE hFile; - NTSTATUS errCode; + UNICODE_STRING PathName; + HANDLE FileHandle; + NTSTATUS Status; + PWSTR CurrentDir = NULL; + PCWSTR lpRootPath; if (!lpRootPathName) { /* If NULL is passed, use current directory path */ DWORD BufferSize = GetCurrentDirectoryW(0, NULL); - LPWSTR CurrentDir = HeapAlloc(GetProcessHeap(), 0, BufferSize * sizeof(WCHAR)); + CurrentDir = HeapAlloc(GetProcessHeap(), 0, BufferSize * sizeof(WCHAR)); if (!CurrentDir) return DRIVE_UNKNOWN; if (!GetCurrentDirectoryW(BufferSize, CurrentDir)) @@ -393,31 +397,59 @@ HeapFree(GetProcessHeap(), 0, CurrentDir); return DRIVE_UNKNOWN; } - hFile = InternalOpenDirW(CurrentDir, FALSE); + + if (wcslen(CurrentDir) > 3) + CurrentDir[3] = 0; + + lpRootPath = (PCWSTR)CurrentDir; + } + else + { + TRACE("lpRootPathName: %S\n", lpRootPathName); + lpRootPath = lpRootPathName; + } + + TRACE("lpRootPath: %S\n", lpRootPath); + + if (!RtlDosPathNameToNtPathName_U(lpRootPath, &PathName, NULL, NULL)) + { + if (CurrentDir != NULL) + HeapFree(GetProcessHeap(), 0, CurrentDir); + + return DRIVE_NO_ROOT_DIR; + } + + TRACE("PathName: %S\n", PathName.Buffer); + + if (CurrentDir != NULL) HeapFree(GetProcessHeap(), 0, CurrentDir); - } - else - { - hFile = InternalOpenDirW(lpRootPathName, FALSE); - } - - if (hFile == INVALID_HANDLE_VALUE) - { - return DRIVE_NO_ROOT_DIR; /* According to WINE regression tests */ - } - - errCode = NtQueryVolumeInformationFile (hFile, - &IoStatusBlock, - &FileFsDevice, - sizeof(FILE_FS_DEVICE_INFORMATION), - FileFsDeviceInformation); - if (!NT_SUCCESS(errCode)) - { - CloseHandle(hFile); - BaseSetLastNTError (errCode); + + InitializeObjectAttributes(&ObjectAttributes, + &PathName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_READ_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathName.Buffer); + if (!NT_SUCCESS(Status)) + return DRIVE_NO_ROOT_DIR; /* According to WINE regression tests */ + + Status = NtQueryVolumeInformationFile(FileHandle, + &IoStatusBlock, + &FileFsDevice, + sizeof(FILE_FS_DEVICE_INFORMATION), + FileFsDeviceInformation); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { return 0; } - CloseHandle(hFile); switch (FileFsDevice.DeviceType) {

9 years, 1 month

[akhaldi] 70036: [PSDK] Fix D3DRMRENDER_PHONG definition.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Nov 22 16:37:03 2015 New Revision: 70036 URL: http://svn.reactos.org/svn/reactos?rev=70036&view=rev Log: [PSDK] Fix D3DRMRENDER_PHONG definition. Modified: trunk/reactos/include/psdk/d3drmdef.h Modified: trunk/reactos/include/psdk/d3drmdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3drmdef.h?re… ============================================================================== --- trunk/reactos/include/psdk/d3drmdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3drmdef.h [iso-8859-1] Sun Nov 22 16:37:03 2015 @@ -92,7 +92,7 @@ #define D3DRMRENDER_UNLITFLAT (D3DRMSHADE_FLAT+D3DRMLIGHT_OFF+D3DRMFILL_SOLID) #define D3DRMRENDER_FLAT (D3DRMSHADE_FLAT+D3DRMLIGHT_ON+D3DRMFILL_SOLID) #define D3DRMRENDER_GOURAUD (D3DRMSHADE_GOURAUD+D3DRMLIGHT_ON+D3DRMFILL_SOLID) -#define D3DRMRENDER_PHONG (D3DRMSHADE_PHONG+D3DRMLIGHT_ON+D3DRMFILL_SOLID +#define D3DRMRENDER_PHONG (D3DRMSHADE_PHONG+D3DRMLIGHT_ON+D3DRMFILL_SOLID) #define D3DRMRENDERMODE_BLENDEDTRANSPARENCY 1 #define D3DRMRENDERMODE_SORTEDTRANSPARENCY 2

9 years, 1 month

[akhaldi] 70035: [D3DCOMPILER_43] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Nov 22 16:34:38 2015 New Revision: 70035 URL: http://svn.reactos.org/svn/reactos?rev=70035&view=rev Log: [D3DCOMPILER_43] Sync with Wine Staging 1.7.55. CORE-10536 Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/main.c - copied unchanged from r70034, trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c Removed: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt [iso-8859-1] Sun Nov 22 16:34:38 2015 @@ -13,9 +13,9 @@ blob.c bytecodewriter.c compiler.c - d3dcompiler_43_main.c hlsl.tab.c hlsl.yy.c + main.c reflection.c utils.c d3dcompiler_private.h Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c [iso-8859-1] Sun Nov 22 16:34:38 2015 @@ -460,3 +460,17 @@ return d3dcompiler_strip_shader(data, data_size, flags, blob); } + +HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents) +{ + FIXME("filename %s, contents %p\n", debugstr_w(filename), contents); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DWriteBlobToFile(ID3DBlob* blob, const WCHAR *filename, BOOL overwrite) +{ + FIXME("blob %p, filename %s, overwrite %d\n", blob, debugstr_w(filename), overwrite); + + return E_NOTIMPL; +} Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c [iso-8859-1] Sun Nov 22 16:34:38 2015 @@ -598,7 +598,7 @@ put_dword(buffer, instr_dcl); /* Write the usage and index */ - token = (1 << 31); /* Bit 31 of non-instruction opcodes is 1 */ + token = (1u << 31); /* Bit 31 of non-instruction opcodes is 1 */ token |= (decls[i].usage << D3DSP_DCL_USAGE_SHIFT) & D3DSP_DCL_USAGE_MASK; token |= (decls[i].usage_idx << D3DSP_DCL_USAGEINDEX_SHIFT) & D3DSP_DCL_USAGEINDEX_MASK; put_dword(buffer, token); @@ -614,7 +614,7 @@ static void write_const(struct constant **consts, int num, DWORD opcode, DWORD reg_type, struct bytecode_buffer *buffer, BOOL len) { int i; DWORD instr_def = opcode; - const DWORD reg = (1<<31) | d3dsp_register( reg_type, 0 ) | D3DSP_WRITEMASK_ALL; + const DWORD reg = (1u << 31) | d3dsp_register( reg_type, 0 ) | D3DSP_WRITEMASK_ALL; if(len) { if(opcode == D3DSIO_DEFB) @@ -885,7 +885,7 @@ static void vs_12_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD has_wmask; if(reg->rel_reg) { @@ -959,7 +959,7 @@ static void vs_1_x_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD has_swizzle; DWORD component; @@ -1070,7 +1070,7 @@ static void ps_1_0123_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ if(reg->rel_reg) { WARN("Relative addressing not supported in <= ps_3_0\n"); This->state = E_INVALIDARG; @@ -1116,7 +1116,7 @@ static void ps_1_0123_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ if(reg->rel_reg) { WARN("Relative addressing not supported for destination registers\n"); @@ -1378,7 +1378,7 @@ static void ps_1_4_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ if(reg->rel_reg) { WARN("Relative addressing not supported in <= ps_3_0\n"); This->state = E_INVALIDARG; @@ -1417,7 +1417,7 @@ static void ps_1_4_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ if(reg->rel_reg) { WARN("Relative addressing not supported for destination registers\n"); @@ -1564,7 +1564,7 @@ static void vs_2_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD has_swizzle; DWORD component; DWORD d3d9reg; @@ -1799,12 +1799,12 @@ DWORD i; DWORD instr_dcl = D3DSIO_DCL | (2 << D3DSI_INSTLENGTH_SHIFT); DWORD token; - const DWORD reg = (1<<31) | d3dsp_register( D3DSPR_SAMPLER, 0 ) | D3DSP_WRITEMASK_ALL; + const DWORD reg = (1u << 31) | d3dsp_register( D3DSPR_SAMPLER, 0 ) | D3DSP_WRITEMASK_ALL; for(i = 0; i < shader->num_samplers; i++) { /* Write the DCL instruction */ put_dword(buffer, instr_dcl); - token = (1<<31); + token = (1u << 31); /* Already shifted */ token |= (d3d9_sampler(shader->samplers[i].type)) & D3DSP_TEXTURETYPE_MASK; put_dword(buffer, token); @@ -1831,7 +1831,7 @@ static void ps_2_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; if(reg->rel_reg) { WARN("Relative addressing not supported in <= ps_3_0\n"); @@ -1886,7 +1886,7 @@ const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; if(reg->rel_reg) { @@ -2059,7 +2059,7 @@ static void sm_3_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; d3d9reg = d3d9_register(reg->type); @@ -2098,7 +2098,7 @@ const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; if(reg->rel_reg) { Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c [iso-8859-1] Sun Nov 22 16:34:38 2015 @@ -687,29 +687,49 @@ return S_OK; } +HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, + ID3DBlob **error_messages) +{ + HRESULT hr; + + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" + "target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p,\n" + "secondary_data_size %lu, shader %p, error_messages %p\n", + data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), + debugstr_a(target), sflags, eflags, secondary_flags, secondary_data, + secondary_data_size, shader, error_messages); + + if (secondary_data) + FIXME("secondary data not implemented yet\n"); + + if (shader) *shader = NULL; + if (error_messages) *error_messages = NULL; + + EnterCriticalSection(&wpp_mutex); + + hr = preprocess_shader(data, data_size, filename, defines, include, error_messages); + if (SUCCEEDED(hr)) + hr = compile_shader(wpp_output, target, entrypoint, shader, error_messages); + + HeapFree(GetProcessHeap(), 0, wpp_output); + LeaveCriticalSection(&wpp_mutex); + return hr; +} + HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) { - HRESULT hr; - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, shader, error_messages); - if (shader) *shader = NULL; - if (error_messages) *error_messages = NULL; - - EnterCriticalSection(&wpp_mutex); - - hr = preprocess_shader(data, data_size, filename, defines, include, error_messages); - if (SUCCEEDED(hr)) - hr = compile_shader(wpp_output, target, entrypoint, shader, error_messages); - - HeapFree(GetProcessHeap(), 0, wpp_output); - LeaveCriticalSection(&wpp_mutex); - return hr; + return D3DCompile2(data, data_size, filename, defines, include, entrypoint, target, sflags, + eflags, 0, NULL, 0, shader, error_messages); } HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, @@ -758,3 +778,12 @@ data, size, flags, comments, disassembly); return E_NOTIMPL; } + +HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, + const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors) +{ + FIXME("filename %s, defines %p, includes %p, entrypoint %s, target %s, flags1 %x, flags2 %x, code %p, errors %p\n", + debugstr_w(filename), defines, includes, debugstr_a(entrypoint), debugstr_a(target), flags1, flags2, code, errors); + + return E_NOTIMPL; +} Removed: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c (removed) @@ -1,35 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * 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 - * - */ - -#include "d3dcompiler_private.h" - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h [iso-8859-1] Sun Nov 22 16:34:38 2015 @@ -535,8 +535,8 @@ BWRITERSPSM_NOT, }; -#define BWRITER_SM1_VS 0xfffe -#define BWRITER_SM1_PS 0xffff +#define BWRITER_SM1_VS 0xfffeu +#define BWRITER_SM1_PS 0xffffu #define BWRITERPS_VERSION(major, minor) ((BWRITER_SM1_PS << 16) | ((major) << 8) | (minor)) #define BWRITERVS_VERSION(major, minor) ((BWRITER_SM1_VS << 16) | ((major) << 8) | (minor)) 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] Sun Nov 22 16:34:38 2015 @@ -24,7 +24,7 @@ reactos/dll/directx/wine/amstream # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.47

9 years, 1 month

← Newer
1
...
16
17
18
19
20
21
22
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015