Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 60289: [SOFT386] Implement the MOV AL/AX/EAX, off16/32 and MOV off16/32, AL/AX/EAX instructions.
by aandrejevic＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: aandrejevic Date: Sat Sep 21 18:44:59 2013 New Revision: 60289 URL: http://svn.reactos.org/svn/reactos?rev=60289&view=rev Log: [SOFT386] Implement the MOV AL/AX/EAX, off16/32 and MOV off16/32, AL/AX/EAX instructions. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sat Sep 21 18:44:59 2013 @@ -184,10 +184,10 @@ Soft386OpcodePopFlags, Soft386OpcodeSahf, Soft386OpcodeLahf, - NULL, // TODO: OPCODE 0xA0 NOT SUPPORTED - NULL, // TODO: OPCODE 0xA1 NOT SUPPORTED - NULL, // TODO: OPCODE 0xA2 NOT SUPPORTED - NULL, // TODO: OPCODE 0xA3 NOT SUPPORTED + Soft386OpcodeMovAlOffset, + Soft386OpcodeMovEaxOffset, + Soft386OpcodeMovOffsetAl, + Soft386OpcodeMovOffsetEax, NULL, // TODO: OPCODE 0xA4 NOT SUPPORTED NULL, // TODO: OPCODE 0xA5 NOT SUPPORTED NULL, // TODO: OPCODE 0xA6 NOT SUPPORTED @@ -4639,3 +4639,196 @@ return FALSE; } + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovAlOffset) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + ULONG Offset; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xA0); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + + if (Size) + { + if (!Soft386FetchDword(State, &Offset)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + USHORT WordOffset; + + if (!Soft386FetchWord(State, &WordOffset)) + { + /* Exception occurred */ + return FALSE; + } + + Offset = (ULONG)WordOffset; + } + + /* Read from memory */ + return Soft386ReadMemory(State, + (State->PrefixFlags & SOFT386_PREFIX_SEG) ? + State->SegmentOverride : SOFT386_REG_DS, + Offset, + FALSE, + &State->GeneralRegs[SOFT386_REG_EAX].LowByte, + sizeof(UCHAR)); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovEaxOffset) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xA1); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + + if (Size) + { + ULONG Offset; + + if (!Soft386FetchDword(State, &Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read from memory */ + return Soft386ReadMemory(State, + (State->PrefixFlags & SOFT386_PREFIX_SEG) ? + State->SegmentOverride : SOFT386_REG_DS, + Offset, + FALSE, + &State->GeneralRegs[SOFT386_REG_EAX].Long, + sizeof(ULONG)); + } + else + { + USHORT Offset; + + if (!Soft386FetchWord(State, &Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read from memory */ + return Soft386ReadMemory(State, + (State->PrefixFlags & SOFT386_PREFIX_SEG) ? + State->SegmentOverride : SOFT386_REG_DS, + Offset, + FALSE, + &State->GeneralRegs[SOFT386_REG_EAX].LowWord, + sizeof(USHORT)); + } +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovOffsetAl) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + ULONG Offset; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xA2); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + + if (Size) + { + if (!Soft386FetchDword(State, &Offset)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + USHORT WordOffset; + + if (!Soft386FetchWord(State, &WordOffset)) + { + /* Exception occurred */ + return FALSE; + } + + Offset = (ULONG)WordOffset; + } + + /* Write to memory */ + return Soft386WriteMemory(State, + (State->PrefixFlags & SOFT386_PREFIX_SEG) ? + State->SegmentOverride : SOFT386_REG_DS, + Offset, + &State->GeneralRegs[SOFT386_REG_EAX].LowByte, + sizeof(UCHAR)); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovOffsetEax) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xA3); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + + if (Size) + { + ULONG Offset; + + if (!Soft386FetchDword(State, &Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write to memory */ + return Soft386WriteMemory(State, + (State->PrefixFlags & SOFT386_PREFIX_SEG) ? + State->SegmentOverride : SOFT386_REG_DS, + Offset, + &State->GeneralRegs[SOFT386_REG_EAX].Long, + sizeof(ULONG)); + } + else + { + USHORT Offset; + + if (!Soft386FetchWord(State, &Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write to memory */ + return Soft386WriteMemory(State, + (State->PrefixFlags & SOFT386_PREFIX_SEG) ? + State->SegmentOverride : SOFT386_REG_DS, + Offset, + &State->GeneralRegs[SOFT386_REG_EAX].LowWord, + sizeof(USHORT)); + } +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Sat Sep 21 18:44:59 2013 @@ -132,5 +132,9 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeCall); SOFT386_OPCODE_HANDLER(Soft386OpcodeJmp); SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovAlOffset); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovEaxOffset); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovOffsetAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovOffsetEax); #endif // _OPCODES_H_

1 0

[hbelusca] 60288: [CSRSS]: Improve two dprints.
by hbelusca＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: hbelusca Date: Sat Sep 21 18:38:30 2013 New Revision: 60288 URL: http://svn.reactos.org/svn/reactos?rev=60288&view=rev Log: [CSRSS]: Improve two dprints. Modified: trunk/reactos/subsystems/win32/csrss/csrss.c Modified: trunk/reactos/subsystems/win32/csrss/csrss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.c [iso-8859-1] Sat Sep 21 18:38:30 2013 @@ -60,7 +60,7 @@ if (!NT_SUCCESS(Status)) { /* Raise a hard error */ - DPRINT1("CSRSS: Could not raise IOPL: %x\n", Status); + DPRINT1("CSRSS: Could not raise IOPL, Status: 0x%08lx\n", Status); #if 0 Status = NtRaiseHardError(STATUS_IO_PRIVILEGE_FAILED, 0, @@ -76,7 +76,7 @@ if (!NT_SUCCESS(Status)) { /* Kill us */ - DPRINT1("CSRSS: CsrServerInitialization failed:% lx\n", Status); + DPRINT1("CSRSS: Unable to initialize server, Status: 0x%08lx\n", Status); NtTerminateProcess(NtCurrentProcess(), Status); }

