Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 70041: [RAPPS] Fix typo.
by dreimer＠svn.reactos.org 22 Nov '15

22 Nov '15

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.

1 0

[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 22 Nov '15

22 Nov '15

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);

1 0

[tfaber] 70039: [CRT] - Don't call global constructors twice on MSVC builds CORE-10562
by tfaber＠svn.reactos.org 22 Nov '15

22 Nov '15

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 (); } }

1 0

[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 22 Nov '15

22 Nov '15

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)

1 0

[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 22 Nov '15

22 Nov '15

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) {

1 0

[akhaldi] 70036: [PSDK] Fix D3DRMRENDER_PHONG definition.
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

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

1 0

[akhaldi] 70035: [D3DCOMPILER_43] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

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

1 0

[akhaldi] 70034: [PSDK] Update d3dcompiler.h. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 16:34:06 2015 New Revision: 70034 URL: http://svn.reactos.org/svn/reactos?rev=70034&view=rev Log: [PSDK] Update d3dcompiler.h. CORE-10536 Modified: trunk/reactos/include/psdk/d3dcompiler.h Modified: trunk/reactos/include/psdk/d3dcompiler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dcompiler.h… ============================================================================== --- trunk/reactos/include/psdk/d3dcompiler.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3dcompiler.h [iso-8859-1] Sun Nov 22 16:34:06 2015 @@ -54,7 +54,10 @@ #define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x00000000 #define D3DCOMPILE_OPTIMIZATION_LEVEL2 0x0000c000 #define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x00008000 +#define D3DCOMPILE_RESERVED16 0x00010000 +#define D3DCOMPILE_RESERVED17 0x00020000 #define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x00040000 +#define D3DCOMPILE_RESOURCES_MAY_ALIAS 0x00080000 #define D3D_DISASM_ENABLE_COLOR_CODE 0x00000001 #define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS 0x00000002 @@ -104,7 +107,8 @@ HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); - +HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents); +HRESULT WINAPI D3DWriteBlobToFile(ID3DBlob *blob, const WCHAR *filename, BOOL overwrite); HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void **reflector); HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob);

1 0

[akhaldi] 70033: [D3D8][D3D9][DDRAW][WINED3D] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 15:58:59 2015 New Revision: 70033 URL: http://svn.reactos.org/svn/reactos?rev=70033&view=rev Log: [D3D8][D3D9][DDRAW][WINED3D] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cs.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/sampler.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/view.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/psdk/d3d9.h trunk/reactos/include/reactos/wine/wined3d.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/sampler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=70… Modified: trunk/reactos/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 70032: [D3DX9_36] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 15:41:58 2015 New Revision: 70032 URL: http://svn.reactos.org/svn/reactos?rev=70032&view=rev Log: [D3DX9_36] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/directx/wine/d3dx9_36/animation.c trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h trunk/reactos/dll/directx/wine/d3dx9_36/effect.c trunk/reactos/dll/directx/wine/d3dx9_36/font.c trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c trunk/reactos/dll/directx/wine/d3dx9_36/shader.c trunk/reactos/dll/directx/wine/d3dx9_36/skin.c trunk/reactos/dll/directx/wine/d3dx9_36/surface.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/d3dx9_36/animation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/animation.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/animation.c [iso-8859-1] Sun Nov 22 15:41:58 2015 @@ -24,6 +24,11 @@ { ID3DXAnimationController ID3DXAnimationController_iface; LONG ref; + + UINT max_outputs; + UINT max_sets; + UINT max_tracks; + UINT max_events; }; static inline struct d3dx9_animation_controller *impl_from_ID3DXAnimationController(ID3DXAnimationController *iface) @@ -50,24 +55,24 @@ static ULONG WINAPI d3dx9_animation_controller_AddRef(ID3DXAnimationController *iface) { - struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface); - ULONG refcount = InterlockedIncrement(&animation->ref); - - TRACE("%p increasing refcount to %u.\n", animation, refcount); + struct d3dx9_animation_controller *This = impl_from_ID3DXAnimationController(iface); + ULONG refcount = InterlockedIncrement(&This->ref); + + TRACE("%p increasing refcount to %u.\n", This, refcount); return refcount; } static ULONG WINAPI d3dx9_animation_controller_Release(ID3DXAnimationController *iface) { - struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface); - ULONG refcount = InterlockedDecrement(&animation->ref); - - TRACE("%p decreasing refcount to %u.\n", animation, refcount); + struct d3dx9_animation_controller *This = impl_from_ID3DXAnimationController(iface); + ULONG refcount = InterlockedDecrement(&This->ref); + + TRACE("%p decreasing refcount to %u.\n", This, refcount); if (!refcount) { - HeapFree(GetProcessHeap(), 0, animation); + HeapFree(GetProcessHeap(), 0, This); } return refcount; @@ -75,30 +80,38 @@ static UINT WINAPI d3dx9_animation_controller_GetMaxNumAnimationOutputs(ID3DXAnimationController *iface) { - FIXME("iface %p stub.\n", iface); - - return 0; + struct d3dx9_animation_controller *This = impl_from_ID3DXAnimationController(iface); + + TRACE("iface %p.\n", iface); + + return This->max_outputs; } static UINT WINAPI d3dx9_animation_controller_GetMaxNumAnimationSets(ID3DXAnimationController *iface) { - FIXME("iface %p stub.\n", iface); - - return 0; + struct d3dx9_animation_controller *This = impl_from_ID3DXAnimationController(iface); + + TRACE("iface %p.\n", iface); + + return This->max_sets; } static UINT WINAPI d3dx9_animation_controller_GetMaxNumTracks(ID3DXAnimationController *iface) { - FIXME("iface %p stub.\n", iface); - - return 0; + struct d3dx9_animation_controller *This = impl_from_ID3DXAnimationController(iface); + + FIXME("iface %p.\n", iface); + + return This->max_tracks; } static UINT WINAPI d3dx9_animation_controller_GetMaxNumEvents(ID3DXAnimationController *iface) { - FIXME("iface %p stub.\n", iface); - - return 0; + struct d3dx9_animation_controller *This = impl_from_ID3DXAnimationController(iface); + + FIXME("iface %p.\n", iface); + + return This->max_events; } static HRESULT WINAPI d3dx9_animation_controller_RegisterAnimationOutput(ID3DXAnimationController *iface, @@ -445,6 +458,10 @@ object->ID3DXAnimationController_iface.lpVtbl = &d3dx9_animation_controller_vtbl; object->ref = 1; + object->max_outputs = MaxNumAnimationOutputs; + object->max_sets = MaxNumAnimationSets; + object->max_tracks = MaxNumTracks; + object->max_events = MaxNumEvents; *AnimationController = &object->ID3DXAnimationController_iface; Modified: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec [iso-8859-1] Sun Nov 22 15:41:58 2015 @@ -66,8 +66,8 @@ @ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) -@ stdcall -stub D3DXCreateFragmentLinker(ptr long ptr) -@ stdcall -stub D3DXCreateFragmentLinkerEx(ptr long long ptr) +@ stdcall D3DXCreateFragmentLinker(ptr long ptr) +@ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) @ stdcall -stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @@ -293,7 +293,7 @@ @ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXTessellateNPatches(ptr ptr long long ptr ptr) +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) @ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) @ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) @ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) Modified: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h [iso-8859-1] Sun Nov 22 15:41:58 2015 @@ -128,4 +128,6 @@ void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; +HRESULT create_dummy_skin(ID3DXSkinInfo **iface) DECLSPEC_HIDDEN; + #endif /* __WINE_D3DX9_36_PRIVATE_H */ Modified: trunk/reactos/dll/directx/wine/d3dx9_36/effect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/effect.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/effect.c [iso-8859-1] Sun Nov 22 15:41:58 2015 @@ -5094,7 +5094,7 @@ HRESULT hr = E_FAIL; read_dword(ptr, &technique_index); - TRACE("techn: %u\n", technique_index); + TRACE("technique_index: %u\n", technique_index); read_dword(ptr, &index); TRACE("index: %u\n", index); Modified: trunk/reactos/dll/directx/wine/d3dx9_36/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/font.c [iso-8859-1] Sun Nov 22 15:41:58 2015 @@ -207,7 +207,7 @@ TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", iface, sprite, debugstr_a(string), count, wine_dbgstr_rect(rect), format, color); - if (!string || !count) + if (!string || count <= 0) return 0; countW = MultiByteToWideChar(CP_ACP, 0, string, count, NULL, 0); @@ -232,7 +232,7 @@ TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", iface, sprite, debugstr_w(string), count, wine_dbgstr_rect(rect), format, color); - if (!string || !count) + if (!string || count <= 0) return 0; /* Strip terminating NULL characters */ Modified: trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c [iso-8859-1] Sun Nov 22 15:41:58 2015 @@ -3320,6 +3320,13 @@ goto end; } + if ((provide_flags & PROVIDE_SKININFO) && !mesh_data->skin_info) + { + hr = create_dummy_skin(&mesh_data->skin_info); + if (FAILED(hr)) + goto end; + } + hr = D3D_OK; end: @@ -3898,11 +3905,9 @@ if (!memory || !memory_size || !device || !frame_hierarchy || !alloc_hier) return D3DERR_INVALIDCALL; - if (load_user_data || anim_controller) { - if (load_user_data) - FIXME("Loading user data not implemented\n"); - if (anim_controller) - FIXME("Animation controller creation not implemented\n"); + if (load_user_data) + { + FIXME("Loading user data not implemented.\n"); return E_NOTIMPL; } @@ -3970,6 +3975,12 @@ } else { *frame_hierarchy = first_frame; hr = D3D_OK; + } + + if (anim_controller) + { + *anim_controller = NULL; + FIXME("Animation controller creation not implemented.\n"); } cleanup: @@ -4978,12 +4989,6 @@ return D3DERR_INVALIDCALL; } - if (adjacency) - { - FIXME("Case of adjacency != NULL not implemented.\n"); - return E_NOTIMPL; - } - number_of_vertices = 2 + (slices * (3 + stacks)); number_of_faces = 2 * slices + stacks * (2 * slices); @@ -5135,6 +5140,23 @@ free_sincos_table(&theta); cylinder->lpVtbl->UnlockIndexBuffer(cylinder); cylinder->lpVtbl->UnlockVertexBuffer(cylinder); + + if (adjacency) + { + if (FAILED(hr = D3DXCreateBuffer(number_of_faces * sizeof(DWORD) * 3, adjacency))) + { + cylinder->lpVtbl->Release(cylinder); + return hr; + } + + if (FAILED(hr = cylinder->lpVtbl->GenerateAdjacency(cylinder, 0.0f, (*adjacency)->lpVtbl->GetBufferPointer(*adjacency)))) + { + (*adjacency)->lpVtbl->Release(*adjacency); + cylinder->lpVtbl->Release(cylinder); + return hr; + } + } + *mesh = cylinder; return D3D_OK; @@ -5145,7 +5167,7 @@ { FIXME("(%p, %p, %p): stub\n", device, mesh, adjacency); - return E_NOTIMPL; + return D3DXCreateSphere(device, 1.0f, 4, 4, mesh, adjacency); } HRESULT WINAPI D3DXCreateTextA(struct IDirect3DDevice9 *device, HDC hdc, const char *text, float deviation, @@ -5838,6 +5860,10 @@ int nb_vertices = 0; int i; struct point2d_index *idx_ptr; + + /* Glyphs without outlines do not generate any vertices. */ + if (!glyph->outlines.count) + return D3D_OK; for (i = 0; i < glyph->outlines.count; i++) nb_vertices += glyph->outlines.items[i].count; @@ -6989,7 +7015,6 @@ DWORD *point_reps = NULL; struct d3dx9_mesh *This = impl_from_ID3DXMesh(mesh); DWORD *vertex_face_map = NULL; - ID3DXBuffer *vertex_remap = NULL; BYTE *vertices = NULL; TRACE("mesh %p, flags %#x, epsilons %p, adjacency %p, adjacency_out %p, face_remap_out %p, vertex_remap_out %p.\n", @@ -7156,7 +7181,6 @@ HeapFree(GetProcessHeap(), 0, vertex_face_map); if (attributes) mesh->lpVtbl->UnlockAttributeBuffer(mesh); if (indices) mesh->lpVtbl->UnlockIndexBuffer(mesh); - if (vertex_remap) ID3DXBuffer_Release(vertex_remap); if (vertices) mesh->lpVtbl->UnlockVertexBuffer(mesh); return hr; @@ -7227,36 +7251,281 @@ return hr; } +static D3DXVECTOR3 *vertex_element_vec3(BYTE *vertices, const D3DVERTEXELEMENT9 *declaration, + DWORD vertex_stride, DWORD index) +{ + return (D3DXVECTOR3 *)(vertices + declaration->Offset + index * vertex_stride); +} + +static D3DXVECTOR3 read_vec3(BYTE *vertices, const D3DVERTEXELEMENT9 *declaration, + DWORD vertex_stride, DWORD index) +{ + D3DXVECTOR3 vec3 = {0}; + const D3DXVECTOR3 *src = vertex_element_vec3(vertices, declaration, vertex_stride, index); + + switch (declaration->Type) + { + case D3DDECLTYPE_FLOAT1: + vec3.x = src->x; + break; + case D3DDECLTYPE_FLOAT2: + vec3.x = src->x; + vec3.y = src->y; + break; + case D3DDECLTYPE_FLOAT3: + case D3DDECLTYPE_FLOAT4: + vec3 = *src; + break; + default: + ERR("Cannot read vec3\n"); + break; + } + + return vec3; +} + /************************************************************************* * D3DXComputeTangentFrameEx (D3DX9_36.@) */ -HRESULT WINAPI D3DXComputeTangentFrameEx(ID3DXMesh *Mesh, DWORD TextureInSemantic, DWORD TextureInIndex, - DWORD UPartialOutSemantic, DWORD UPartialOutIndex, DWORD VPartialOutSemantic, DWORD VPartialOutIndex, - DWORD NormalOutSemantic, DWORD NormalOutIndex, DWORD options, const DWORD *adjacency, - FLOAT PartialEdgeThreshold, FLOAT SingularPointThreshold, FLOAT NormalEdgeThreshold, - ID3DXMesh **MeshOut, ID3DXBuffer **VertexMapping) -{ - FIXME("Mesh %p, TextureInSemantic %u, TextureInIndex %u, UPartialOutSemantic %u, UPartialOutIndex %u, " - "VPartialOutSemantic %u, VPartialOutIndex %u, NormalOutSemantic %u, NormalOutIndex %u, " - "options %x, adjacency %p, PartialEdgeThreshold %f, SingularPointThreshold %f, NormalEdgeThreshold %f, " - "MeshOut %p, VertexMapping %p stub.\n", - Mesh, TextureInSemantic, TextureInIndex, UPartialOutSemantic, UPartialOutIndex, VPartialOutSemantic, - VPartialOutIndex, NormalOutSemantic, NormalOutIndex, options, adjacency, PartialEdgeThreshold, - SingularPointThreshold, NormalEdgeThreshold, MeshOut, VertexMapping); - - return E_NOTIMPL; +HRESULT WINAPI D3DXComputeTangentFrameEx(ID3DXMesh *mesh, DWORD texture_in_semantic, DWORD texture_in_index, + DWORD u_partial_out_semantic, DWORD u_partial_out_index, DWORD v_partial_out_semantic, + DWORD v_partial_out_index, DWORD normal_out_semantic, DWORD normal_out_index, DWORD options, + const DWORD *adjacency, float partial_edge_threshold, float singular_point_threshold, + float normal_edge_threshold, ID3DXMesh **mesh_out, ID3DXBuffer **vertex_mapping) +{ + HRESULT hr; + void *indices = NULL; + BYTE *vertices = NULL; + DWORD *point_reps = NULL; + size_t normal_size; + BOOL indices_are_32bit; + DWORD i, j, num_faces, num_vertices, vertex_stride; + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE] = {D3DDECL_END()}; + D3DVERTEXELEMENT9 *position_declaration = NULL, *normal_declaration = NULL; + DWORD weighting_method = options & (D3DXTANGENT_WEIGHT_EQUAL | D3DXTANGENT_WEIGHT_BY_AREA); + + TRACE("mesh %p, texture_in_semantic %u, texture_in_index %u, u_partial_out_semantic %u, u_partial_out_index %u, " + "v_partial_out_semantic %u, v_partial_out_index %u, normal_out_semantic %u, normal_out_index %u, " + "options %#x, adjacency %p, partial_edge_threshold %f, singular_point_threshold %f, " + "normal_edge_threshold %f, mesh_out %p, vertex_mapping %p\n", + mesh, texture_in_semantic, texture_in_index, u_partial_out_semantic, u_partial_out_index, + v_partial_out_semantic, v_partial_out_index, normal_out_semantic, normal_out_index, options, adjacency, + partial_edge_threshold, singular_point_threshold, normal_edge_threshold, mesh_out, vertex_mapping); + + if (!mesh) + { + WARN("mesh is NULL\n"); + return D3DERR_INVALIDCALL; + } + + if (weighting_method == (D3DXTANGENT_WEIGHT_EQUAL | D3DXTANGENT_WEIGHT_BY_AREA)) + { + WARN("D3DXTANGENT_WEIGHT_BY_AREA and D3DXTANGENT_WEIGHT_EQUAL are mutally exclusive\n"); + return D3DERR_INVALIDCALL; + } + + if (u_partial_out_semantic != D3DX_DEFAULT) + { + FIXME("tangent vectors computation is not supported\n"); + return E_NOTIMPL; + } + + if (v_partial_out_semantic != D3DX_DEFAULT) + { + FIXME("binormal vectors computation is not supported\n"); + return E_NOTIMPL; + } + + if (options & ~(D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_EQUAL | D3DXTANGENT_WEIGHT_BY_AREA)) + { + FIXME("unsupported options %#x\n", options); + return E_NOTIMPL; + } + + if (!(options & D3DXTANGENT_CALCULATE_NORMALS)) + { + FIXME("only normals computation is supported\n"); + return E_NOTIMPL; + } + + if (!(options & D3DXTANGENT_GENERATE_IN_PLACE) || mesh_out || vertex_mapping) + { + FIXME("only D3DXTANGENT_GENERATE_IN_PLACE is supported\n"); + return E_NOTIMPL; + } + + if (FAILED(hr = mesh->lpVtbl->GetDeclaration(mesh, declaration))) + return hr; + + for (i = 0; declaration[i].Stream != 0xff; i++) + { + if (declaration[i].Usage == D3DDECLUSAGE_POSITION && !declaration[i].UsageIndex) + position_declaration = &declaration[i]; + if (declaration[i].Usage == normal_out_semantic && declaration[i].UsageIndex == normal_out_index) + normal_declaration = &declaration[i]; + } + + if (!position_declaration || !normal_declaration) + return D3DERR_INVALIDCALL; + + if (normal_declaration->Type == D3DDECLTYPE_FLOAT3) + { + normal_size = sizeof(D3DXVECTOR3); + } + else if (normal_declaration->Type == D3DDECLTYPE_FLOAT4) + { + normal_size = sizeof(D3DXVECTOR4); + } + else + { + WARN("unsupported normals type %u\n", normal_declaration->Type); + return D3DERR_INVALIDCALL; + } + + num_faces = mesh->lpVtbl->GetNumFaces(mesh); + num_vertices = mesh->lpVtbl->GetNumVertices(mesh); + vertex_stride = mesh->lpVtbl->GetNumBytesPerVertex(mesh); + indices_are_32bit = mesh->lpVtbl->GetOptions(mesh) & D3DXMESH_32BIT; + + point_reps = HeapAlloc(GetProcessHeap(), 0, num_vertices * sizeof(*point_reps)); + if (!point_reps) + { + hr = E_OUTOFMEMORY; + goto done; + } + + if (adjacency) + { + if (FAILED(hr = mesh->lpVtbl->ConvertAdjacencyToPointReps(mesh, adjacency, point_reps))) + goto done; + } + else + { + for (i = 0; i < num_vertices; i++) + point_reps[i] = i; + } + + if (FAILED(hr = mesh->lpVtbl->LockIndexBuffer(mesh, 0, &indices))) + goto done; + + if (FAILED(hr = mesh->lpVtbl->LockVertexBuffer(mesh, 0, (void **)&vertices))) + goto done; + + for (i = 0; i < num_vertices; i++) + { + static const D3DXVECTOR4 default_vector = {0.0f, 0.0f, 0.0f, 1.0f}; + void *normal = vertices + normal_declaration->Offset + i * vertex_stride; + + memcpy(normal, &default_vector, normal_size); + } + + for (i = 0; i < num_faces; i++) + { + float denominator, weights[3]; + D3DXVECTOR3 a, b, cross, face_normal; + const DWORD face_indices[3] = + { + read_ib(indices, indices_are_32bit, 3 * i + 0), + read_ib(indices, indices_are_32bit, 3 * i + 1), + read_ib(indices, indices_are_32bit, 3 * i + 2) + }; + const D3DXVECTOR3 v0 = read_vec3(vertices, position_declaration, vertex_stride, face_indices[0]); + const D3DXVECTOR3 v1 = read_vec3(vertices, position_declaration, vertex_stride, face_indices[1]); + const D3DXVECTOR3 v2 = read_vec3(vertices, position_declaration, vertex_stride, face_indices[2]); + + D3DXVec3Cross(&cross, D3DXVec3Subtract(&a, &v0, &v1), D3DXVec3Subtract(&b, &v0, &v2)); + + switch (weighting_method) + { + case D3DXTANGENT_WEIGHT_EQUAL: + weights[0] = weights[1] = weights[2] = 1.0f; + break; + case D3DXTANGENT_WEIGHT_BY_AREA: + weights[0] = weights[1] = weights[2] = D3DXVec3Length(&cross); + break; + default: + /* weight by angle */ + denominator = D3DXVec3Length(&a) * D3DXVec3Length(&b); + if (!denominator) + weights[0] = 0.0f; + else + weights[0] = acosf(D3DXVec3Dot(&a, &b) / denominator); + + D3DXVec3Subtract(&a, &v1, &v0); + D3DXVec3Subtract(&b, &v1, &v2); + denominator = D3DXVec3Length(&a) * D3DXVec3Length(&b); + if (!denominator) + weights[1] = 0.0f; + else + weights[1] = acosf(D3DXVec3Dot(&a, &b) / denominator); + + D3DXVec3Subtract(&a, &v2, &v0); + D3DXVec3Subtract(&b, &v2, &v1); + denominator = D3DXVec3Length(&a) * D3DXVec3Length(&b); + if (!denominator) + weights[2] = 0.0f; + else + weights[2] = acosf(D3DXVec3Dot(&a, &b) / denominator); + + break; + } + + D3DXVec3Normalize(&face_normal, &cross); + + for (j = 0; j < 3; j++) + { + D3DXVECTOR3 normal; + DWORD rep_index = point_reps[face_indices[j]]; + D3DXVECTOR3 *rep_normal = vertex_element_vec3(vertices, normal_declaration, vertex_stride, rep_index); + + D3DXVec3Scale(&normal, &face_normal, weights[j]); + D3DXVec3Add(rep_normal, rep_normal, &normal); + } + } + + for (i = 0; i < num_vertices; i++) + { + DWORD rep_index = point_reps[i]; + D3DXVECTOR3 *normal = vertex_element_vec3(vertices, normal_declaration, vertex_stride, i); + D3DXVECTOR3 *rep_normal = vertex_element_vec3(vertices, normal_declaration, vertex_stride, rep_index); + + if (i == rep_index) + D3DXVec3Normalize(rep_normal, rep_normal); + else + *normal = *rep_normal; + } + + hr = D3D_OK; + +done: + if (vertices) + mesh->lpVtbl->UnlockVertexBuffer(mesh); + + if (indices) + mesh->lpVtbl->UnlockIndexBuffer(mesh); + + HeapFree(GetProcessHeap(), 0, point_reps); + + return hr; } /************************************************************************* * D3DXComputeNormals (D3DX9_36.@) */ -HRESULT WINAPI D3DXComputeNormals(ID3DXBaseMesh *mesh, const DWORD *adjacency) -{ - TRACE("mesh %p, adjacency %p.\n", mesh, adjacency); - - return D3DXComputeTangentFrameEx((ID3DXMesh *)mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, - D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS, - adjacency, -1.01f, -0.01f, -1.01f, NULL, NULL); +HRESULT WINAPI D3DXComputeNormals(struct ID3DXBaseMesh *mesh, const DWORD *adjacency) +{ + TRACE("mesh %p, adjacency %p\n", mesh, adjacency); + + if (mesh && (ID3DXMeshVtbl *)mesh->lpVtbl != &D3DXMesh_Vtbl) + { + ERR("Invalid virtual table\n"); + return D3DERR_INVALIDCALL; + } + + return D3DXComputeTangentFrameEx((ID3DXMesh *)mesh, D3DX_DEFAULT, 0, + D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DDECLUSAGE_NORMAL, 0, + D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS, + adjacency, -1.01f, -0.01f, -1.01f, NULL, NULL); } /************************************************************************* @@ -7274,11 +7543,20 @@ /************************************************************************* * D3DXIntersect (D3DX9_36.@) */ -HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *Mesh, const D3DXVECTOR3 *RayPos, const D3DXVECTOR3 *RayDir, BOOL *Hit, - DWORD *FaceIndex, FLOAT *U, FLOAT *V, FLOAT *Dist, ID3DXBuffer **AllHits, DWORD *CountOfHits) -{ - FIXME("Mesh %p, RayPos %p, RayDir %p, Hit %p, FaceIndex %p, U %p, V %p, Dist %p, AllHits %p, CountOfHits %p stub.\n", - Mesh, RayPos, RayDir, Hit, FaceIndex, U, V, Dist, AllHits, CountOfHits); +HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *mesh, const D3DXVECTOR3 *ray_pos, const D3DXVECTOR3 *ray_dir, + BOOL *hit, DWORD *face_index, float *u, float *v, float *distance, ID3DXBuffer **all_hits, DWORD *count_of_hits) +{ + FIXME("mesh %p, ray_pos %p, ray_dir %p, hit %p, face_index %p, u %p, v %p, distance %p, all_hits %p, " + "count_of_hits %p stub!\n", mesh, ray_pos, ray_dir, hit, face_index, u, v, distance, all_hits, count_of_hits); return E_NOTIMPL; } + +HRESULT WINAPI D3DXTessellateNPatches(ID3DXMesh *mesh, const DWORD *adjacency_in, float num_segs, + BOOL quadratic_normals, ID3DXMesh **mesh_out, ID3DXBuffer **adjacency_out) +{ + FIXME("mesh %p, adjacency_in %p, num_segs %f, quadratic_normals %d, mesh_out %p, adjacency_out %p stub.\n", + mesh, adjacency_in, num_segs, quadratic_normals, mesh_out, adjacency_out); + + return E_NOTIMPL; +} Modified: trunk/reactos/dll/directx/wine/d3dx9_36/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/shader.c [iso-8859-1] Sun Nov 22 15:41:58 2015 @@ -1122,7 +1122,7 @@ offset = min(desc->Elements - 1, offset); last = offset * desc->Rows * desc->Columns; - if ((is_pointer || (!is_pointer && inclass == D3DXPC_MATRIX_ROWS)) && desc->RegisterSet != D3DXRS_BOOL) + if ((is_pointer || inclass == D3DXPC_MATRIX_ROWS) && desc->RegisterSet != D3DXRS_BOOL) { set(table, device, &constant->constants[0], NULL, intype, size, incol, inclass, 0, is_pointer); } @@ -1162,7 +1162,7 @@ * E.g.: struct {int i; int n} s; * SetValue(device, "s", [1, 2], 8) => s = {1, 0}; */ - else if ((is_pointer || (!is_pointer && inclass == D3DXPC_MATRIX_ROWS)) && desc->RegisterSet != D3DXRS_BOOL) + else if ((is_pointer || inclass == D3DXPC_MATRIX_ROWS) && desc->RegisterSet != D3DXRS_BOOL) { last = set(table, device, &constant->constants[0], indata, intype, size, incol, inclass, index + last, is_pointer); @@ -2103,6 +2103,27 @@ return D3DXGetShaderConstantTableEx(byte_code, 0, constant_table); } +HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +{ + FIXME("device %p, size %u, linker %p: stub.\n", device, size, linker); + + if (linker) + *linker = NULL; + + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, ID3DXFragmentLinker **linker) +{ + FIXME("device %p, size %u, flags %#x, linker %p: stub.\n", device, size, flags, linker); + + if (linker) + *linker = NULL; + + return E_NOTIMPL; +} + HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count) { UINT i, sampler_count = 0; @@ -2157,7 +2178,7 @@ return E_OUTOFMEMORY; } -const DWORD* skip_instruction(const DWORD *byte_code, UINT shader_model) +static const DWORD* skip_instruction(const DWORD *byte_code, UINT shader_model) { TRACE("Shader model %u\n", shader_model); @@ -2177,13 +2198,13 @@ else { /* Handle remaining safe instructions */ - while (*++byte_code & (1 << 31)); + while (*++byte_code & (1u << 31)); } return byte_code; } -static UINT get_shader_semantics(const DWORD *byte_code, D3DXSEMANTIC *semantics, BOOL input) +static UINT get_shader_semantics(const DWORD *byte_code, D3DXSEMANTIC *semantics, DWORD type) { const DWORD *ptr = byte_code; UINT shader_model = (*ptr >> 8) & 0xff; @@ -2194,7 +2215,7 @@ while (*ptr != D3DSIO_END) { - if (*ptr & (1 << 31)) + if (*ptr & (1u << 31)) { FIXME("Opcode expected but got %#x\n", *ptr); return 0; @@ -2203,14 +2224,15 @@ { DWORD param1 = *++ptr; DWORD param2 = *++ptr; - DWORD usage = param1 & 0x1f; - DWORD usage_index = (param1 >> 16) & 0xf; - DWORD reg_type = (((param2 >> 11) & 0x3) << 3) | ((param2 >> 28) & 0x7); + DWORD usage = (param1 & D3DSP_DCL_USAGE_MASK) >> D3DSP_DCL_USAGE_SHIFT; + DWORD usage_index = (param1 & D3DSP_DCL_USAGEINDEX_MASK) >> D3DSP_DCL_USAGEINDEX_SHIFT; + DWORD reg_type = ((param2 & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2) + | ((param2 & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT); TRACE("D3DSIO_DCL param1: %#x, param2: %#x, usage: %u, usage_index: %u, reg_type: %u\n", param1, param2, usage, usage_index, reg_type); - if ((input && (reg_type == D3DSPR_INPUT)) || (!input && (reg_type == D3DSPR_OUTPUT))) + if (reg_type == type) { if (semantics) { @@ -2240,7 +2262,7 @@ if (!byte_code) return D3DERR_INVALIDCALL; - nb_semantics = get_shader_semantics(byte_code, semantics, TRUE); + nb_semantics = get_shader_semantics(byte_code, semantics, D3DSPR_INPUT); if (count) *count = nb_semantics; @@ -2258,7 +2280,7 @@ if (!byte_code) return D3DERR_INVALIDCALL; - nb_semantics = get_shader_semantics(byte_code, semantics, FALSE); + nb_semantics = get_shader_semantics(byte_code, semantics, D3DSPR_OUTPUT); if (count) *count = nb_semantics; Modified: trunk/reactos/dll/directx/wine/d3dx9_36/skin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/skin.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/skin.c [iso-8859-1] Sun Nov 22 15:41:58 2015 @@ -90,7 +90,7 @@ HeapFree(GetProcessHeap(), 0, skin->bones[i].vertices); HeapFree(GetProcessHeap(), 0, skin->bones[i].weights); } - HeapFree(GetProcessHeap(), 0, skin->bones); + if (skin->bones) HeapFree(GetProcessHeap(), 0, skin->bones); HeapFree(GetProcessHeap(), 0, skin); } @@ -570,3 +570,23 @@ return D3DXCreateSkinInfo(num_vertices, declaration, num_bones, skin_info); } + +HRESULT create_dummy_skin(ID3DXSkinInfo **iface) +{ + static const D3DVERTEXELEMENT9 empty_declaration = D3DDECL_END(); + struct d3dx9_skin_info *object = NULL; + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) return E_OUTOFMEMORY; + + object->ID3DXSkinInfo_iface.lpVtbl = &d3dx9_skin_info_vtbl; + object->ref = 1; + object->num_vertices = 0; + object->num_bones = 0; + object->vertex_declaration[0] = empty_declaration; + object->fvf = 0; + object->bones = NULL; + + *iface = &object->ID3DXSkinInfo_iface; + return D3D_OK; +} Modified: trunk/reactos/dll/directx/wine/d3dx9_36/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/surface.c [iso-8859-1] Sun Nov 22 15:41:58 2015 @@ -143,15 +143,15 @@ { unsigned int i; static const DWORD known_fourcc[] = { - MAKEFOURCC('U','Y','V','Y'), - MAKEFOURCC('Y','U','Y','2'), - MAKEFOURCC('R','G','B','G'), - MAKEFOURCC('G','R','G','B'), - MAKEFOURCC('D','X','T','1'), - MAKEFOURCC('D','X','T','2'), - MAKEFOURCC('D','X','T','3'), - MAKEFOURCC('D','X','T','4'), - MAKEFOURCC('D','X','T','5'), + D3DFMT_UYVY, + D3DFMT_YUY2, + D3DFMT_R8G8_B8G8, + D3DFMT_G8R8_G8B8, + D3DFMT_DXT1, + D3DFMT_DXT2, + D3DFMT_DXT3, + D3DFMT_DXT4, + D3DFMT_DXT5, D3DFMT_R16F, D3DFMT_G16R16F, D3DFMT_A16B16G16R16F, @@ -395,7 +395,7 @@ info->Width = header->width; info->Height = header->height; info->Depth = 1; - info->MipLevels = (header->flags & DDS_MIPMAPCOUNT) ? header->miplevels : 1; + info->MipLevels = header->miplevels ? header->miplevels : 1; info->Format = dds_pixel_format_to_d3dformat(&header->pixel_format); if (info->Format == D3DFMT_UNKNOWN) 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 15:41:58 2015 @@ -26,7 +26,7 @@ reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.7.47 -reactos/dll/directx/wine/d3dx9_24 => 43 # 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 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.7.47

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