Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[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

[akhaldi] 60279: [MSACM32_WINETEST] * Build speedup.
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 14:14:26 2013 New Revision: 60279 URL: http://svn.reactos.org/svn/reactos?rev=60279&view=rev Log: [MSACM32_WINETEST] * Build speedup. Modified: trunk/rostests/winetests/msacm32/CMakeLists.txt trunk/rostests/winetests/msacm32/testlist.c Modified: trunk/rostests/winetests/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msacm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msacm32/CMakeLists.txt [iso-8859-1] Sat Sep 21 14:14:26 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(msacm32_winetest msacm.c testlist.c) -target_link_libraries(msacm32_winetest wine) set_module_type(msacm32_winetest win32cui) -add_importlibs(msacm32_winetest msacm32 msvcrt kernel32 ntdll) +add_importlibs(msacm32_winetest msacm32 msvcrt kernel32) add_cd_file(TARGET msacm32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/msacm32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/testlis… ============================================================================== --- trunk/rostests/winetests/msacm32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msacm32/testlist.c [iso-8859-1] Sat Sep 21 14:14:26 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_msacm(void);

1 0

[akhaldi] 60278: [MSACM32] * Move resource files to the lang folder. CORE-7470
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 13:52:12 2013 New Revision: 60278 URL: http://svn.reactos.org/svn/reactos?rev=60278&view=rev Log: [MSACM32] * Move resource files to the lang folder. CORE-7470 Added: trunk/reactos/dll/win32/msacm32/lang/ (with props) trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Bg.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Cs.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Da.rc trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_De.rc trunk/reactos/dll/win32/msacm32/lang/msacm_El.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_El.rc trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_En.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Es.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Fr.rc trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_He.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Hu.rc trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_It.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Ja.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Ko.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Lt.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Nl.rc trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_No.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Pl.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Pt.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Ro.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Ru.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Si.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Sv.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Tr.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Uk.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc - copied unchanged from r60277, trunk/reactos/dll/win32/msacm32/msacm_Zh.rc Removed: trunk/reactos/dll/win32/msacm32/msacm_Bg.rc trunk/reactos/dll/win32/msacm32/msacm_Cs.rc trunk/reactos/dll/win32/msacm32/msacm_Da.rc trunk/reactos/dll/win32/msacm32/msacm_De.rc trunk/reactos/dll/win32/msacm32/msacm_El.rc trunk/reactos/dll/win32/msacm32/msacm_En.rc trunk/reactos/dll/win32/msacm32/msacm_Es.rc trunk/reactos/dll/win32/msacm32/msacm_Fr.rc trunk/reactos/dll/win32/msacm32/msacm_He.rc trunk/reactos/dll/win32/msacm32/msacm_Hu.rc trunk/reactos/dll/win32/msacm32/msacm_It.rc trunk/reactos/dll/win32/msacm32/msacm_Ja.rc trunk/reactos/dll/win32/msacm32/msacm_Ko.rc trunk/reactos/dll/win32/msacm32/msacm_Lt.rc trunk/reactos/dll/win32/msacm32/msacm_Nl.rc trunk/reactos/dll/win32/msacm32/msacm_No.rc trunk/reactos/dll/win32/msacm32/msacm_Pl.rc trunk/reactos/dll/win32/msacm32/msacm_Pt.rc trunk/reactos/dll/win32/msacm32/msacm_Ro.rc trunk/reactos/dll/win32/msacm32/msacm_Ru.rc trunk/reactos/dll/win32/msacm32/msacm_Si.rc trunk/reactos/dll/win32/msacm32/msacm_Sv.rc trunk/reactos/dll/win32/msacm32/msacm_Tr.rc trunk/reactos/dll/win32/msacm32/msacm_Uk.rc trunk/reactos/dll/win32/msacm32/msacm_Zh.rc Modified: trunk/reactos/dll/win32/msacm32/msacm.rc Propchange: trunk/reactos/dll/win32/msacm32/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Sep 21 13:52:12 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/msacm32/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/msacm32/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/msacm32/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Modified: trunk/reactos/dll/win32/msacm32/msacm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm.rc… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm.rc [iso-8859-1] Sat Sep 21 13:52:12 2013 @@ -24,79 +24,79 @@ #include "wineacm.h" #ifdef LANGUAGE_BG_BG - #include "msacm_Bg.rc" + #include "lang/msacm_Bg.rc" #endif #ifdef LANGUAGE_CS_CZ - #include "msacm_Cs.rc" + #include "lang/msacm_Cs.rc" #endif #ifdef LANGUAGE_DA_DK - #include "msacm_Da.rc" + #include "lang/msacm_Da.rc" #endif #ifdef LANGUAGE_EL_GR - #include "msacm_El.rc" + #include "lang/msacm_El.rc" #endif #ifdef LANGUAGE_EN_US - #include "msacm_En.rc" + #include "lang/msacm_En.rc" #endif #ifdef LANGUAGE_ES_ES - #include "msacm_Es.rc" + #include "lang/msacm_Es.rc" #endif #ifdef LANGUAGE_HU_HU - #include "msacm_Hu.rc" + #include "lang/msacm_Hu.rc" #endif #ifdef LANGUAGE_IT_IT - #include "msacm_It.rc" + #include "lang/msacm_It.rc" #endif #ifdef LANGUAGE_KO_KR - #include "msacm_Ko.rc" + #include "lang/msacm_Ko.rc" #endif #ifdef LANGUAGE_NL_NL - #include "msacm_Nl.rc" + #include "lang/msacm_Nl.rc" #endif #ifdef LANGUAGE_NO_NO - #include "msacm_No.rc" + #include "lang/msacm_No.rc" #endif #ifdef LANGUAGE_PL_PL - #include "msacm_Pl.rc" + #include "lang/msacm_Pl.rc" #endif #ifdef LANGUAGE_SV_SE - #include "msacm_Sv.rc" + #include "lang/msacm_Sv.rc" #endif #ifdef LANGUAGE_TR_TR - #include "msacm_Tr.rc" + #include "lang/msacm_Tr.rc" #endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE - #include "msacm_De.rc" + #include "lang/msacm_De.rc" #endif #ifdef LANGUAGE_FR_FR - #include "msacm_Fr.rc" + #include "lang/msacm_Fr.rc" #endif #ifdef LANGUAGE_HE_IL - #include "msacm_He.rc" + #include "lang/msacm_He.rc" #endif #ifdef LANGUAGE_JA_JP - #include "msacm_Ja.rc" + #include "lang/msacm_Ja.rc" #endif #ifdef LANGUAGE_LT_LT - #include "msacm_Lt.rc" + #include "lang/msacm_Lt.rc" #endif #ifdef LANGUAGE_PT_PT - #include "msacm_Pt.rc" + #include "lang/msacm_Pt.rc" #endif #ifdef LANGUAGE_RO_RO - #include "msacm_Ro.rc" + #include "lang/msacm_Ro.rc" #endif #ifdef LANGUAGE_RU_RU - #include "msacm_Ru.rc" + #include "lang/msacm_Ru.rc" #endif #ifdef LANGUAGE_SL_SI - #include "msacm_Si.rc" + #include "lang/msacm_Si.rc" #endif #ifdef LANGUAGE_UK_UA - #include "msacm_Uk.rc" + #include "lang/msacm_Uk.rc" #endif #ifdef LANGUAGE_ZH_CN - #include "msacm_Zh.rc" + #include "lang/msacm_Zh.rc" #endif Removed: trunk/reactos/dll/win32/msacm32/msacm_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Bg… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Bg.rc (removed) @@ -1,58 +0,0 @@ -/* - * English resource file for MS ACM - * - * Copyright 2000 Eric Pouech - * - * 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 "wineacm.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Èçáîð íà çâóê" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Èìå:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Ñúõðàíÿâàíå êàòî...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "Ïðå&ìàõâàíå", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Ôîðìàò:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Ïðèíàäëåæíîñòè", -1, 5, 59, 44, 8, NOT WS_GROUP - -#if 0 - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | - CBS_OWNERDRAWFIXED | CBS_HASSTRINGS -#else - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -#endif - DEFPUSHBUTTON "Äîáðå", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Îòêàç", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "Ïîìî&ù", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Cs… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Cs.rc (removed) @@ -1,57 +0,0 @@ -/* Hey, Emacs, open this file with -*- coding: cp1250 -*- - * - * Copyright 2000 Eric Pouech - * - * Czech resources for MS ACM - * Copyright 2004 David Kredba - * - * 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 "wineacm.h" - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -/* Czech strings in CP1250 */ - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Výbìr zvuku" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Název:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Uloit jako", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "Odeb&rat", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Formát:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Atributy:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Storno", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "P&omoc", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Da… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Da.rc (removed) @@ -1,53 +0,0 @@ -/* - * Danish resource file for MS ACM - * - * Copyright (C) 2008 Jens Albretsen <jens(a)albretsen.dk> - * - * 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 "wineacm.h" - -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Lyd valg" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Navn:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "Gem &som...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "Fje&rn", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Attributter:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Annuller", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Hjælp", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_De… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_De.rc (removed) @@ -1,55 +0,0 @@ -/* - * German resource file for MS ACM - * - * Copyright 2004 Henning Gerhardt - * - * 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 "wineacm.h" - -#pragma code_page(65001) - -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Soundauswahl" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Name:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "Speichern &unter...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Entfernen", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Attribute:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Hilfe", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_El… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_El.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_El.rc (removed) @@ -1,56 +0,0 @@ -/* - * Greek resource file for MS ACM - * - * Copyright 2007 Apostolos Alexiadis - * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -LANGUAGE LANG_GREEK, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÅðéëïãÞ Þ÷ïõ" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&¼íïìá:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&ÁðïèÞêåõóç ùò...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Áöáßñåóç", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&ÖïñìÜ:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Éäéüôçôåò:", -1, 5, 59, 44, 8, NOT WS_GROUP - -#if 0 - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | - CBS_OWNERDRAWFIXED | CBS_HASSTRINGS -#else - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -#endif - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "¢êõñï", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&ÂïÞèåéá", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_En… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_En.rc (removed) @@ -1,53 +0,0 @@ -/* - * English resource file for MS ACM - * - * Copyright 2000 Eric Pouech - * - * 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 "wineacm.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Sound Selection" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Name:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Save As...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Remove", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Attributes:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Cancel", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Help", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Es… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Es.rc (removed) @@ -1,53 +0,0 @@ -/* - * Spanish resource file for MS ACM - * - * Copyright 2004 José Manuel Ferrer Ortiz - * - * 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 "wineacm.h" - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Selección de sonido" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Nombre:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Guardar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Eliminar", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "A&tributos:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "Aceptar", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Ayuda", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Fr… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Fr.rc (removed) @@ -1,58 +0,0 @@ -/* - * French resource file for MS ACM - * - * Copyright 2000 Eric Pouech - * Copyright 2003 Vincent BÃ©ron - * Copyright 2009-2010 FrÃ©dÃ©ric Delanoy - * - * 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 "wineacm.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 250, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "SÃ©lection du son" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Nom :", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 15, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Enregistrer sous...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 70, 14 - PUSHBUTTON "&Supprimer", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 199, 14, 45, 14 - - LTEXT "&Format :", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 48, 39, 197, 15, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Attributs :", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 48, 57, 197, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Annuler", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "Aid&e", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_He… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_He.rc (removed) @@ -1,58 +0,0 @@ -/* - * Hebrew resource file for MS ACM - * - * Copyright 2000 Eric Pouech - * - * Translated by Baruch Rutman - * - * 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 "wineacm.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "××××¨×ª ×©××¢" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "×©×:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "×©×××¨× ××©×...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "××¡×¨", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "×¤××¨××:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "×××¤××× ××:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "×××©××¨", IDOK, 48, 80, 40, 14 - PUSHBUTTON "×××××", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "×¢××¨×", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Hu… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Hu.rc (removed) @@ -1,53 +0,0 @@ -/* - * Hungarian resource file for MS ACM - * - * Copyright 2006 Andras Kovacs - * - * 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 "wineacm.h" - -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Hang kiválasztás" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Név:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Mentés másként...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Eltávolítás", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Formátum:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Attribútumok:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Mégse", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Súgó", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_It… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_It.rc (removed) @@ -1,54 +0,0 @@ -/* - * Italian resource file for MS ACM - * - * Copyright 2000 Eric Pouech - * Copyright 2003 Ivan Leo Puoti - * - * 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 "wineacm.h" - -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Selezione dell'audio" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Nome:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Salva con nome...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Rimuovi", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Attributi:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Annulla", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Aiuto", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Ja… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Ja.rc (removed) @@ -1,56 +0,0 @@ -/* - * Japanese resource file for MS ACM - * - * Copyright 2000 Hajime Segawa - * - * 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 "wineacm.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ãµã¦ã³ãã®é¸æ" -FONT 9, "MS Shell Dlg" -BEGIN - - LTEXT "åå(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "ååãä»ãã¦ä¿å(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "åé¤(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "ãã©ã¼ããã(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "å±æ§(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "ãã«ã(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Ko… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Ko.rc (removed) @@ -1,53 +0,0 @@ -/* - * Korean resource file for MS ACM - * - * Copyright 2005,2007 YunSong Hwang - * - * 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 "wineacm.h" - -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "»ç¿îµå ¼±ÅÃ" -FONT 9, "MS Shell Dlg" -BEGIN - - LTEXT "ÀÌ¸§(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 97, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "´Ù¸¥ ÀÌ¸§À¸·Î ÀúÀå(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 103, 14, 70, 14 - PUSHBUTTON "Á¦°Å(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "Çü½Ä(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "¼Ó¼º(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "È®ÀÎ", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Ãë¼Ò", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "µµ¿ò¸»(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Lt… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Lt.rc (removed) @@ -1,56 +0,0 @@ -/* - * Lithuanian resource file for MS ACM - * - * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> - * - * 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 "wineacm.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Garso parinkimas" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Pavadinimas:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 100, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "IÅ¡saugoti k&aip...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 110, 14, 60, 14 - PUSHBUTTON "Pa&Å¡alinti", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Formatas:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "A&tributai:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "Gerai", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Atsisakyti", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Å½inynas", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Nl… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Nl.rc (removed) @@ -1,53 +0,0 @@ -/* - * msacm (Dutch resources) - * - * Copyright 2003 Hans Leidekker - * - * 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 "wineacm.h" - -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Geluidskeuze" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Naam:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Opslaan als...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Verwijderen", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Formaat:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Attributen:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Annuleren", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Help", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_No… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_No.rc (removed) @@ -1,53 +0,0 @@ -/* - * Norwegian Bokmål resource file for MS ACM - * - * Copyright 2005 Alexander N. Sørnes <alex(a)thehandofagony.com> - * - * 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 "wineacm.h" - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Lydutvalg" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Navn:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "Lagre &som...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "Fje&rn", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Attributter:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Hjelp", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Pl… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Pl.rc (removed) @@ -1,54 +0,0 @@ -/* - * Polish resource file for MS ACM - * - * Copyright 2000 Eric Pouech - * Copyright 2004 Piotr Caban - * - * 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 "wineacm.h" - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 235, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wybór d¿wiêku" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Nazwa:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Zapisz jako...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 50, 14 - PUSHBUTTON "&Usuñ", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 180, 14, 50, 14 - - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 180, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Atrybuty:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 180, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 53, 80, 40, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 97, 80, 40, 14 - PUSHBUTTON "&Pomoc", IDD_ACMFORMATCHOOSE_BTN_HELP, 141, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Pt… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Pt.rc (removed) @@ -1,89 +0,0 @@ -/* - * Portuguese resource file for MS ACM - * - * Copyright 2003 Marcelo Duarte - * Copyright 2006 AmÃ©rico JosÃ© Melo - * Copyright 2010 Gustavo Henrique MilarÃ© - * - * 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 "wineacm.h" - -#pragma code_page(65001) - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "SeleÃ§Ã£o de som" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Nome:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Salvar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Remover", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Atributos:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "Aj&uda", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "SelecÃ§Ã£o de som" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Nome:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Gravar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Remover", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Atributos:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "Aj&uda", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Ro… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Ro.rc (removed) @@ -1,54 +0,0 @@ -/* - * Copyright 2000 Eric Pouech - * Copyright 2008 Michael Stefaniuc - * - * 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 "wineacm.h" - -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Sound Selection" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Nume:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&SalveazÄ ca", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&EliminÄ", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Atribute:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "RenunÈÄ", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Ajutor", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Ru… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Ru.rc (removed) @@ -1,56 +0,0 @@ -/* - * Russian resource file for MS ACM - * - * Copyright 2008 Vitaliy Margolen - * - * 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 "wineacm.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÑÐ±Ð¾Ñ Ð·Ð²ÑÐºÐ°" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&ÐÐ¼Ñ:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÐºÐ°Ðº...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Ð¤Ð¾ÑÐ¼Ð°Ñ:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&ÐÐ¾Ð¼Ð¾ÑÑ", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Si… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Si.rc (removed) @@ -1,55 +0,0 @@ -/* - * Slovenian resource file for MS ACM - * - * Copyright 2008 Rok Mandeljc - * - * 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 "wineacm.h" - -#pragma code_page(65001) - -LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Izbira zvoka" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Ime:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Shrani kot ...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Odstrani", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Lastnosti:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "V redu", IDOK, 48, 80, 40, 14 - PUSHBUTTON "PrekliÄi", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&PomoÄ", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Sv… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Sv.rc (removed) @@ -1,53 +0,0 @@ -/* - * Swedish resource file for MS ACM - * - * Copyright 2007 Daniel Nylander - * - * 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 "wineacm.h" - -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ljudval" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Namn:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Spara som...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Ta bort", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Attribut:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Hjälp", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Tr… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Tr.rc (removed) @@ -1,53 +0,0 @@ -/* - * Turkish resource file for MS ACM - * - * Copyright 2006 Fatih Aþýcý - * - * 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 "wineacm.h" - -LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ses Seçimi" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&Ad:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "&Farklý Kaydet...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Kaldýr", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Biçim:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&Öznitelikler:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "Tamam", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Ýptal", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Yardým", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Uk… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Uk.rc (removed) @@ -1,56 +0,0 @@ -/* - * Ukraianian resource file for MS ACM - * - * Copyright 2007 Artem Reznikov - * - * 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 "wineacm.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Sound Selection" -FONT 8, "MS Shell Dlg" -BEGIN - - LTEXT "&ÐÐ¼'Ñ:", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ &ÑÐº...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "&Ð¤Ð¾ÑÐ¼Ð°Ñ:", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "&ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ:", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&ÐÐ¾Ð²ÑÐ´ÐºÐ°", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END Removed: trunk/reactos/dll/win32/msacm32/msacm_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_Zh… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_Zh.rc (removed) @@ -1,88 +0,0 @@ -/* - * MS ACM (Simplified and Traditional Chinese Resources) - * - * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> - * - * 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 "wineacm.h" - -/* Chinese text is encoded in UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "å£°é³éæ©" -FONT 9, "MS Shell Dlg" -BEGIN - - LTEXT "åç§°(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "ä¿åä¸º(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "å é¤(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "æ ¼å¼(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "å±æ§(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "ç¡®å®", IDOK, 48, 80, 40, 14 - PUSHBUTTON "åæ¶", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "å¸®å©(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL - -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "è²é³é¸æ" -FONT 9, "MS Shell Dlg" -BEGIN - - LTEXT "åç¨±(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - PUSHBUTTON "å²åçº(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "åªé¤(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - - LTEXT "æ ¼å¼(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - - LTEXT "å±¬æ§(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP - - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - DEFPUSHBUTTON "ç¢ºå®", IDOK, 48, 80, 40, 14 - PUSHBUTTON "åæ¶", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "å¹«å©(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 - -END

1 0

[akhaldi] 60277: [MPR_WINETEST] * Import from Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 13:13:56 2013 New Revision: 60277 URL: http://svn.reactos.org/svn/reactos?rev=60277&view=rev Log: [MPR_WINETEST] * Import from Wine 1.7.1. CORE-7469 Added: trunk/rostests/winetests/mpr/ trunk/rostests/winetests/mpr/CMakeLists.txt (with props) trunk/rostests/winetests/mpr/mpr.c (with props) trunk/rostests/winetests/mpr/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Sat Sep 21 13:13:56 2013 @@ -42,6 +42,7 @@ add_subdirectory(lz32) add_subdirectory(mapi32) add_subdirectory(mlang) +add_subdirectory(mpr) add_subdirectory(msacm32) add_subdirectory(mscms) add_subdirectory(mscoree) Added: trunk/rostests/winetests/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mpr/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/mpr/CMakeLists.txt (added) +++ trunk/rostests/winetests/mpr/CMakeLists.txt [iso-8859-1] Sat Sep 21 13:13:56 2013 @@ -0,0 +1,5 @@ + +add_executable(mpr_winetest mpr.c testlist.c) +set_module_type(mpr_winetest win32cui) +add_importlibs(mpr_winetest mpr msvcrt kernel32) +add_cd_file(TARGET mpr_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/mpr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/mpr/mpr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mpr/mpr.c?rev=6… ============================================================================== --- trunk/rostests/winetests/mpr/mpr.c (added) +++ trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] Sat Sep 21 13:13:56 2013 @@ -0,0 +1,167 @@ +/* + * Copyright 2012 Andrew Eikum 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 + */ + +#define COBJMACROS + +#include <stdio.h> + +#include "windows.h" +#include "winnetwk.h" +#include "wine/test.h" + +static void test_WNetGetUniversalName(void) +{ + DWORD ret; + char buffer[1024]; + DWORD drive_type, info_size, fail_size; + char driveA[] = "A:\\"; + char driveandpathA[] = "A:\\file.txt"; + WCHAR driveW[] = {'A',':','\\',0}; + + for(; *driveA <= 'Z'; ++*driveA, ++*driveandpathA, ++*driveW){ + drive_type = GetDriveTypeW(driveW); + + info_size = sizeof(buffer); + ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &info_size); + + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + else + /* WN_NO_NET_OR_BAD_PATH (DRIVE_FIXED) returned from the virtual drive (usual Q:) + created by the microsoft application virtualization client */ + ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH), + "WNetGetUniversalNameA(%s, ...) returned %u (drive_type: %u)\n", + driveA, ret, drive_type); + + ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + + fail_size = 0; + ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &fail_size); + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, + "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); + + fail_size = sizeof(driveA) / sizeof(char) - 1; + ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &fail_size); + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); + + ret = WNetGetUniversalNameA(driveandpathA, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &info_size); + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + + info_size = sizeof(buffer); + ret = WNetGetUniversalNameW(driveW, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &info_size); + + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); + else + ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH), + "WNetGetUniversalNameW(%s, ...) returned %u (drive_type: %u)\n", + wine_dbgstr_w(driveW), ret, drive_type); + if(drive_type != DRIVE_REMOTE) + ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + } +} + +static void test_WNetGetRemoteName(void) +{ + DWORD ret; + char buffer[1024]; + DWORD drive_type, info_size, fail_size; + char driveA[] = "A:\\"; + char driveandpathA[] = "A:\\file.txt"; + WCHAR driveW[] = {'A',':','\\',0}; + + for(; *driveA <= 'Z'; ++*driveA, ++*driveandpathA, ++*driveW){ + drive_type = GetDriveTypeW(driveW); + + info_size = sizeof(buffer); + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + buffer, &info_size); + todo_wine{ + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, + "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); + } + ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + + fail_size = 0; + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + buffer, &fail_size); + todo_wine{ + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, + "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); + } + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + buffer, NULL); + todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); + + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + NULL, &info_size); + + todo_wine{ + if(((GetVersion() & 0x8000ffff) == 0x00000004) || /* NT40 */ + (drive_type == DRIVE_REMOTE)) + ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, + "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); } + + fail_size = sizeof(driveA) / sizeof(char) - 1; + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + buffer, &fail_size); + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); + + ret = WNetGetUniversalNameA(driveandpathA, REMOTE_NAME_INFO_LEVEL, + buffer, &info_size); + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + + info_size = sizeof(buffer); + ret = WNetGetUniversalNameW(driveW, REMOTE_NAME_INFO_LEVEL, + buffer, &info_size); + todo_wine{ + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); + else + ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, + "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); + } + ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + } +} + +START_TEST(mpr) +{ + test_WNetGetUniversalName(); + test_WNetGetRemoteName(); +} Propchange: trunk/rostests/winetests/mpr/mpr.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/mpr/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mpr/testlist.c?… ============================================================================== --- trunk/rostests/winetests/mpr/testlist.c (added) +++ trunk/rostests/winetests/mpr/testlist.c [iso-8859-1] Sat Sep 21 13:13:56 2013 @@ -0,0 +1,12 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_mpr(void); + +const struct test winetest_testlist[] = +{ + { "mpr", func_mpr }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/mpr/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
56
Older →

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 September 2013