1 0

[hbelusca] 60287: [BASESRV] Stubplement BaseSrvNlsLogon and BaseSrvNlsUpdateRegistryCache needed by Windows-2k3's WINSRV.DLL . Their return value types are unknown, but the number of parameters was...
by hbelusca＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: hbelusca Date: Sat Sep 21 18:25:02 2013 New Revision: 60287 URL: http://svn.reactos.org/svn/reactos?rev=60287&view=rev Log: [BASESRV] Stubplement BaseSrvNlsLogon and BaseSrvNlsUpdateRegistryCache needed by Windows-2k3's WINSRV.DLL . Their return value types are unknown, but the number of parameters was obtained by reading http://wcwp.googlecode.com/svn/trunk/wcwp/bin/masm32/include/basesrv.inc . Modified: trunk/reactos/subsystems/win/basesrv/basesrv.spec trunk/reactos/subsystems/win/basesrv/nls.c Modified: trunk/reactos/subsystems/win/basesrv/basesrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/bas… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/basesrv.spec [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/basesrv.spec [iso-8859-1] Sat Sep 21 18:25:02 2013 @@ -1,2 +1,4 @@ @ stdcall BaseSetProcessCreateNotify(ptr) +@ stdcall BaseSrvNlsLogon(ptr) +@ stdcall BaseSrvNlsUpdateRegistryCache(ptr ptr) @ stdcall ServerDllInitialization(ptr) Modified: trunk/reactos/subsystems/win/basesrv/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/nls… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] Sat Sep 21 18:25:02 2013 @@ -350,4 +350,23 @@ return Status; } +/* PUBLIC APIS ****************************************************************/ + +NTSTATUS +NTAPI +BaseSrvNlsLogon(DWORD Unknown) +{ + DPRINT1("%s(%lu) not yet implemented\n", __FUNCTION__, Unknown); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +BaseSrvNlsUpdateRegistryCache(DWORD Unknown1, + DWORD Unknown2) +{ + DPRINT1("%s(%lu, %lu) not yet implemented\n", __FUNCTION__, Unknown1, Unknown2); + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */

1 0

