diff --git a/reactos/dll/directx/CMakeLists.txt b/reactos/dll/directx/CMakeLists.txt index 578e4f426c6..cab9c07fc55 100644 --- a/reactos/dll/directx/CMakeLists.txt +++ b/reactos/dll/directx/CMakeLists.txt @@ -1,25 +1,13 @@ -add_subdirectory(amstream) add_subdirectory(d3d8thk) #add_subdirectory(bdaplgin) #disabled in trunk #add_subdirectory(d3d8) #disabled in trunk, see wine subfolder #add_subdirectory(d3d9) #disabled in trunk, see wine subfolder #add_subdirectory(ddraw) #disabled in trunk, see wine subfolder add_subdirectory(devenum) -add_subdirectory(dinput) -add_subdirectory(dinput8) -add_subdirectory(dmusic) -add_subdirectory(dplay) -add_subdirectory(dplayx) -add_subdirectory(dsound) #add_subdirectory(dsound_new) #disabled in trunk -add_subdirectory(dxdiagn) -add_subdirectory(dxgi) #add_subdirectory(ksproxy) Not needed at the moment add_subdirectory(ksuser) -add_subdirectory(msdmo) #add_subdirectory(msdvbnp) #disabled in trunk #add_subdirectory(msvidctl) #disabled in trunk -add_subdirectory(qedit) -add_subdirectory(quartz) add_subdirectory(wine) diff --git a/reactos/dll/directx/wine/CMakeLists.txt b/reactos/dll/directx/wine/CMakeLists.txt index 319463d35bc..82ea0ab7777 100644 --- a/reactos/dll/directx/wine/CMakeLists.txt +++ b/reactos/dll/directx/wine/CMakeLists.txt @@ -1,4 +1,5 @@ +add_subdirectory(amstream) add_subdirectory(d3d8) add_subdirectory(d3d9) add_subdirectory(d3dcompiler_43) @@ -24,4 +25,15 @@ add_subdirectory(d3dx9_42) add_subdirectory(d3dx9_43) add_subdirectory(d3dxof) add_subdirectory(ddraw) +add_subdirectory(dinput) +add_subdirectory(dinput8) +add_subdirectory(dmusic) +add_subdirectory(dplay) +add_subdirectory(dplayx) +add_subdirectory(dsound) +add_subdirectory(dxdiagn) +add_subdirectory(dxgi) +add_subdirectory(msdmo) +add_subdirectory(qedit) +add_subdirectory(quartz) add_subdirectory(wined3d) diff --git a/reactos/dll/directx/amstream/CMakeLists.txt b/reactos/dll/directx/wine/amstream/CMakeLists.txt similarity index 100% rename from reactos/dll/directx/amstream/CMakeLists.txt rename to reactos/dll/directx/wine/amstream/CMakeLists.txt diff --git a/reactos/dll/directx/amstream/amstream.c b/reactos/dll/directx/wine/amstream/amstream.c similarity index 100% rename from reactos/dll/directx/amstream/amstream.c rename to reactos/dll/directx/wine/amstream/amstream.c diff --git a/reactos/dll/directx/amstream/amstream.rgs b/reactos/dll/directx/wine/amstream/amstream.rgs similarity index 100% rename from reactos/dll/directx/amstream/amstream.rgs rename to reactos/dll/directx/wine/amstream/amstream.rgs diff --git a/reactos/dll/directx/amstream/amstream.spec b/reactos/dll/directx/wine/amstream/amstream.spec similarity index 100% rename from reactos/dll/directx/amstream/amstream.spec rename to reactos/dll/directx/wine/amstream/amstream.spec diff --git a/reactos/dll/directx/amstream/amstream_classes.idl b/reactos/dll/directx/wine/amstream/amstream_classes.idl similarity index 100% rename from reactos/dll/directx/amstream/amstream_classes.idl rename to reactos/dll/directx/wine/amstream/amstream_classes.idl diff --git a/reactos/dll/directx/amstream/amstream_private.h b/reactos/dll/directx/wine/amstream/amstream_private.h similarity index 100% rename from reactos/dll/directx/amstream/amstream_private.h rename to reactos/dll/directx/wine/amstream/amstream_private.h diff --git a/reactos/dll/directx/amstream/main.c b/reactos/dll/directx/wine/amstream/main.c similarity index 100% rename from reactos/dll/directx/amstream/main.c rename to reactos/dll/directx/wine/amstream/main.c diff --git a/reactos/dll/directx/amstream/mediastream.c b/reactos/dll/directx/wine/amstream/mediastream.c similarity index 100% rename from reactos/dll/directx/amstream/mediastream.c rename to reactos/dll/directx/wine/amstream/mediastream.c diff --git a/reactos/dll/directx/amstream/mediastreamfilter.c b/reactos/dll/directx/wine/amstream/mediastreamfilter.c similarity index 100% rename from reactos/dll/directx/amstream/mediastreamfilter.c rename to reactos/dll/directx/wine/amstream/mediastreamfilter.c diff --git a/reactos/dll/directx/amstream/version.rc b/reactos/dll/directx/wine/amstream/version.rc similarity index 100% rename from reactos/dll/directx/amstream/version.rc rename to reactos/dll/directx/wine/amstream/version.rc diff --git a/reactos/dll/directx/dinput/CMakeLists.txt b/reactos/dll/directx/wine/dinput/CMakeLists.txt similarity index 100% rename from reactos/dll/directx/dinput/CMakeLists.txt rename to reactos/dll/directx/wine/dinput/CMakeLists.txt diff --git a/reactos/dll/directx/dinput/config.c b/reactos/dll/directx/wine/dinput/config.c similarity index 100% rename from reactos/dll/directx/dinput/config.c rename to reactos/dll/directx/wine/dinput/config.c diff --git a/reactos/dll/directx/dinput/data_formats.c b/reactos/dll/directx/wine/dinput/data_formats.c similarity index 100% rename from reactos/dll/directx/dinput/data_formats.c rename to reactos/dll/directx/wine/dinput/data_formats.c diff --git a/reactos/dll/directx/dinput/device.c b/reactos/dll/directx/wine/dinput/device.c similarity index 100% rename from reactos/dll/directx/dinput/device.c rename to reactos/dll/directx/wine/dinput/device.c diff --git a/reactos/dll/directx/dinput/device_private.h b/reactos/dll/directx/wine/dinput/device_private.h similarity index 100% rename from reactos/dll/directx/dinput/device_private.h rename to reactos/dll/directx/wine/dinput/device_private.h diff --git a/reactos/dll/directx/dinput/dinput.rc b/reactos/dll/directx/wine/dinput/dinput.rc similarity index 100% rename from reactos/dll/directx/dinput/dinput.rc rename to reactos/dll/directx/wine/dinput/dinput.rc diff --git a/reactos/dll/directx/dinput/dinput.spec b/reactos/dll/directx/wine/dinput/dinput.spec similarity index 100% rename from reactos/dll/directx/dinput/dinput.spec rename to reactos/dll/directx/wine/dinput/dinput.spec diff --git a/reactos/dll/directx/dinput/dinput_classes.idl b/reactos/dll/directx/wine/dinput/dinput_classes.idl similarity index 100% rename from reactos/dll/directx/dinput/dinput_classes.idl rename to reactos/dll/directx/wine/dinput/dinput_classes.idl diff --git a/reactos/dll/directx/dinput/dinput_classes.rgs b/reactos/dll/directx/wine/dinput/dinput_classes.rgs similarity index 100% rename from reactos/dll/directx/dinput/dinput_classes.rgs rename to reactos/dll/directx/wine/dinput/dinput_classes.rgs diff --git a/reactos/dll/directx/dinput/dinput_main.c b/reactos/dll/directx/wine/dinput/dinput_main.c similarity index 100% rename from reactos/dll/directx/dinput/dinput_main.c rename to reactos/dll/directx/wine/dinput/dinput_main.c diff --git a/reactos/dll/directx/dinput/dinput_private.h b/reactos/dll/directx/wine/dinput/dinput_private.h similarity index 100% rename from reactos/dll/directx/dinput/dinput_private.h rename to reactos/dll/directx/wine/dinput/dinput_private.h diff --git a/reactos/dll/directx/dinput/effect_linuxinput.c b/reactos/dll/directx/wine/dinput/effect_linuxinput.c similarity index 100% rename from reactos/dll/directx/dinput/effect_linuxinput.c rename to reactos/dll/directx/wine/dinput/effect_linuxinput.c diff --git a/reactos/dll/directx/dinput/joystick.c b/reactos/dll/directx/wine/dinput/joystick.c similarity index 100% rename from reactos/dll/directx/dinput/joystick.c rename to reactos/dll/directx/wine/dinput/joystick.c diff --git a/reactos/dll/directx/dinput/joystick_linux.c b/reactos/dll/directx/wine/dinput/joystick_linux.c similarity index 100% rename from reactos/dll/directx/dinput/joystick_linux.c rename to reactos/dll/directx/wine/dinput/joystick_linux.c diff --git a/reactos/dll/directx/dinput/joystick_linuxinput.c b/reactos/dll/directx/wine/dinput/joystick_linuxinput.c similarity index 100% rename from reactos/dll/directx/dinput/joystick_linuxinput.c rename to reactos/dll/directx/wine/dinput/joystick_linuxinput.c diff --git a/reactos/dll/directx/dinput/joystick_osx.c b/reactos/dll/directx/wine/dinput/joystick_osx.c similarity index 100% rename from reactos/dll/directx/dinput/joystick_osx.c rename to reactos/dll/directx/wine/dinput/joystick_osx.c diff --git a/reactos/dll/directx/dinput/joystick_private.h b/reactos/dll/directx/wine/dinput/joystick_private.h similarity index 100% rename from reactos/dll/directx/dinput/joystick_private.h rename to reactos/dll/directx/wine/dinput/joystick_private.h diff --git a/reactos/dll/directx/dinput/keyboard.c b/reactos/dll/directx/wine/dinput/keyboard.c similarity index 100% rename from reactos/dll/directx/dinput/keyboard.c rename to reactos/dll/directx/wine/dinput/keyboard.c diff --git a/reactos/dll/directx/dinput/mouse.c b/reactos/dll/directx/wine/dinput/mouse.c similarity index 100% rename from reactos/dll/directx/dinput/mouse.c rename to reactos/dll/directx/wine/dinput/mouse.c diff --git a/reactos/dll/directx/dinput/resource.h b/reactos/dll/directx/wine/dinput/resource.h similarity index 100% rename from reactos/dll/directx/dinput/resource.h rename to reactos/dll/directx/wine/dinput/resource.h diff --git a/reactos/dll/directx/dinput8/CMakeLists.txt b/reactos/dll/directx/wine/dinput8/CMakeLists.txt similarity index 100% rename from reactos/dll/directx/dinput8/CMakeLists.txt rename to reactos/dll/directx/wine/dinput8/CMakeLists.txt diff --git a/reactos/dll/directx/dinput8/dinput8.idl b/reactos/dll/directx/wine/dinput8/dinput8.idl similarity index 100% rename from reactos/dll/directx/dinput8/dinput8.idl rename to reactos/dll/directx/wine/dinput8/dinput8.idl diff --git a/reactos/dll/directx/dinput8/dinput8.rgs b/reactos/dll/directx/wine/dinput8/dinput8.rgs similarity index 100% rename from reactos/dll/directx/dinput8/dinput8.rgs rename to reactos/dll/directx/wine/dinput8/dinput8.rgs diff --git a/reactos/dll/directx/dinput8/dinput8.spec b/reactos/dll/directx/wine/dinput8/dinput8.spec similarity index 100% rename from reactos/dll/directx/dinput8/dinput8.spec rename to reactos/dll/directx/wine/dinput8/dinput8.spec diff --git a/reactos/dll/directx/dinput8/dinput8_main.c b/reactos/dll/directx/wine/dinput8/dinput8_main.c similarity index 100% rename from reactos/dll/directx/dinput8/dinput8_main.c rename to reactos/dll/directx/wine/dinput8/dinput8_main.c diff --git a/reactos/dll/directx/dinput8/version.rc b/reactos/dll/directx/wine/dinput8/version.rc similarity index 100% rename from reactos/dll/directx/dinput8/version.rc rename to reactos/dll/directx/wine/dinput8/version.rc diff --git a/reactos/dll/directx/dmusic/CMakeLists.txt b/reactos/dll/directx/wine/dmusic/CMakeLists.txt similarity index 100% rename from reactos/dll/directx/dmusic/CMakeLists.txt rename to reactos/dll/directx/wine/dmusic/CMakeLists.txt diff --git a/reactos/dll/directx/dmusic/buffer.c b/reactos/dll/directx/wine/dmusic/buffer.c similarity index 100% rename from reactos/dll/directx/dmusic/buffer.c rename to reactos/dll/directx/wine/dmusic/buffer.c diff --git a/reactos/dll/directx/dmusic/clock.c b/reactos/dll/directx/wine/dmusic/clock.c similarity index 100% rename from reactos/dll/directx/dmusic/clock.c rename to reactos/dll/directx/wine/dmusic/clock.c diff --git a/reactos/dll/directx/dmusic/collection.c b/reactos/dll/directx/wine/dmusic/collection.c similarity index 100% rename from reactos/dll/directx/dmusic/collection.c rename to reactos/dll/directx/wine/dmusic/collection.c diff --git a/reactos/dll/directx/dmusic/dmusic.c b/reactos/dll/directx/wine/dmusic/dmusic.c similarity index 100% rename from reactos/dll/directx/dmusic/dmusic.c rename to reactos/dll/directx/wine/dmusic/dmusic.c diff --git a/reactos/dll/directx/dmusic/dmusic.idl b/reactos/dll/directx/wine/dmusic/dmusic.idl similarity index 100% rename from reactos/dll/directx/dmusic/dmusic.idl rename to reactos/dll/directx/wine/dmusic/dmusic.idl diff --git a/reactos/dll/directx/dmusic/dmusic.rgs b/reactos/dll/directx/wine/dmusic/dmusic.rgs similarity index 100% rename from reactos/dll/directx/dmusic/dmusic.rgs rename to reactos/dll/directx/wine/dmusic/dmusic.rgs diff --git a/reactos/dll/directx/dmusic/dmusic.spec b/reactos/dll/directx/wine/dmusic/dmusic.spec similarity index 100% rename from reactos/dll/directx/dmusic/dmusic.spec rename to reactos/dll/directx/wine/dmusic/dmusic.spec diff --git a/reactos/dll/directx/dmusic/dmusic_main.c b/reactos/dll/directx/wine/dmusic/dmusic_main.c similarity index 100% rename from reactos/dll/directx/dmusic/dmusic_main.c rename to reactos/dll/directx/wine/dmusic/dmusic_main.c diff --git a/reactos/dll/directx/dmusic/dmusic_private.h b/reactos/dll/directx/wine/dmusic/dmusic_private.h similarity index 100% rename from reactos/dll/directx/dmusic/dmusic_private.h rename to reactos/dll/directx/wine/dmusic/dmusic_private.h diff --git a/reactos/dll/directx/dmusic/download.c b/reactos/dll/directx/wine/dmusic/download.c similarity index 100% rename from reactos/dll/directx/dmusic/download.c rename to reactos/dll/directx/wine/dmusic/download.c diff --git a/reactos/dll/directx/dmusic/instrument.c b/reactos/dll/directx/wine/dmusic/instrument.c similarity index 100% rename from reactos/dll/directx/dmusic/instrument.c rename to reactos/dll/directx/wine/dmusic/instrument.c diff --git a/reactos/dll/directx/dmusic/port.c b/reactos/dll/directx/wine/dmusic/port.c similarity index 100% rename from reactos/dll/directx/dmusic/port.c rename to reactos/dll/directx/wine/dmusic/port.c diff --git a/reactos/dll/directx/dmusic/regsvr.c b/reactos/dll/directx/wine/dmusic/regsvr.c similarity index 100% rename from reactos/dll/directx/dmusic/regsvr.c rename to reactos/dll/directx/wine/dmusic/regsvr.c diff --git a/reactos/dll/directx/dmusic/version.rc b/reactos/dll/directx/wine/dmusic/version.rc similarity index 100% rename from reactos/dll/directx/dmusic/version.rc rename to reactos/dll/directx/wine/dmusic/version.rc diff --git a/reactos/dll/directx/dplay/CMakeLists.txt b/reactos/dll/directx/wine/dplay/CMakeLists.txt similarity index 100% rename from reactos/dll/directx/dplay/CMakeLists.txt rename to reactos/dll/directx/wine/dplay/CMakeLists.txt diff --git a/reactos/dll/directx/dplay/dplay.spec b/reactos/dll/directx/wine/dplay/dplay.spec similarity index 100% rename from reactos/dll/directx/dplay/dplay.spec rename to reactos/dll/directx/wine/dplay/dplay.spec diff --git a/reactos/dll/directx/dplay/dplay_main.c b/reactos/dll/directx/wine/dplay/dplay_main.c similarity index 100% rename from reactos/dll/directx/dplay/dplay_main.c rename to reactos/dll/directx/wine/dplay/dplay_main.c diff --git a/reactos/dll/directx/dplay/version.rc b/reactos/dll/directx/wine/dplay/version.rc similarity index 100% rename from reactos/dll/directx/dplay/version.rc rename to reactos/dll/directx/wine/dplay/version.rc diff --git a/reactos/dll/directx/dplayx/CMakeLists.txt b/reactos/dll/directx/wine/dplayx/CMakeLists.txt similarity index 100% rename from reactos/dll/directx/dplayx/CMakeLists.txt rename to reactos/dll/directx/wine/dplayx/CMakeLists.txt diff --git a/reactos/dll/directx/dplayx/dpclassfactory.c b/reactos/dll/directx/wine/dplayx/dpclassfactory.c similarity index 100% rename from reactos/dll/directx/dplayx/dpclassfactory.c rename to reactos/dll/directx/wine/dplayx/dpclassfactory.c diff --git a/reactos/dll/directx/dplayx/dpinit.h b/reactos/dll/directx/wine/dplayx/dpinit.h similarity index 100% rename from reactos/dll/directx/dplayx/dpinit.h rename to reactos/dll/directx/wine/dplayx/dpinit.h diff --git a/reactos/dll/directx/dplayx/dplay.c b/reactos/dll/directx/wine/dplayx/dplay.c similarity index 100% rename from reactos/dll/directx/dplayx/dplay.c rename to reactos/dll/directx/wine/dplayx/dplay.c diff --git a/reactos/dll/directx/dplayx/dplay_global.h b/reactos/dll/directx/wine/dplayx/dplay_global.h similarity index 100% rename from reactos/dll/directx/dplayx/dplay_global.h rename to reactos/dll/directx/wine/dplayx/dplay_global.h diff --git a/reactos/dll/directx/dplayx/dplaysp.c b/reactos/dll/directx/wine/dplayx/dplaysp.c similarity index 100% rename from reactos/dll/directx/dplayx/dplaysp.c rename to reactos/dll/directx/wine/dplayx/dplaysp.c diff --git a/reactos/dll/directx/dplayx/dplayx.idl b/reactos/dll/directx/wine/dplayx/dplayx.idl similarity index 100% rename from reactos/dll/directx/dplayx/dplayx.idl rename to reactos/dll/directx/wine/dplayx/dplayx.idl diff --git a/reactos/dll/directx/dplayx/dplayx.rgs b/reactos/dll/directx/wine/dplayx/dplayx.rgs similarity index 100% rename from reactos/dll/directx/dplayx/dplayx.rgs rename to reactos/dll/directx/wine/dplayx/dplayx.rgs diff --git a/reactos/dll/directx/dplayx/dplayx.spec b/reactos/dll/directx/wine/dplayx/dplayx.spec similarity index 100% rename from reactos/dll/directx/dplayx/dplayx.spec rename to reactos/dll/directx/wine/dplayx/dplayx.spec diff --git a/reactos/dll/directx/dplayx/dplayx_global.c b/reactos/dll/directx/wine/dplayx/dplayx_global.c similarity index 100% rename from reactos/dll/directx/dplayx/dplayx_global.c rename to reactos/dll/directx/wine/dplayx/dplayx_global.c diff --git a/reactos/dll/directx/dplayx/dplayx_global.h b/reactos/dll/directx/wine/dplayx/dplayx_global.h similarity index 100% rename from reactos/dll/directx/dplayx/dplayx_global.h rename to reactos/dll/directx/wine/dplayx/dplayx_global.h diff --git a/reactos/dll/directx/dplayx/dplayx_main.c b/reactos/dll/directx/wine/dplayx/dplayx_main.c similarity index 100% rename from reactos/dll/directx/dplayx/dplayx_main.c rename to reactos/dll/directx/wine/dplayx/dplayx_main.c diff --git a/reactos/dll/directx/dplayx/dplayx_messages.c b/reactos/dll/directx/wine/dplayx/dplayx_messages.c similarity index 100% rename from reactos/dll/directx/dplayx/dplayx_messages.c rename to reactos/dll/directx/wine/dplayx/dplayx_messages.c diff --git a/reactos/dll/directx/dplayx/dplayx_messages.h b/reactos/dll/directx/wine/dplayx/dplayx_messages.h similarity index 100% rename from reactos/dll/directx/dplayx/dplayx_messages.h rename to reactos/dll/directx/wine/dplayx/dplayx_messages.h diff --git a/reactos/dll/directx/dplayx/dplayx_queue.h b/reactos/dll/directx/wine/dplayx/dplayx_queue.h similarity index 100% rename from reactos/dll/directx/dplayx/dplayx_queue.h rename to reactos/dll/directx/wine/dplayx/dplayx_queue.h diff --git a/reactos/dll/directx/dplayx/dplobby.c b/reactos/dll/directx/wine/dplayx/dplobby.c similarity index 100% rename from reactos/dll/directx/dplayx/dplobby.c rename to reactos/dll/directx/wine/dplayx/dplobby.c diff --git a/reactos/dll/directx/dplayx/lobbysp.c b/reactos/dll/directx/wine/dplayx/lobbysp.c similarity index 100% rename from reactos/dll/directx/dplayx/lobbysp.c rename to reactos/dll/directx/wine/dplayx/lobbysp.c diff --git a/reactos/dll/directx/dplayx/lobbysp.h b/reactos/dll/directx/wine/dplayx/lobbysp.h similarity index 100% rename from reactos/dll/directx/dplayx/lobbysp.h rename to reactos/dll/directx/wine/dplayx/lobbysp.h diff --git a/reactos/dll/directx/dplayx/name_server.c b/reactos/dll/directx/wine/dplayx/name_server.c similarity index 100% rename from reactos/dll/directx/dplayx/name_server.c rename to reactos/dll/directx/wine/dplayx/name_server.c diff --git a/reactos/dll/directx/dplayx/name_server.h b/reactos/dll/directx/wine/dplayx/name_server.h similarity index 100% rename from reactos/dll/directx/dplayx/name_server.h rename to reactos/dll/directx/wine/dplayx/name_server.h diff --git a/reactos/dll/directx/dplayx/version.rc b/reactos/dll/directx/wine/dplayx/version.rc similarity index 100% rename from reactos/dll/directx/dplayx/version.rc rename to reactos/dll/directx/wine/dplayx/version.rc diff --git a/reactos/dll/directx/dsound/CMakeLists.txt b/reactos/dll/directx/wine/dsound/CMakeLists.txt similarity index 100% rename from reactos/dll/directx/dsound/CMakeLists.txt rename to reactos/dll/directx/wine/dsound/CMakeLists.txt diff --git a/reactos/dll/directx/dsound/buffer.c b/reactos/dll/directx/wine/dsound/buffer.c similarity index 100% rename from reactos/dll/directx/dsound/buffer.c rename to reactos/dll/directx/wine/dsound/buffer.c diff --git a/reactos/dll/directx/dsound/capture.c b/reactos/dll/directx/wine/dsound/capture.c similarity index 100% rename from reactos/dll/directx/dsound/capture.c rename to reactos/dll/directx/wine/dsound/capture.c diff --git a/reactos/dll/directx/dsound/dsound.c b/reactos/dll/directx/wine/dsound/dsound.c similarity index 100% rename from reactos/dll/directx/dsound/dsound.c rename to reactos/dll/directx/wine/dsound/dsound.c diff --git a/reactos/dll/directx/dsound/dsound.spec b/reactos/dll/directx/wine/dsound/dsound.spec similarity index 100% rename from reactos/dll/directx/dsound/dsound.spec rename to reactos/dll/directx/wine/dsound/dsound.spec diff --git a/reactos/dll/directx/dsound/dsound_classes.idl b/reactos/dll/directx/wine/dsound/dsound_classes.idl similarity index 100% rename from reactos/dll/directx/dsound/dsound_classes.idl rename to reactos/dll/directx/wine/dsound/dsound_classes.idl diff --git a/reactos/dll/directx/dsound/dsound_classes.rgs b/reactos/dll/directx/wine/dsound/dsound_classes.rgs similarity index 100% rename from reactos/dll/directx/dsound/dsound_classes.rgs rename to reactos/dll/directx/wine/dsound/dsound_classes.rgs diff --git a/reactos/dll/directx/dsound/dsound_convert.c b/reactos/dll/directx/wine/dsound/dsound_convert.c similarity index 100% rename from reactos/dll/directx/dsound/dsound_convert.c rename to reactos/dll/directx/wine/dsound/dsound_convert.c diff --git a/reactos/dll/directx/dsound/dsound_main.c b/reactos/dll/directx/wine/dsound/dsound_main.c similarity index 100% rename from reactos/dll/directx/dsound/dsound_main.c rename to reactos/dll/directx/wine/dsound/dsound_main.c diff --git a/reactos/dll/directx/dsound/dsound_private.h b/reactos/dll/directx/wine/dsound/dsound_private.h similarity index 100% rename from reactos/dll/directx/dsound/dsound_private.h rename to reactos/dll/directx/wine/dsound/dsound_private.h diff --git a/reactos/dll/directx/dsound/duplex.c b/reactos/dll/directx/wine/dsound/duplex.c similarity index 100% rename from reactos/dll/directx/dsound/duplex.c rename to reactos/dll/directx/wine/dsound/duplex.c diff --git a/reactos/dll/directx/dsound/fir.h b/reactos/dll/directx/wine/dsound/fir.h similarity index 100% rename from reactos/dll/directx/dsound/fir.h rename to reactos/dll/directx/wine/dsound/fir.h diff --git a/reactos/dll/directx/dsound/mixer.c b/reactos/dll/directx/wine/dsound/mixer.c similarity index 100% rename from reactos/dll/directx/dsound/mixer.c rename to reactos/dll/directx/wine/dsound/mixer.c diff --git a/reactos/dll/directx/dsound/primary.c b/reactos/dll/directx/wine/dsound/primary.c similarity index 100% rename from reactos/dll/directx/dsound/primary.c rename to reactos/dll/directx/wine/dsound/primary.c diff --git a/reactos/dll/directx/dsound/propset.c b/reactos/dll/directx/wine/dsound/propset.c similarity index 100% rename from reactos/dll/directx/dsound/propset.c rename to reactos/dll/directx/wine/dsound/propset.c diff --git a/reactos/dll/directx/dsound/sound3d.c b/reactos/dll/directx/wine/dsound/sound3d.c similarity index 100% rename from reactos/dll/directx/dsound/sound3d.c rename to reactos/dll/directx/wine/dsound/sound3d.c diff --git a/reactos/dll/directx/dsound/version.rc b/reactos/dll/directx/wine/dsound/version.rc similarity index 100% rename from reactos/dll/directx/dsound/version.rc rename to reactos/dll/directx/wine/dsound/version.rc diff --git a/reactos/dll/directx/dxdiagn/CMakeLists.txt b/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt similarity index 100% rename from reactos/dll/directx/dxdiagn/CMakeLists.txt rename to reactos/dll/directx/wine/dxdiagn/CMakeLists.txt diff --git a/reactos/dll/directx/dxdiagn/container.c b/reactos/dll/directx/wine/dxdiagn/container.c similarity index 100% rename from reactos/dll/directx/dxdiagn/container.c rename to reactos/dll/directx/wine/dxdiagn/container.c diff --git a/reactos/dll/directx/dxdiagn/dxdiag_main.c b/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c similarity index 100% rename from reactos/dll/directx/dxdiagn/dxdiag_main.c rename to reactos/dll/directx/wine/dxdiagn/dxdiag_main.c diff --git a/reactos/dll/directx/dxdiagn/dxdiag_private.h b/reactos/dll/directx/wine/dxdiagn/dxdiag_private.h similarity index 100% rename from reactos/dll/directx/dxdiagn/dxdiag_private.h rename to reactos/dll/directx/wine/dxdiagn/dxdiag_private.h diff --git a/reactos/dll/directx/dxdiagn/dxdiagn.spec b/reactos/dll/directx/wine/dxdiagn/dxdiagn.spec similarity index 100% rename from reactos/dll/directx/dxdiagn/dxdiagn.spec rename to reactos/dll/directx/wine/dxdiagn/dxdiagn.spec diff --git a/reactos/dll/directx/dxdiagn/provider.c b/reactos/dll/directx/wine/dxdiagn/provider.c similarity index 100% rename from reactos/dll/directx/dxdiagn/provider.c rename to reactos/dll/directx/wine/dxdiagn/provider.c diff --git a/reactos/dll/directx/dxdiagn/regsvr.c b/reactos/dll/directx/wine/dxdiagn/regsvr.c similarity index 100% rename from reactos/dll/directx/dxdiagn/regsvr.c rename to reactos/dll/directx/wine/dxdiagn/regsvr.c diff --git a/reactos/dll/directx/dxdiagn/version.rc b/reactos/dll/directx/wine/dxdiagn/version.rc similarity index 100% rename from reactos/dll/directx/dxdiagn/version.rc rename to reactos/dll/directx/wine/dxdiagn/version.rc diff --git a/reactos/dll/directx/dxgi/CMakeLists.txt b/reactos/dll/directx/wine/dxgi/CMakeLists.txt similarity index 100% rename from reactos/dll/directx/dxgi/CMakeLists.txt rename to reactos/dll/directx/wine/dxgi/CMakeLists.txt diff --git a/reactos/dll/directx/dxgi/adapter.c b/reactos/dll/directx/wine/dxgi/adapter.c similarity index 100% rename from reactos/dll/directx/dxgi/adapter.c rename to reactos/dll/directx/wine/dxgi/adapter.c diff --git a/reactos/dll/directx/dxgi/device.c b/reactos/dll/directx/wine/dxgi/device.c similarity index 100% rename from reactos/dll/directx/dxgi/device.c rename to reactos/dll/directx/wine/dxgi/device.c diff --git a/reactos/dll/directx/dxgi/dxgi.spec b/reactos/dll/directx/wine/dxgi/dxgi.spec similarity index 100% rename from reactos/dll/directx/dxgi/dxgi.spec rename to reactos/dll/directx/wine/dxgi/dxgi.spec diff --git a/reactos/dll/directx/dxgi/dxgi_main.c b/reactos/dll/directx/wine/dxgi/dxgi_main.c similarity index 100% rename from reactos/dll/directx/dxgi/dxgi_main.c rename to reactos/dll/directx/wine/dxgi/dxgi_main.c diff --git a/reactos/dll/directx/dxgi/dxgi_private.h b/reactos/dll/directx/wine/dxgi/dxgi_private.h similarity index 100% rename from reactos/dll/directx/dxgi/dxgi_private.h rename to reactos/dll/directx/wine/dxgi/dxgi_private.h diff --git a/reactos/dll/directx/dxgi/factory.c b/reactos/dll/directx/wine/dxgi/factory.c similarity index 100% rename from reactos/dll/directx/dxgi/factory.c rename to reactos/dll/directx/wine/dxgi/factory.c diff --git a/reactos/dll/directx/dxgi/output.c b/reactos/dll/directx/wine/dxgi/output.c similarity index 100% rename from reactos/dll/directx/dxgi/output.c rename to reactos/dll/directx/wine/dxgi/output.c diff --git a/reactos/dll/directx/dxgi/surface.c b/reactos/dll/directx/wine/dxgi/surface.c similarity index 100% rename from reactos/dll/directx/dxgi/surface.c rename to reactos/dll/directx/wine/dxgi/surface.c diff --git a/reactos/dll/directx/dxgi/swapchain.c b/reactos/dll/directx/wine/dxgi/swapchain.c similarity index 100% rename from reactos/dll/directx/dxgi/swapchain.c rename to reactos/dll/directx/wine/dxgi/swapchain.c diff --git a/reactos/dll/directx/dxgi/utils.c b/reactos/dll/directx/wine/dxgi/utils.c similarity index 100% rename from reactos/dll/directx/dxgi/utils.c rename to reactos/dll/directx/wine/dxgi/utils.c diff --git a/reactos/dll/directx/dxgi/version.rc b/reactos/dll/directx/wine/dxgi/version.rc similarity index 100% rename from reactos/dll/directx/dxgi/version.rc rename to reactos/dll/directx/wine/dxgi/version.rc diff --git a/reactos/dll/directx/msdmo/CMakeLists.txt b/reactos/dll/directx/wine/msdmo/CMakeLists.txt similarity index 100% rename from reactos/dll/directx/msdmo/CMakeLists.txt rename to reactos/dll/directx/wine/msdmo/CMakeLists.txt diff --git a/reactos/dll/directx/msdmo/dmoreg.c b/reactos/dll/directx/wine/msdmo/dmoreg.c similarity index 100% rename from reactos/dll/directx/msdmo/dmoreg.c rename to reactos/dll/directx/wine/msdmo/dmoreg.c diff --git a/reactos/dll/directx/msdmo/dmort.c b/reactos/dll/directx/wine/msdmo/dmort.c similarity index 100% rename from reactos/dll/directx/msdmo/dmort.c rename to reactos/dll/directx/wine/msdmo/dmort.c diff --git a/reactos/dll/directx/msdmo/msdmo.spec b/reactos/dll/directx/wine/msdmo/msdmo.spec similarity index 100% rename from reactos/dll/directx/msdmo/msdmo.spec rename to reactos/dll/directx/wine/msdmo/msdmo.spec diff --git a/reactos/dll/directx/msdmo/rsrc.rc b/reactos/dll/directx/wine/msdmo/rsrc.rc similarity index 100% rename from reactos/dll/directx/msdmo/rsrc.rc rename to reactos/dll/directx/wine/msdmo/rsrc.rc diff --git a/reactos/dll/directx/msdmo/stubs.c b/reactos/dll/directx/wine/msdmo/stubs.c similarity index 100% rename from reactos/dll/directx/msdmo/stubs.c rename to reactos/dll/directx/wine/msdmo/stubs.c diff --git a/reactos/dll/directx/qedit/CMakeLists.txt b/reactos/dll/directx/wine/qedit/CMakeLists.txt similarity index 100% rename from reactos/dll/directx/qedit/CMakeLists.txt rename to reactos/dll/directx/wine/qedit/CMakeLists.txt diff --git a/reactos/dll/directx/qedit/main.c b/reactos/dll/directx/wine/qedit/main.c similarity index 100% rename from reactos/dll/directx/qedit/main.c rename to reactos/dll/directx/wine/qedit/main.c diff --git a/reactos/dll/directx/qedit/mediadet.c b/reactos/dll/directx/wine/qedit/mediadet.c similarity index 100% rename from reactos/dll/directx/qedit/mediadet.c rename to reactos/dll/directx/wine/qedit/mediadet.c diff --git a/reactos/dll/directx/qedit/qedit.spec b/reactos/dll/directx/wine/qedit/qedit.spec similarity index 100% rename from reactos/dll/directx/qedit/qedit.spec rename to reactos/dll/directx/wine/qedit/qedit.spec diff --git a/reactos/dll/directx/qedit/qedit_private.h b/reactos/dll/directx/wine/qedit/qedit_private.h similarity index 100% rename from reactos/dll/directx/qedit/qedit_private.h rename to reactos/dll/directx/wine/qedit/qedit_private.h diff --git a/reactos/dll/directx/qedit/regsvr.c b/reactos/dll/directx/wine/qedit/regsvr.c similarity index 100% rename from reactos/dll/directx/qedit/regsvr.c rename to reactos/dll/directx/wine/qedit/regsvr.c diff --git a/reactos/dll/directx/qedit/samplegrabber.c b/reactos/dll/directx/wine/qedit/samplegrabber.c similarity index 100% rename from reactos/dll/directx/qedit/samplegrabber.c rename to reactos/dll/directx/wine/qedit/samplegrabber.c diff --git a/reactos/dll/directx/quartz/CMakeLists.txt b/reactos/dll/directx/wine/quartz/CMakeLists.txt similarity index 100% rename from reactos/dll/directx/quartz/CMakeLists.txt rename to reactos/dll/directx/wine/quartz/CMakeLists.txt diff --git a/reactos/dll/directx/quartz/acmwrapper.c b/reactos/dll/directx/wine/quartz/acmwrapper.c similarity index 100% rename from reactos/dll/directx/quartz/acmwrapper.c rename to reactos/dll/directx/wine/quartz/acmwrapper.c diff --git a/reactos/dll/directx/quartz/avidec.c b/reactos/dll/directx/wine/quartz/avidec.c similarity index 100% rename from reactos/dll/directx/quartz/avidec.c rename to reactos/dll/directx/wine/quartz/avidec.c diff --git a/reactos/dll/directx/quartz/avisplit.c b/reactos/dll/directx/wine/quartz/avisplit.c similarity index 100% rename from reactos/dll/directx/quartz/avisplit.c rename to reactos/dll/directx/wine/quartz/avisplit.c diff --git a/reactos/dll/directx/quartz/control_tlb.idl b/reactos/dll/directx/wine/quartz/control_tlb.idl similarity index 100% rename from reactos/dll/directx/quartz/control_tlb.idl rename to reactos/dll/directx/wine/quartz/control_tlb.idl diff --git a/reactos/dll/directx/quartz/control_tlb.rgs b/reactos/dll/directx/wine/quartz/control_tlb.rgs similarity index 100% rename from reactos/dll/directx/quartz/control_tlb.rgs rename to reactos/dll/directx/wine/quartz/control_tlb.rgs diff --git a/reactos/dll/directx/quartz/dsoundrender.c b/reactos/dll/directx/wine/quartz/dsoundrender.c similarity index 100% rename from reactos/dll/directx/quartz/dsoundrender.c rename to reactos/dll/directx/wine/quartz/dsoundrender.c diff --git a/reactos/dll/directx/quartz/enumfilters.c b/reactos/dll/directx/wine/quartz/enumfilters.c similarity index 100% rename from reactos/dll/directx/quartz/enumfilters.c rename to reactos/dll/directx/wine/quartz/enumfilters.c diff --git a/reactos/dll/directx/quartz/enummedia.c b/reactos/dll/directx/wine/quartz/enummedia.c similarity index 100% rename from reactos/dll/directx/quartz/enummedia.c rename to reactos/dll/directx/wine/quartz/enummedia.c diff --git a/reactos/dll/directx/quartz/enummoniker.c b/reactos/dll/directx/wine/quartz/enummoniker.c similarity index 100% rename from reactos/dll/directx/quartz/enummoniker.c rename to reactos/dll/directx/wine/quartz/enummoniker.c diff --git a/reactos/dll/directx/quartz/enumregfilters.c b/reactos/dll/directx/wine/quartz/enumregfilters.c similarity index 100% rename from reactos/dll/directx/quartz/enumregfilters.c rename to reactos/dll/directx/wine/quartz/enumregfilters.c diff --git a/reactos/dll/directx/quartz/fil_data.idl b/reactos/dll/directx/wine/quartz/fil_data.idl similarity index 100% rename from reactos/dll/directx/quartz/fil_data.idl rename to reactos/dll/directx/wine/quartz/fil_data.idl diff --git a/reactos/dll/directx/quartz/filesource.c b/reactos/dll/directx/wine/quartz/filesource.c similarity index 100% rename from reactos/dll/directx/quartz/filesource.c rename to reactos/dll/directx/wine/quartz/filesource.c diff --git a/reactos/dll/directx/quartz/filtergraph.c b/reactos/dll/directx/wine/quartz/filtergraph.c similarity index 100% rename from reactos/dll/directx/quartz/filtergraph.c rename to reactos/dll/directx/wine/quartz/filtergraph.c diff --git a/reactos/dll/directx/quartz/filtermapper.c b/reactos/dll/directx/wine/quartz/filtermapper.c similarity index 100% rename from reactos/dll/directx/quartz/filtermapper.c rename to reactos/dll/directx/wine/quartz/filtermapper.c diff --git a/reactos/dll/directx/quartz/main.c b/reactos/dll/directx/wine/quartz/main.c similarity index 100% rename from reactos/dll/directx/quartz/main.c rename to reactos/dll/directx/wine/quartz/main.c diff --git a/reactos/dll/directx/quartz/memallocator.c b/reactos/dll/directx/wine/quartz/memallocator.c similarity index 100% rename from reactos/dll/directx/quartz/memallocator.c rename to reactos/dll/directx/wine/quartz/memallocator.c diff --git a/reactos/dll/directx/quartz/mpegsplit.c b/reactos/dll/directx/wine/quartz/mpegsplit.c similarity index 100% rename from reactos/dll/directx/quartz/mpegsplit.c rename to reactos/dll/directx/wine/quartz/mpegsplit.c diff --git a/reactos/dll/directx/quartz/nullrenderer.c b/reactos/dll/directx/wine/quartz/nullrenderer.c similarity index 100% rename from reactos/dll/directx/quartz/nullrenderer.c rename to reactos/dll/directx/wine/quartz/nullrenderer.c diff --git a/reactos/dll/directx/quartz/parser.c b/reactos/dll/directx/wine/quartz/parser.c similarity index 100% rename from reactos/dll/directx/quartz/parser.c rename to reactos/dll/directx/wine/quartz/parser.c diff --git a/reactos/dll/directx/quartz/parser.h b/reactos/dll/directx/wine/quartz/parser.h similarity index 100% rename from reactos/dll/directx/quartz/parser.h rename to reactos/dll/directx/wine/quartz/parser.h diff --git a/reactos/dll/directx/quartz/pin.c b/reactos/dll/directx/wine/quartz/pin.c similarity index 100% rename from reactos/dll/directx/quartz/pin.c rename to reactos/dll/directx/wine/quartz/pin.c diff --git a/reactos/dll/directx/quartz/pin.h b/reactos/dll/directx/wine/quartz/pin.h similarity index 100% rename from reactos/dll/directx/quartz/pin.h rename to reactos/dll/directx/wine/quartz/pin.h diff --git a/reactos/dll/directx/quartz/quartz.spec b/reactos/dll/directx/wine/quartz/quartz.spec similarity index 100% rename from reactos/dll/directx/quartz/quartz.spec rename to reactos/dll/directx/wine/quartz/quartz.spec diff --git a/reactos/dll/directx/quartz/quartz_private.h b/reactos/dll/directx/wine/quartz/quartz_private.h similarity index 100% rename from reactos/dll/directx/quartz/quartz_private.h rename to reactos/dll/directx/wine/quartz/quartz_private.h diff --git a/reactos/dll/directx/quartz/quartz_strmif.idl b/reactos/dll/directx/wine/quartz/quartz_strmif.idl similarity index 100% rename from reactos/dll/directx/quartz/quartz_strmif.idl rename to reactos/dll/directx/wine/quartz/quartz_strmif.idl diff --git a/reactos/dll/directx/quartz/quartz_strmif.rgs b/reactos/dll/directx/wine/quartz/quartz_strmif.rgs similarity index 100% rename from reactos/dll/directx/quartz/quartz_strmif.rgs rename to reactos/dll/directx/wine/quartz/quartz_strmif.rgs diff --git a/reactos/dll/directx/quartz/regsvr.c b/reactos/dll/directx/wine/quartz/regsvr.c similarity index 100% rename from reactos/dll/directx/quartz/regsvr.c rename to reactos/dll/directx/wine/quartz/regsvr.c diff --git a/reactos/dll/directx/quartz/systemclock.c b/reactos/dll/directx/wine/quartz/systemclock.c similarity index 100% rename from reactos/dll/directx/quartz/systemclock.c rename to reactos/dll/directx/wine/quartz/systemclock.c diff --git a/reactos/dll/directx/quartz/version.rc b/reactos/dll/directx/wine/quartz/version.rc similarity index 100% rename from reactos/dll/directx/quartz/version.rc rename to reactos/dll/directx/wine/quartz/version.rc diff --git a/reactos/dll/directx/quartz/videorenderer.c b/reactos/dll/directx/wine/quartz/videorenderer.c similarity index 100% rename from reactos/dll/directx/quartz/videorenderer.c rename to reactos/dll/directx/wine/quartz/videorenderer.c diff --git a/reactos/dll/directx/quartz/vmr9.c b/reactos/dll/directx/wine/quartz/vmr9.c similarity index 100% rename from reactos/dll/directx/quartz/vmr9.c rename to reactos/dll/directx/wine/quartz/vmr9.c diff --git a/reactos/dll/directx/quartz/waveparser.c b/reactos/dll/directx/wine/quartz/waveparser.c similarity index 100% rename from reactos/dll/directx/quartz/waveparser.c rename to reactos/dll/directx/wine/quartz/waveparser.c diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index f09f6db80c8..2a56c50ec94 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -27,24 +27,24 @@ reactos/tools/wpp # Synced to Wine-1.7.1 The following libraries are shared with Wine. -reactos/dll/directx/amstream # Synced to Wine-1.3.37 -reactos/dll/directx/dinput # Synced to Wine-1.7.1 -reactos/dll/directx/dinput8 # Synced to Wine-1.5.26 -reactos/dll/directx/dmusic # Synced to Wine-1.5.26 -reactos/dll/directx/dplay # Synced to Wine-1.5.26 -reactos/dll/directx/dplayx # Synced to Wine-1.5.26 -reactos/dll/directx/dsound # Synced to Wine-1.5.26 -reactos/dll/directx/dxdiagn # Synced to Wine-0_9_5 -reactos/dll/directx/dxgi # Synced to Wine-1.7.1 -reactos/dll/directx/msdmo # Autosync -reactos/dll/directx/qedit # Autosync -reactos/dll/directx/quartz # Synced to Wine-1.5.26 +reactos/dll/directx/wine/amstream # Synced to Wine-1.3.37 reactos/dll/directx/wine/d3d8 # Synced to Wine-1.7.1 reactos/dll/directx/wine/d3d9 # Synced to Wine-1.7.1 reactos/dll/directx/wine/d3dcompiler_43 # Synced to Wine-1.7.1 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.1 reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.1 reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.1 +reactos/dll/directx/wine/dinput # Synced to Wine-1.7.1 +reactos/dll/directx/wine/dinput8 # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dmusic # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dplay # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dplayx # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dsound # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dxdiagn # Synced to Wine-0_9_5 +reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.1 +reactos/dll/directx/wine/msdmo # Autosync +reactos/dll/directx/wine/qedit # Autosync +reactos/dll/directx/wine/quartz # Synced to Wine-1.5.26 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.1 reactos/dll/win32/activeds # Synced to Wine-1.1.43?