[hbelusca] 60286: [USER32] Stubplement IsSETEnabled, needed when testing WINSRV.DLL from Windows 2k3 SP1/2. (this function determines whether the Shutdown Event Tracker is enabled, see http://undoc...
by hbelusca＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: hbelusca Date: Sat Sep 21 17:52:06 2013 New Revision: 60286 URL: http://svn.reactos.org/svn/reactos?rev=60286&view=rev Log: [USER32] Stubplement IsSETEnabled, needed when testing WINSRV.DLL from Windows 2k3 SP1/2. (this function determines whether the Shutdown Event Tracker is enabled, see http://undoc.airesoft.co.uk/user32.dll/IsSETEnabled.php for more information). Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c trunk/reactos/win32ss/user/user32/user32.spec Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] Sat Sep 21 17:52:06 2013 @@ -553,6 +553,20 @@ WINAPI GetReasonTitleFromReasonCode(DWORD dw1, DWORD dw2, DWORD dw3) { + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +IsSETEnabled(VOID) +{ + /* + * Determines whether the Shutdown Event Tracker is enabled. + * + * See http://undoc.airesoft.co.uk/user32.dll/IsSETEnabled.php + * for more information. + */ UNIMPLEMENTED; return FALSE; } Modified: trunk/reactos/win32ss/user/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/user32… ============================================================================== --- trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] Sat Sep 21 17:52:06 2013 @@ -429,6 +429,7 @@ @ stdcall IsMenu(long) @ stdcall IsRectEmpty(ptr) @ stdcall IsServerSideWindow(long) +@ stdcall IsSETEnabled() @ stdcall IsWinEventHookInstalled(long) @ stdcall IsWindow(long) @ stdcall IsWindowEnabled(long)

1 0

[jgardou] 60285: [CMAKE] - Update base addresses accordingly to latest opengl32/mesa updates
by jgardou＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: jgardou Date: Sat Sep 21 15:42:48 2013 New Revision: 60285 URL: http://svn.reactos.org/svn/reactos?rev=60285&view=rev Log: [CMAKE] - Update base addresses accordingly to latest opengl32/mesa updates Modified: trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Sat Sep 21 15:42:48 2013 @@ -40,7 +40,7 @@ set(baseaddress_cabinet 0x75a60000) set(baseaddress_dsound 0x759f0000) set(baseaddress_glu32 0x758e0000) -set(baseaddress_opengl32 0x758a0000) +set(baseaddress_opengl32 0x72bc0000) set(baseaddress_riched20 0x75810000) set(baseaddress_smdll 0x757f0000) set(baseaddress_userenv 0x757a0000) @@ -163,7 +163,6 @@ set(baseaddress_mciqtz32 0x73420000) set(baseaddress_mciseq 0x733f0000) set(baseaddress_mciwave 0x733c0000) -set(baseaddress_mesa32 0x72bc0000) set(baseaddress_midimap 0x72b90000) set(baseaddress_mlang 0x72b50000) set(baseaddress_mmdrv 0x72b20000)

1 0

[jgardou] 60284: [HIVESFT] - remove reference to the not-used not-built-anymore mesa32 opengl ICD Thank you, our relationship was great, but somehow ReactOS matured and you are not in the plan anym...
by jgardou＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: jgardou Date: Sat Sep 21 15:30:42 2013 New Revision: 60284 URL: http://svn.reactos.org/svn/reactos?rev=60284&view=rev Log: [HIVESFT] - remove reference to the not-used not-built-anymore mesa32 opengl ICD Thank you, our relationship was great, but somehow ReactOS matured and you are not in the plan anymore. Fare thee well. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sat Sep 21 15:30:42 2013 @@ -224,13 +224,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI Extensions","wmv",0x00000002,"MPEGVideo" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI Extensions","wmx",0x00000002,"MPEGVideo" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI Extensions","wvx",0x00000002,"MPEGVideo" - -; Mesa OpenGL Driver -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers","DefaultDriver",0x00000000,"Mesa" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","Version",0x00010001,0x00000002 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","Dll",0x00000000,"mesa32" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","DriverVersion",0x00010001,0x00000001 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","Flags",0x00010001,0x00000001 ; User Profile List HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList",,0x00000012

1 0

[jgardou] 60283: [MESA] - Remove many things. Look at the log if you really care
by jgardou＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: jgardou Date: Sat Sep 21 15:25:09 2013 New Revision: 60283 URL: http://svn.reactos.org/svn/reactos?rev=60283&view=rev Log: [MESA] - Remove many things. Look at the log if you really care Added: trunk/reactos/dll/opengl/mesa/src/mesa/main/u_format_r11g11b10f.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/main/u_format_rgb9e5.h (with props) Removed: trunk/reactos/dll/opengl/mesa/SConstruct trunk/reactos/dll/opengl/mesa/src/SConscript trunk/reactos/dll/opengl/mesa/src/gallium/ trunk/reactos/dll/opengl/mesa/src/mapi/glapi/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mapi/glapi/Makefile trunk/reactos/dll/opengl/mesa/src/mapi/glapi/SConscript trunk/reactos/dll/opengl/mesa/src/mapi/glapi/gen/ trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi.c trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_dispatch.c trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_entrypoint.c trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_gentable.c trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_getproc.c trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_mapi_tmp.h trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_nop.c trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_priv.h trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_sparc.S trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_x86-64.S trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_x86.S trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapitemp.h trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glprocs.h trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glthread.c trunk/reactos/dll/opengl/mesa/src/mapi/glapi/sources.mak trunk/reactos/dll/opengl/mesa/src/mapi/mapi/entry.c trunk/reactos/dll/opengl/mesa/src/mapi/mapi/entry.h trunk/reactos/dll/opengl/mesa/src/mapi/mapi/entry_x86-64_tls.h trunk/reactos/dll/opengl/mesa/src/mapi/mapi/entry_x86_tls.h trunk/reactos/dll/opengl/mesa/src/mapi/mapi/entry_x86_tsd.h trunk/reactos/dll/opengl/mesa/src/mapi/mapi/mapi.c trunk/reactos/dll/opengl/mesa/src/mapi/mapi/mapi.h trunk/reactos/dll/opengl/mesa/src/mapi/mapi/mapi_abi.py trunk/reactos/dll/opengl/mesa/src/mapi/mapi/mapi_glapi.c trunk/reactos/dll/opengl/mesa/src/mapi/mapi/mapi_tmp.h trunk/reactos/dll/opengl/mesa/src/mapi/mapi/sources.mak trunk/reactos/dll/opengl/mesa/src/mapi/mapi/stub.c trunk/reactos/dll/opengl/mesa/src/mapi/mapi/stub.h trunk/reactos/dll/opengl/mesa/src/mapi/mapi/table.c trunk/reactos/dll/opengl/mesa/src/mapi/mapi/table.h trunk/reactos/dll/opengl/mesa/src/mapi/mapi/u_current.c trunk/reactos/dll/opengl/mesa/src/mapi/mapi/u_current.h trunk/reactos/dll/opengl/mesa/src/mapi/mapi/u_execmem.c trunk/reactos/dll/opengl/mesa/src/mapi/mapi/u_execmem.h trunk/reactos/dll/opengl/mesa/src/mapi/mapi/u_macros.h trunk/reactos/dll/opengl/mesa/src/mapi/mapi/u_thread.c trunk/reactos/dll/opengl/mesa/src/mesa/drivers/SConscript trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/descrip.mms trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/ trunk/reactos/dll/opengl/mesa/src/mesa/main/APIspec.dtd trunk/reactos/dll/opengl/mesa/src/mesa/main/APIspec.py trunk/reactos/dll/opengl/mesa/src/mesa/main/APIspec.xml trunk/reactos/dll/opengl/mesa/src/mesa/main/APIspecutil.py trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec_es1.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec_es2.c trunk/reactos/dll/opengl/mesa/src/mesa/main/descrip.mms trunk/reactos/dll/opengl/mesa/src/mesa/main/es_generator.py trunk/reactos/dll/opengl/mesa/src/mesa/math/descrip.mms trunk/reactos/dll/opengl/mesa/src/mesa/program/descrip.mms trunk/reactos/dll/opengl/mesa/src/mesa/state_tracker/ trunk/reactos/dll/opengl/mesa/src/mesa/swrast/NOTES trunk/reactos/dll/opengl/mesa/src/mesa/swrast/descrip.mms trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/NOTES trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/descrip.mms trunk/reactos/dll/opengl/mesa/src/mesa/tnl/NOTES trunk/reactos/dll/opengl/mesa/src/mesa/tnl/descrip.mms trunk/reactos/dll/opengl/mesa/src/mesa/vbo/descrip.mms trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/Makefile trunk/reactos/dll/opengl/mesa/src/mesa/x86/Makefile Modified: trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/main/format_pack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/format_unpack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/mipmap.c trunk/reactos/dll/opengl/mesa/src/mesa/main/pack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/opengl/mesa/SConstruct URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/SConstruct… Modified: trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/CMakeL… Removed: trunk/reactos/dll/opengl/mesa/src/SConscript URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/SConsc… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/SConscript URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_entrypoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_gentable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_getproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_mapi_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_nop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_sparc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_x86-64.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_x86.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapitemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glprocs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/sources.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/entry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/entry_x86-64_tls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/entry_x86_tls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/entry_x86_tsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/mapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/mapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/mapi_abi.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/mapi_glapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/mapi_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/sources.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/stub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/stub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/table.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/u_current.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/u_current.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/u_execmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/u_execmem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/u_macros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Removed: trunk/reactos/dll/opengl/mesa/src/mapi/mapi/u_thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/C… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/SConscript URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/APIspec.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/APIspec.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/APIspec.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/APIspecutil.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec_es1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec_es2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/es_generator.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/format_pack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/format_unpack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/pack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Added: trunk/reactos/dll/opengl/mesa/src/mesa/main/u_format_r11g11b10f.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Added: trunk/reactos/dll/opengl/mesa/src/mesa/main/u_format_rgb9e5.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/math/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/program/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/NOTES URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/NOTES URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/NOTES URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/x86/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x…

1 0

[akhaldi] 60282: [MSACM32] * Remove this unused empty file.
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 15:12:18 2013 New Revision: 60282 URL: http://svn.reactos.org/svn/reactos?rev=60282&view=rev Log: [MSACM32] * Remove this unused empty file. Removed: trunk/reactos/dll/win32/msacm32/msacm.spec.def Removed: trunk/reactos/dll/win32/msacm32/msacm.spec.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm.sp… ============================================================================== (empty)

1 0

[jgardou] 60281: [OPENGL32] - Blow up the old implementation and enable the new one - Software implementation now relies on mesa in the form of a mesa "driver", no longer on osmesa (which inspired ...
by jgardou＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: jgardou Date: Sat Sep 21 14:17:59 2013 New Revision: 60281 URL: http://svn.reactos.org/svn/reactos?rev=60281&view=rev Log: [OPENGL32] - Blow up the old implementation and enable the new one - Software implementation now relies on mesa in the form of a mesa "driver", no longer on osmesa (which inspired the current implementation) - Add nice and fast x86 trampolines to forward opengl API calls to the current thread's dispatch table Some tiny bits are missing, but the DLL is fully functional, so let's use it. Added: trunk/reactos/dll/opengl/opengl32/ - copied from r60248, trunk/reactos/dll/opengl/opengl32_new/ trunk/reactos/dll/opengl/opengl32/glapi_x86.s (with props) Removed: trunk/reactos/dll/opengl/opengl32_new/ Modified: trunk/reactos/dll/opengl/CMakeLists.txt trunk/reactos/dll/opengl/opengl32/CMakeLists.txt trunk/reactos/dll/opengl/opengl32/apistubs.c trunk/reactos/dll/opengl/opengl32/dllmain.c trunk/reactos/dll/opengl/opengl32/glfuncs.h trunk/reactos/dll/opengl/opengl32/icdload.c trunk/reactos/dll/opengl/opengl32/opengl32.h trunk/reactos/dll/opengl/opengl32/swimpl.c trunk/reactos/dll/opengl/opengl32/wgl.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/CMakeLists.txt?… Modified: trunk/reactos/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/CMakeL… Modified: trunk/reactos/dll/opengl/opengl32/apistubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/apistu… Modified: trunk/reactos/dll/opengl/opengl32/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/dllmai… Added: trunk/reactos/dll/opengl/opengl32/glapi_x86.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/glapi_… Modified: trunk/reactos/dll/opengl/opengl32/glfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/glfunc… Modified: trunk/reactos/dll/opengl/opengl32/icdload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/icdloa… Modified: trunk/reactos/dll/opengl/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/opengl… Modified: trunk/reactos/dll/opengl/opengl32/swimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/swimpl… Modified: trunk/reactos/dll/opengl/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/wgl.c?…

1 0

[akhaldi] 60280: [MSACM32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 14:16:27 2013 New Revision: 60280 URL: http://svn.reactos.org/svn/reactos?rev=60280&view=rev Log: [MSACM32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msacm32/CMakeLists.txt trunk/reactos/dll/win32/msacm32/driver.c trunk/reactos/dll/win32/msacm32/format.c trunk/reactos/dll/win32/msacm32/internal.c trunk/reactos/dll/win32/msacm32/msacm32_main.c trunk/reactos/dll/win32/msacm32/pcmconverter.c trunk/reactos/dll/win32/msacm32/stream.c trunk/reactos/dll/win32/msacm32/wineacm.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] Sat Sep 21 14:16:27 2013 @@ -16,8 +16,7 @@ add_library(msacm32 SHARED ${SOURCE}) set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE) target_link_libraries(msacm32 wine) -add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll) -add_dependencies(msacm32 psdk) +add_importlibs(msacm32 advapi32 user32 winmm msvcrt kernel32 ntdll) add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all) add_subdirectory(msacm32.drv) Modified: trunk/reactos/dll/win32/msacm32/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/driver.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/driver.c [iso-8859-1] Sat Sep 21 14:16:27 2013 @@ -170,7 +170,7 @@ } break; default: - ERR("invalid flag value 0x%08lx for fdwAdd\n", fdwAdd & ACM_DRIVERADDF_TYPEMASK); + ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd & ACM_DRIVERADDF_TYPEMASK); return MMSYSERR_INVALFLAG; } Modified: trunk/reactos/dll/win32/msacm32/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/format.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/format.c [iso-8859-1] Sat Sep 21 14:16:27 2013 @@ -1,5 +1,3 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ - /* * MSACM32 library * @@ -41,21 +39,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(msacm); -static PACMFORMATCHOOSEA afc; - struct MSACM_FillFormatData { HWND hWnd; #define WINE_ACMFF_TAG 0 #define WINE_ACMFF_FORMAT 1 #define WINE_ACMFF_WFX 2 int mode; - char szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; - PACMFORMATCHOOSEA afc; + WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; + PACMFORMATCHOOSEW afc; DWORD ret; }; static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, - PACMFORMATTAGDETAILSA paftd, + PACMFORMATTAGDETAILSW paftd, DWORD_PTR dwInstance, DWORD fdwSupport) { @@ -63,21 +59,21 @@ switch (affd->mode) { case WINE_ACMFF_TAG: - if (SendDlgItemMessageA(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + if (SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_FINDSTRINGEXACT, -1, (LPARAM)paftd->szFormatTag) == CB_ERR) - SendDlgItemMessageA(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_ADDSTRING, 0, (LPARAM)paftd->szFormatTag); break; case WINE_ACMFF_FORMAT: - if (strcmp(affd->szFormatTag, paftd->szFormatTag) == 0) { + if (strcmpW(affd->szFormatTag, paftd->szFormatTag) == 0) { HACMDRIVER had; if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { - ACMFORMATDETAILSA afd; - unsigned int i, len; + ACMFORMATDETAILSW afd; + unsigned int i, len; MMRESULT mmr; - char buffer[ACMFORMATDETAILS_FORMAT_CHARS+16]; + WCHAR buffer[ACMFORMATDETAILS_FORMAT_CHARS+16]; afd.cbStruct = sizeof(afd); afd.dwFormatTag = paftd->dwFormatTag; @@ -88,42 +84,45 @@ afd.cbwfx = paftd->cbFormatSize; for (i = 0; i < paftd->cStandardFormats; i++) { + static const WCHAR fmtW[] = {'%','d',' ','K','o','/','s','\0'}; + int j; + afd.dwFormatIndex = i; - mmr = acmFormatDetailsA(had, &afd, ACM_FORMATDETAILSF_INDEX); + mmr = acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_INDEX); if (mmr == MMSYSERR_NOERROR) { - lstrcpynA(buffer, afd.szFormat, ACMFORMATTAGDETAILS_FORMATTAG_CHARS + 1); - len = strlen(buffer); - memset(buffer+len, ' ', ACMFORMATTAGDETAILS_FORMATTAG_CHARS - len); - wsprintfA(buffer + ACMFORMATTAGDETAILS_FORMATTAG_CHARS, - "%d Ko/s", - (afd.pwfx->nAvgBytesPerSec + 512) / 1024); - SendDlgItemMessageA(affd->hWnd, - IDD_ACMFORMATCHOOSE_CMB_FORMAT, - CB_ADDSTRING, 0, (LPARAM)buffer); + lstrcpynW(buffer, afd.szFormat, ACMFORMATTAGDETAILS_FORMATTAG_CHARS + 1); + len = strlenW(buffer); + for (j = len; j < ACMFORMATTAGDETAILS_FORMATTAG_CHARS; j++) + buffer[j] = ' '; + wsprintfW(buffer + ACMFORMATTAGDETAILS_FORMATTAG_CHARS, + fmtW, (afd.pwfx->nAvgBytesPerSec + 512) / 1024); + SendDlgItemMessageW(affd->hWnd, + IDD_ACMFORMATCHOOSE_CMB_FORMAT, + CB_ADDSTRING, 0, (LPARAM)buffer); } } acmDriverClose(had, 0); - SendDlgItemMessageA(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, + SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0); HeapFree(MSACM_hHeap, 0, afd.pwfx); } } break; case WINE_ACMFF_WFX: - if (strcmp(affd->szFormatTag, paftd->szFormatTag) == 0) { + if (strcmpW(affd->szFormatTag, paftd->szFormatTag) == 0) { HACMDRIVER had; if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { - ACMFORMATDETAILSA afd; + ACMFORMATDETAILSW afd; afd.cbStruct = sizeof(afd); afd.dwFormatTag = paftd->dwFormatTag; afd.pwfx = affd->afc->pwfx; afd.cbwfx = affd->afc->cbwfx; - afd.dwFormatIndex = SendDlgItemMessageA(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, + afd.dwFormatIndex = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_GETCURSEL, 0, 0); - affd->ret = acmFormatDetailsA(had, &afd, ACM_FORMATDETAILSF_INDEX); + affd->ret = acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_INDEX); acmDriverClose(had, 0); return TRUE; } @@ -138,7 +137,7 @@ static BOOL MSACM_FillFormatTags(HWND hWnd) { - ACMFORMATTAGDETAILSA aftd; + ACMFORMATTAGDETAILSW aftd; struct MSACM_FillFormatData affd; memset(&aftd, 0, sizeof(aftd)); @@ -147,37 +146,37 @@ affd.hWnd = hWnd; affd.mode = WINE_ACMFF_TAG; - acmFormatTagEnumA(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); - SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_SETCURSEL, 0, 0); + acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_SETCURSEL, 0, 0); return TRUE; } static BOOL MSACM_FillFormat(HWND hWnd) { - ACMFORMATTAGDETAILSA aftd; + ACMFORMATTAGDETAILSW aftd; struct MSACM_FillFormatData affd; - SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_RESETCONTENT, 0, 0); + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_RESETCONTENT, 0, 0); memset(&aftd, 0, sizeof(aftd)); aftd.cbStruct = sizeof(aftd); affd.hWnd = hWnd; affd.mode = WINE_ACMFF_FORMAT; - SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_GETLBTEXT, - SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_GETCURSEL, 0, 0), (LPARAM)affd.szFormatTag); - acmFormatTagEnumA(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); - SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0); + acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0); return TRUE; } -static MMRESULT MSACM_GetWFX(HWND hWnd, PACMFORMATCHOOSEA afc) -{ - ACMFORMATTAGDETAILSA aftd; +static MMRESULT MSACM_GetWFX(HWND hWnd, PACMFORMATCHOOSEW afc) +{ + ACMFORMATTAGDETAILSW aftd; struct MSACM_FillFormatData affd; memset(&aftd, 0, sizeof(aftd)); @@ -187,30 +186,36 @@ affd.mode = WINE_ACMFF_WFX; affd.afc = afc; affd.ret = MMSYSERR_NOERROR; - SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_GETLBTEXT, - SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_GETCURSEL, 0, 0), (LPARAM)affd.szFormatTag); - acmFormatTagEnumA(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); + acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); return affd.ret; } +static const WCHAR fmt_prop[] = {'a','c','m','p','r','o','p','\0'}; + static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, - WPARAM wParam, LPARAM lParam) -{ - - TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam ); + WPARAM wParam, LPARAM lParam) +{ + PACMFORMATCHOOSEW afc = (PACMFORMATCHOOSEW)GetPropW(hWnd, fmt_prop); + + TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam); switch (msg) { case WM_INITDIALOG: - afc = (PACMFORMATCHOOSEA)lParam; + afc = (PACMFORMATCHOOSEW)lParam; + SetPropW(hWnd, fmt_prop, (HANDLE)afc); MSACM_FillFormatTags(hWnd); MSACM_FillFormat(hWnd); if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| - ACMFORMATCHOOSE_STYLEF_SHOWHELP)) != 0) - FIXME("Unsupported style %08x\n", ((PACMFORMATCHOOSEA)lParam)->fdwStyle); + ACMFORMATCHOOSE_STYLEF_SHOWHELP| + ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE| + ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0) + FIXME("Unsupported style %08x\n", afc->fdwStyle); if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP)) ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE); return TRUE; @@ -236,8 +241,8 @@ break; case IDD_ACMFORMATCHOOSE_BTN_HELP: if (afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP) - SendMessageA(afc->hwndOwner, - RegisterWindowMessageA(ACMHELPMSGSTRINGA), 0L, 0L); + SendMessageW(afc->hwndOwner, + RegisterWindowMessageW(ACMHELPMSGSTRINGW), 0L, 0L); break; default: @@ -248,15 +253,15 @@ break; case WM_CONTEXTMENU: if (afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_CONTEXTHELP) - SendMessageA(afc->hwndOwner, - RegisterWindowMessageA(ACMHELPMSGCONTEXTMENUA), + SendMessageW(afc->hwndOwner, + RegisterWindowMessageW(ACMHELPMSGCONTEXTMENUW), wParam, lParam); break; #if defined(WM_CONTEXTHELP) case WM_CONTEXTHELP: if (afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_CONTEXTHELP) - SendMessageA(afc->hwndOwner, - RegisterWindowMessageA(ACMHELPMSGCONTEXTHELPA), + SendMessageW(afc->hwndOwner, + RegisterWindowMessageW(ACMHELPMSGCONTEXTHELPW), wParam, lParam); break; #endif @@ -273,18 +278,94 @@ */ MMRESULT WINAPI acmFormatChooseA(PACMFORMATCHOOSEA pafmtc) { - return DialogBoxParamA(MSACM_hInstance32, MAKEINTRESOURCEA(DLG_ACMFORMATCHOOSE_ID), + ACMFORMATCHOOSEW afcw; + MMRESULT ret; + LPWSTR title = NULL; + LPWSTR name = NULL; + LPWSTR templ = NULL; + DWORD sz; + + afcw.cbStruct = sizeof(afcw); + afcw.fdwStyle = pafmtc->fdwStyle; + afcw.hwndOwner = pafmtc->hwndOwner; + afcw.pwfx = pafmtc->pwfx; + afcw.cbwfx = pafmtc->cbwfx; + if (pafmtc->pszTitle) + { + sz = MultiByteToWideChar(CP_ACP, 0, pafmtc->pszTitle, -1, NULL, 0); + if (!(title = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)))) + { + ret = MMSYSERR_NOMEM; + goto done; + } + MultiByteToWideChar(CP_ACP, 0, pafmtc->pszTitle, -1, title, sz); + } + afcw.pszTitle = title; + if (pafmtc->pszName) + { + sz = MultiByteToWideChar(CP_ACP, 0, pafmtc->pszName, -1, NULL, 0); + if (!(name = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)))) + { + ret = MMSYSERR_NOMEM; + goto done; + } + MultiByteToWideChar(CP_ACP, 0, pafmtc->pszName, -1, name, sz); + } + afcw.pszName = name; + afcw.cchName = pafmtc->cchName; + afcw.fdwEnum = pafmtc->fdwEnum; + afcw.pwfxEnum = pafmtc->pwfxEnum; + afcw.hInstance = pafmtc->hInstance; + if (pafmtc->pszTemplateName) + { + sz = MultiByteToWideChar(CP_ACP, 0, pafmtc->pszTemplateName, -1, NULL, 0); + if (!(templ = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)))) + { + ret = MMSYSERR_NOMEM; + goto done; + } + MultiByteToWideChar(CP_ACP, 0, pafmtc->pszTemplateName, -1, templ, sz); + } + afcw.pszTemplateName = templ; + /* FIXME: hook procs not supported yet */ + if (pafmtc->pfnHook) + { + FIXME("Unsupported hook procs\n"); + ret = MMSYSERR_NOTSUPPORTED; + goto done; + } + ret = acmFormatChooseW(&afcw); + if (ret == MMSYSERR_NOERROR) + { + WideCharToMultiByte(CP_ACP, 0, afcw.szFormatTag, -1, pafmtc->szFormatTag, sizeof(pafmtc->szFormatTag), + NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, afcw.szFormat, -1, pafmtc->szFormat, sizeof(pafmtc->szFormat), + NULL, NULL); + if (pafmtc->pszName) + WideCharToMultiByte(CP_ACP, 0, afcw.pszName, -1, pafmtc->pszName, pafmtc->cchName, NULL, NULL); + } +done: + HeapFree(GetProcessHeap(), 0, title); + HeapFree(GetProcessHeap(), 0, name); + HeapFree(GetProcessHeap(), 0, templ); + return ret; +} + +/*********************************************************************** + * acmFormatChooseW (MSACM32.@) + */ +MMRESULT WINAPI acmFormatChooseW(PACMFORMATCHOOSEW pafmtc) +{ + if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE) + return DialogBoxIndirectParamW(MSACM_hInstance32, (LPCDLGTEMPLATEW)pafmtc->hInstance, + pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); + + if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE) + return DialogBoxParamW(pafmtc->hInstance, pafmtc->pszTemplateName, + pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); + + return DialogBoxParamW(MSACM_hInstance32, MAKEINTRESOURCEW(DLG_ACMFORMATCHOOSE_ID), pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); -} - -/*********************************************************************** - * acmFormatChooseW (MSACM32.@) - */ -MMRESULT WINAPI acmFormatChooseW(PACMFORMATCHOOSEW pafmtc) -{ - FIXME("(%p): stub\n", pafmtc); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; } /*********************************************************************** @@ -815,12 +896,12 @@ ACMFORMATTAGENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum) { - PWINE_ACMDRIVERID padid; - unsigned int i; - BOOL bPcmDone = FALSE; + PWINE_ACMDRIVERID padid; + unsigned int i; + BOOL bPcmDone = FALSE; TRACE("(%p, %p, %p, %ld, %d)\n", - had, paftd, fnCallback, dwInstance, fdwEnum); + had, paftd, fnCallback, dwInstance, fdwEnum); if (!paftd) return MMSYSERR_INVALPARAM; @@ -841,63 +922,60 @@ /* if (had) FIXME("had != NULL, not supported\n"); */ if (had) { - - if (acmDriverID((HACMOBJ)had, (HACMDRIVERID *)&padid, 0) != MMSYSERR_NOERROR) - return MMSYSERR_INVALHANDLE; - - for (i = 0; i < padid->cFormatTags; i++) { - paftd->dwFormatTagIndex = i; - if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, - (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { - if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { - if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); - /* (WS) I'm preserving this PCM hack since it seems to be - * correct. Please notice this block was borrowed from - * below. - */ - if (bPcmDone) continue; - bPcmDone = TRUE; - } - if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) - return MMSYSERR_NOERROR; - } - } - - } - + if (acmDriverID((HACMOBJ)had, (HACMDRIVERID *)&padid, 0) != MMSYSERR_NOERROR) + return MMSYSERR_INVALHANDLE; + + for (i = 0; i < padid->cFormatTags; i++) { + paftd->dwFormatTagIndex = i; + if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, + (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { + if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { + if (paftd->szFormatTag[0] == 0) + MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + /* (WS) I'm preserving this PCM hack since it seems to be + * correct. Please notice this block was borrowed from + * below. + */ + if (bPcmDone) continue; + bPcmDone = TRUE; + } + if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) + return MMSYSERR_NOERROR; + } + } + } /* if had==0 then search for the first suitable driver */ else { - for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) { - /* should check for codec only */ - if (!(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) && - acmDriverOpen(&had, (HACMDRIVERID)padid, 0) == MMSYSERR_NOERROR) { - for (i = 0; i < padid->cFormatTags; i++) { - paftd->dwFormatTagIndex = i; - if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, - (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { - if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { - if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); - /* FIXME (EPP): I'm not sure this is the correct - * algorithm (should make more sense to apply the same - * for all already loaded formats, but this will do - * for now - */ - if (bPcmDone) continue; - bPcmDone = TRUE; - } - if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) { - acmDriverClose(had, 0); - return MMSYSERR_NOERROR; - } - } - } - acmDriverClose(had, 0); - } - } + for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) { + /* should check for codec only */ + if (!(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) && + acmDriverOpen(&had, (HACMDRIVERID)padid, 0) == MMSYSERR_NOERROR) { + for (i = 0; i < padid->cFormatTags; i++) { + paftd->dwFormatTagIndex = i; + if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, + (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { + if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { + if (paftd->szFormatTag[0] == 0) + MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + /* FIXME (EPP): I'm not sure this is the correct + * algorithm (should make more sense to apply the same + * for all already loaded formats, but this will do + * for now + */ + if (bPcmDone) continue; + bPcmDone = TRUE; + } + if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) { + acmDriverClose(had, 0); + return MMSYSERR_NOERROR; + } + } + } + acmDriverClose(had, 0); + } + } } return MMSYSERR_NOERROR; } Modified: trunk/reactos/dll/win32/msacm32/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/internal… ============================================================================== --- trunk/reactos/dll/win32/msacm32/internal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/internal.c [iso-8859-1] Sat Sep 21 14:16:27 2013 @@ -362,8 +362,8 @@ 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'D','r','i','v','e','r','s','3','2','\0'}; - DWORD i, cnt = 0, bufLen, lRet; - WCHAR buf[2048], *name, *s; + DWORD i, cnt, bufLen, lRet, type; + WCHAR buf[2048], valname[64], *name, *s; FILETIME lastWrite; HKEY hKey; @@ -382,6 +382,15 @@ if (!(name = strchrW(buf, '='))) continue; *name = 0; MSACM_RegisterDriver(buf, name + 1, 0); + } + i = 0; + cnt = sizeof(valname) / sizeof(*valname); + bufLen = sizeof(buf); + while(RegEnumValueW(hKey, i, valname, &cnt, 0, + &type, (BYTE*)buf, &bufLen) == ERROR_SUCCESS){ + if(!strncmpiW(valname, msacmW, sizeof(msacmW) / sizeof(*msacmW))) + MSACM_RegisterDriver(valname, buf, 0); + ++i; } RegCloseKey( hKey ); } Modified: trunk/reactos/dll/win32/msacm32/msacm32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32_… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32_main.c [iso-8859-1] Sat Sep 21 14:16:27 2013 @@ -57,9 +57,8 @@ break; case DLL_PROCESS_DETACH: MSACM_UnregisterAllDrivers(); + if (lpvReserved) break; HeapDestroy(MSACM_hHeap); - MSACM_hHeap = NULL; - MSACM_hInstance32 = NULL; break; default: break; @@ -89,6 +88,7 @@ return 0x04000565; /* 4.0.1381 */ default: FIXME("%x not supported\n", version.dwPlatformId); + /* fall through */ case VER_PLATFORM_WIN32_WINDOWS: return 0x04030000; /* 4.3.0 */ } Modified: trunk/reactos/dll/win32/msacm32/pcmconverter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/pcmconve… ============================================================================== --- trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] Sat Sep 21 14:16:27 2013 @@ -157,7 +157,7 @@ /*********************************************************************** * R16 * - * Read a 16 bit sample (correctly handles endianess) + * Read a 16 bit sample (correctly handles endianness) */ static inline short R16(const unsigned char* src) { @@ -167,7 +167,7 @@ /*********************************************************************** * W16 * - * Write a 16 bit sample (correctly handles endianess) + * Write a 16 bit sample (correctly handles endianness) */ static inline void W16(unsigned char* dst, short s) { Modified: trunk/reactos/dll/win32/msacm32/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/stream.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] Sat Sep 21 14:16:27 2013 @@ -259,6 +259,7 @@ TRACE("%s => %08x\n", debugstr_w(wadi->pszDriverAlias), ret); if (ret == MMSYSERR_NOERROR) { if (fdwOpen & ACM_STREAMOPENF_QUERY) { + MSACM_Message((HACMDRIVER)wad, ACMDM_STREAM_CLOSE, (LPARAM)&was->drvInst, 0); acmDriverClose(had, 0L); } break; Modified: trunk/reactos/dll/win32/msacm32/wineacm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/wineacm.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/wineacm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/wineacm.h [iso-8859-1] Sat Sep 21 14:16:27 2013 @@ -110,43 +110,43 @@ } WINE_ACMNOTIFYWND; /* From internal.c */ -extern HANDLE MSACM_hHeap; -extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID; +extern HANDLE MSACM_hHeap DECLSPEC_HIDDEN; +extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID DECLSPEC_HIDDEN; extern PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileName, - PWINE_ACMLOCALDRIVER pLocalDriver); -extern void MSACM_RegisterAllDrivers(void); -extern PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p); -extern void MSACM_UnregisterAllDrivers(void); -extern PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID); -extern PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver); -extern PWINE_ACMNOTIFYWND MSACM_GetNotifyWnd(HACMDRIVERID hDriver); -extern PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj, DWORD type); + PWINE_ACMLOCALDRIVER pLocalDriver) DECLSPEC_HIDDEN; +extern void MSACM_RegisterAllDrivers(void) DECLSPEC_HIDDEN; +extern PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p) DECLSPEC_HIDDEN; +extern void MSACM_UnregisterAllDrivers(void) DECLSPEC_HIDDEN; +extern PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID) DECLSPEC_HIDDEN; +extern PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver) DECLSPEC_HIDDEN; +extern PWINE_ACMNOTIFYWND MSACM_GetNotifyWnd(HACMDRIVERID hDriver) DECLSPEC_HIDDEN; +extern PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj, DWORD type) DECLSPEC_HIDDEN; -extern MMRESULT MSACM_Message(HACMDRIVER, UINT, LPARAM, LPARAM); -extern BOOL MSACM_FindFormatTagInCache(const WINE_ACMDRIVERID*, DWORD, LPDWORD); +extern MMRESULT MSACM_Message(HACMDRIVER, UINT, LPARAM, LPARAM) DECLSPEC_HIDDEN; +extern BOOL MSACM_FindFormatTagInCache(const WINE_ACMDRIVERID*, DWORD, LPDWORD) DECLSPEC_HIDDEN; -extern void MSACM_RePositionDriver(PWINE_ACMDRIVERID, DWORD); -extern void MSACM_WriteCurrentPriorities(void); -extern void MSACM_BroadcastNotification(void); -extern void MSACM_DisableNotifications(void); -extern void MSACM_EnableNotifications(void); -extern PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNotifyMsg); -extern PWINE_ACMNOTIFYWND MSACM_UnRegisterNotificationWindow(const WINE_ACMNOTIFYWND*); +extern void MSACM_RePositionDriver(PWINE_ACMDRIVERID, DWORD) DECLSPEC_HIDDEN; +extern void MSACM_WriteCurrentPriorities(void) DECLSPEC_HIDDEN; +extern void MSACM_BroadcastNotification(void) DECLSPEC_HIDDEN; +extern void MSACM_DisableNotifications(void) DECLSPEC_HIDDEN; +extern void MSACM_EnableNotifications(void) DECLSPEC_HIDDEN; +extern PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNotifyMsg) DECLSPEC_HIDDEN; +extern PWINE_ACMNOTIFYWND MSACM_UnRegisterNotificationWindow(const WINE_ACMNOTIFYWND*) DECLSPEC_HIDDEN; -extern PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry); +extern PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) DECLSPEC_HIDDEN; -extern PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDriverProc); -extern PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER, LPARAM); -extern LRESULT MSACM_CloseLocalDriver(PWINE_ACMLOCALDRIVERINST); +extern PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDriverProc) DECLSPEC_HIDDEN; +extern PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER, LPARAM) DECLSPEC_HIDDEN; +extern LRESULT MSACM_CloseLocalDriver(PWINE_ACMLOCALDRIVERINST) DECLSPEC_HIDDEN; /* extern PWINE_ACMLOCALDRIVER MSACM_GetLocalDriver(HACMDRIVER hDriver); */ /* From msacm32.c */ -extern HINSTANCE MSACM_hInstance32; +extern HINSTANCE MSACM_hInstance32 DECLSPEC_HIDDEN; /* From pcmcnvtr.c */ LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2); + LPARAM dwParam1, LPARAM dwParam2) DECLSPEC_HIDDEN; /* Dialog box templates */ #include <msacmdlg.h> 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] Sat Sep 21 14:16:27 2013 @@ -105,7 +105,7 @@ reactos/dll/win32/mlang # Synced to Wine-1.7.1 reactos/dll/win32/mpr # Synced to Wine-1.7.1 reactos/dll/win32/mprapi # Synced to Wine-1.5.19 -reactos/dll/win32/msacm32 # Autosync +reactos/dll/win32/msacm32 # Synced to Wine-1.7.1 reactos/dll/win32/msadp32.acm # Synced to Wine-1.5.19 reactos/dll/win32/mscat32 # Synced to Wine-1.5.19 reactos/dll/win32/mscms # Synced to Wine-1.5.4

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