Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 66491: [DMUSIC] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 11:21:27 2015 New Revision: 66491 URL: http://svn.reactos.org/svn/reactos?rev=66491&view=rev Log: [DMUSIC] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/directx/wine/dmusic/port.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dmusic/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/po… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/port.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/port.c [iso-8859-1] Sat Feb 28 11:21:27 2015 @@ -48,9 +48,7 @@ { TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument) || - IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument8)) + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument)) { IDirectMusicDownloadedInstrument_AddRef(iface); *ret_iface = iface; @@ -131,19 +129,15 @@ TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); - if (IsEqualIID (riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirectMusicPort) || - IsEqualGUID(riid, &IID_IDirectMusicPort8)) { + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort)) { *ret_iface = &This->IDirectMusicPort_iface; IDirectMusicPort_AddRef((LPDIRECTMUSICPORT)*ret_iface); return S_OK; - } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload) || - IsEqualGUID(riid, &IID_IDirectMusicPortDownload8)) { + } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload)) { *ret_iface = &This->IDirectMusicPortDownload_iface; IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ret_iface); return S_OK; - } else if (IsEqualGUID(riid, &IID_IDirectMusicThru) || - IsEqualGUID(riid, &IID_IDirectMusicThru8)) { + } else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) { *ret_iface = &This->IDirectMusicThru_iface; IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface); return S_OK; 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 Feb 28 11:21:27 2015 @@ -38,7 +38,7 @@ reactos/dll/directx/wine/devenum # Synced to Wine-1.7.27 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.27 -reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.27 +reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/dplay # Synced to Wine-1.7.27 reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.27 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29

1 0

[akhaldi] 66490: [D3DX9_*] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 11:17:10 2015 New Revision: 66490 URL: http://svn.reactos.org/svn/reactos?rev=66490&view=rev Log: [D3DX9_*] Sync with Wine Staging 1.7.37. CORE-9246 Added: trunk/reactos/dll/directx/wine/d3dx9_36/animation.c (with props) Modified: trunk/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.spec trunk/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.spec trunk/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.spec trunk/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.spec trunk/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.spec trunk/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.spec trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec trunk/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.spec trunk/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.spec trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33.spec trunk/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.spec trunk/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.spec trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h trunk/reactos/dll/directx/wine/d3dx9_36/effect.c trunk/reactos/dll/directx/wine/d3dx9_36/font.c trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c trunk/reactos/dll/directx/wine/d3dx9_36/shader.c trunk/reactos/dll/directx/wine/d3dx9_36/skin.c trunk/reactos/dll/directx/wine/d3dx9_36/surface.c trunk/reactos/dll/directx/wine/d3dx9_36/texture.c trunk/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.spec trunk/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.spec trunk/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.spec trunk/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.spec trunk/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.spec trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec trunk/reactos/dll/directx/wine/d3dx9_43/d3dx9_43.spec trunk/reactos/include/dxsdk/d3dx9anim.h trunk/reactos/include/dxsdk/d3dx9mesh.h trunk/reactos/include/dxsdk/d3dx9shader.h trunk/reactos/include/dxsdk/d3dx9shape.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_24/… Modified: trunk/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_25/… Modified: trunk/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_26/… Modified: trunk/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_27/… Modified: trunk/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_28/… Modified: trunk/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_29/… Modified: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… Modified: trunk/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_31/… Modified: trunk/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_32/… Modified: trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_33/… Modified: trunk/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_34/… Modified: trunk/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_35/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Added: trunk/reactos/dll/directx/wine/d3dx9_36/animation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/effect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/skin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_37/… Modified: trunk/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_38/… Modified: trunk/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_39/… Modified: trunk/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_40/… Modified: trunk/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_41/… Modified: trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_42/… Modified: trunk/reactos/dll/directx/wine/d3dx9_43/d3dx9_43.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_43/… Modified: trunk/reactos/include/dxsdk/d3dx9anim.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9anim.h?… Modified: trunk/reactos/include/dxsdk/d3dx9mesh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9mesh.h?… Modified: trunk/reactos/include/dxsdk/d3dx9shader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9shader.… Modified: trunk/reactos/include/dxsdk/d3dx9shape.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9shape.h… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 66489: [INCLUDE/WINE] Attempt to please the...
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 10:35:08 2015 New Revision: 66489 URL: http://svn.reactos.org/svn/reactos?rev=66489&view=rev Log: [INCLUDE/WINE] Attempt to please the... Modified: trunk/reactos/include/reactos/wine/rbtree.h Modified: trunk/reactos/include/reactos/wine/rbtree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/rbtre… ============================================================================== --- trunk/reactos/include/reactos/wine/rbtree.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/rbtree.h [iso-8859-1] Sat Feb 28 10:35:08 2015 @@ -23,7 +23,7 @@ #define __WINE_WINE_RBTREE_H #define WINE_RB_ENTRY_VALUE(element, type, field) \ - ((type *)((char *)(element) - offsetof(type, field))) + ((type *)((char *)(element) - FIELD_OFFSET(type, field))) struct wine_rb_entry {

1 0

[akhaldi] 66488: [D3D8][D3D9][DDRAW][WINED3D] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 10:18:41 2015 New Revision: 66488 URL: http://svn.reactos.org/svn/reactos?rev=66488&view=rev Log: [D3D8][D3D9][DDRAW][WINED3D] Sync with Wine Staging 1.7.37. CORE-9246 Added: trunk/reactos/dll/directx/wine/wined3d/dxtn.c (with props) Modified: trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/shader.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/shader.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cs.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/sampler.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/view.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wined3d.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/shad… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/shad… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Added: trunk/reactos/dll/directx/wine/wined3d/dxtn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/sampler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 66487: [DXGI] Add missing config.h include.
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 10:17:21 2015 New Revision: 66487 URL: http://svn.reactos.org/svn/reactos?rev=66487&view=rev Log: [DXGI] Add missing config.h include. Modified: trunk/reactos/dll/directx/wine/dxgi/guid.c Modified: trunk/reactos/dll/directx/wine/dxgi/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/guid… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/guid.c [iso-8859-1] Sat Feb 28 10:17:21 2015 @@ -1,5 +1,6 @@ /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ +#include <wine/config.h> #include <stdarg.h> #define WIN32_NO_STATUS

1 0

[akhaldi] 66486: [INCLUDE/WINE] Update rbtree.h. CORE-9246
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 10:15:41 2015 New Revision: 66486 URL: http://svn.reactos.org/svn/reactos?rev=66486&view=rev Log: [INCLUDE/WINE] Update rbtree.h. CORE-9246 Modified: trunk/reactos/include/reactos/wine/rbtree.h Modified: trunk/reactos/include/reactos/wine/rbtree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/rbtre… ============================================================================== --- trunk/reactos/include/reactos/wine/rbtree.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/rbtree.h [iso-8859-1] Sat Feb 28 10:15:41 2015 @@ -23,7 +23,7 @@ #define __WINE_WINE_RBTREE_H #define WINE_RB_ENTRY_VALUE(element, type, field) \ - ((type *)((char *)(element) - FIELD_OFFSET(type, field))) + ((type *)((char *)(element) - offsetof(type, field))) struct wine_rb_entry { @@ -220,12 +220,16 @@ wine_rb_postorder(tree, callback, context); } -static inline void wine_rb_destroy(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) +static inline void wine_rb_clear(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) { /* Note that we use postorder here because the callback will likely free the entry. */ if (callback) wine_rb_postorder(tree, callback, context); - tree->root = NULL; +} + +static inline void wine_rb_destroy(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) +{ + wine_rb_clear(tree, callback, context); tree->functions->free(tree->stack.entries); }

1 0

[akhaldi] 66485: [NETSHELL] Simplify registration by using an rgs file. Brought to you by Giannis Adamopoulos. CORE-9276
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 10:11:51 2015 New Revision: 66485 URL: http://svn.reactos.org/svn/reactos?rev=66485&view=rev Log: [NETSHELL] Simplify registration by using an rgs file. Brought to you by Giannis Adamopoulos. CORE-9276 Added: trunk/reactos/dll/shellext/netshell/res/netshell.rgs Modified: trunk/reactos/dll/shellext/netshell/netshell.cpp trunk/reactos/dll/shellext/netshell/netshell.rc trunk/reactos/dll/shellext/netshell/resource.h Modified: trunk/reactos/dll/shellext/netshell/netshell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/nets… ============================================================================== --- trunk/reactos/dll/shellext/netshell/netshell.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/netshell.cpp [iso-8859-1] Sat Feb 28 10:11:51 2015 @@ -4,13 +4,12 @@ HINSTANCE netshell_hInstance; -static const WCHAR szNetConnectClass[] = L"CLSID\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; -static const WCHAR szLanConnectUI[] = L"CLSID\\{7007ACC5-3202-11D1-AAD2-00805FC1270E}"; -static const WCHAR szLanConnectStatusUI[] = L"CLSID\\{7007ACCF-3202-11D1-AAD2-00805FC1270E}"; -static const WCHAR szNamespaceKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; - extern "C" { + +/* FIXME: rpcproxy.h */ +HRESULT __wine_register_resources(HMODULE module); +HRESULT __wine_unregister_resources(HMODULE module); BOOL WINAPI @@ -39,94 +38,13 @@ STDAPI DllRegisterServer(void) { - HKEY hKey, hSubKey; - WCHAR szName[MAX_PATH+20] = {0}; - WCHAR szNet[20]; - UINT Length, Offset; - - - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szNetConnectClass, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) - return SELFREG_E_CLASS; - - if (LoadStringW(netshell_hInstance, IDS_NETWORKCONNECTION, szName, MAX_PATH)) - { - szName[MAX_PATH-1] = L'\0'; - RegSetValueW(hKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR)); - } - - if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szNamespaceKey, 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - RegSetValueW(hSubKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR)); - RegCloseKey(hSubKey); - } - - Length = swprintf(szNet, L",-%u", IDS_NETWORKCONNECTION); - Offset = GetModuleFileNameW(netshell_hInstance, &szName[1], (sizeof(szName)/sizeof(WCHAR))-1); - if (Offset + Length + 2 < MAX_PATH) - { - /* set localized name */ - szName[0] = L'@'; - wcscpy(&szName[Offset+1], szNet); - RegSetValueExW(hKey, L"LocalizedString", 0, REG_SZ, (const LPBYTE)szName, (wcslen(szName)+1) * sizeof(WCHAR)); - } - - szName[Offset+1] = L'\0'; - - /* store default icon */ - if (RegCreateKeyExW(hKey, L"DefaultIcon", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); - RegCloseKey(hSubKey); - } - if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); - RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); - RegCloseKey(hSubKey); - } - - if (RegCreateKeyExW(hKey, L"ShellFolder", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - DWORD dwAttributes = SFGAO_FOLDER; - RegSetValueExW(hSubKey, L"Attributes",0, REG_BINARY, (const LPBYTE)&dwAttributes, sizeof(DWORD)); - } - - RegCloseKey(hKey); - - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szLanConnectUI, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) - return SELFREG_E_CLASS; - - if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); - RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); - RegCloseKey(hSubKey); - } - - RegCloseKey(hKey); - - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szLanConnectStatusUI, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) - return SELFREG_E_CLASS; - - if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); - RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); - RegCloseKey(hSubKey); - } - - RegCloseKey(hKey); - - - return S_OK; + return __wine_register_resources(netshell_hInstance); } STDAPI DllUnregisterServer(void) { - SHDeleteKeyW(HKEY_CLASSES_ROOT, szNetConnectClass); - SHDeleteKeyW(HKEY_LOCAL_MACHINE, szNamespaceKey); - return S_OK; + return __wine_unregister_resources(netshell_hInstance); } STDAPI Modified: trunk/reactos/dll/shellext/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/nets… ============================================================================== --- trunk/reactos/dll/shellext/netshell/netshell.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/netshell.rc [iso-8859-1] Sat Feb 28 10:11:51 2015 @@ -21,6 +21,8 @@ IDI_NET_REC ICON "res/netrec.ico" IDI_NET_TRANS ICON "res/nettrans.ico" IDI_NET_TRANSREC ICON "res/nettrrec.ico" + +IDR_NETSHELL REGISTRY "res/netshell.rgs" /* UTF-8 */ #pragma code_page(65001) Added: trunk/reactos/dll/shellext/netshell/res/netshell.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/res/… ============================================================================== --- trunk/reactos/dll/shellext/netshell/res/netshell.rgs (added) +++ trunk/reactos/dll/shellext/netshell/res/netshell.rgs [iso-8859-1] Sat Feb 28 10:11:51 2015 @@ -0,0 +1,60 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {7007ACC7-3202-11D1-AAD2-00805FC1270E} = s 'Network Connections' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Both' + } + DefaultIcon = s '%MODULE%' + ShellFolder + { + val Attributes = d '0x00000020' + } + val LocalizedString = s '@%MODULE%,-10000' + } + ForceRemove {7007ACC5-3202-11D1-AAD2-00805FC1270E} = s 'Network Connections' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Both' + } + } + ForceRemove {7007ACCF-3202-11D1-AAD2-00805FC1270E} = s 'Network Connections' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Both' + } + } + } +} +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Windows + { + NoRemove CurrentVersion + { + NoRemove Explorer + { + NoRemove MyComputer + { + NoRemove NameSpace + { + ForceRemove {7007ACC7-3202-11D1-AAD2-00805FC1270E} = s 'Network Connections' + { + } + } + } + } + } + } + } + } +} Modified: trunk/reactos/dll/shellext/netshell/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/reso… ============================================================================== --- trunk/reactos/dll/shellext/netshell/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/resource.h [iso-8859-1] Sat Feb 28 10:11:51 2015 @@ -94,3 +94,5 @@ #define IDS_WINS_SERVERS 10308 #define IDS_PROPERTY 10309 #define IDS_VALUE 10310 + +#define IDR_NETSHELL 20000

1 0

[akhaldi] 66484: [CMAKE] Just check for ReactOS in CMake version for PCH, not a specific version.
by akhaldi＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: akhaldi Date: Sat Feb 28 09:59:39 2015 New Revision: 66484 URL: http://svn.reactos.org/svn/reactos?rev=66484&view=rev Log: [CMAKE] Just check for ReactOS in CMake version for PCH, not a specific version. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=66484&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Feb 28 09:59:39 2015 @@ -137,7 +137,7 @@ add_definitions(-D_WINKD_=1) endif() - if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") + if(CMAKE_VERSION MATCHES "ReactOS") set(PCH 1 CACHE BOOL "Whether to use precompiled headers") else() set(PCH 0 CACHE BOOL "Whether to use precompiled headers")

1 0

[janderwald] 66483: [USBCCGP] - reset interface count before loop - add extra checks
by janderwald＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: janderwald Date: Sat Feb 28 09:48:16 2015 New Revision: 66483 URL: http://svn.reactos.org/svn/reactos?rev=66483&view=rev Log: [USBCCGP] - reset interface count before loop - add extra checks Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/descri… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] Sat Feb 28 09:48:16 2015 @@ -326,6 +326,11 @@ // count all interface descriptors // DescriptorCount = ConfigurationDescriptor->bNumInterfaces; + if (DescriptorCount == 0) + { + DPRINT1("[USBCCGP] DescriptorCount is zero\n"); + return STATUS_INVALID_PARAMETER; + } // // allocate array holding the interface descriptors @@ -338,6 +343,11 @@ // return STATUS_INSUFFICIENT_RESOURCES; } + + // + // reset interface list count + // + FDODeviceExtension->InterfaceListCount = 0; do { @@ -350,6 +360,7 @@ // // store in interface list // + ASSERT(FDODeviceExtension->InterfaceListCount < DescriptorCount); FDODeviceExtension->InterfaceList[FDODeviceExtension->InterfaceListCount].InterfaceDescriptor = InterfaceDescriptor; FDODeviceExtension->InterfaceListCount++; }

1 0

[tfaber] 66482: [ROSAUTOTEST] - Avoid double-close of pipe handles
by tfaber＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: tfaber Date: Sat Feb 28 06:56:56 2015 New Revision: 66482 URL: http://svn.reactos.org/svn/reactos?rev=66482&view=rev Log: [ROSAUTOTEST] - Avoid double-close of pipe handles Modified: trunk/rostests/rosautotest/CPipe.cpp Modified: trunk/rostests/rosautotest/CPipe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CPipe.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/CPipe.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CPipe.cpp [iso-8859-1] Sat Feb 28 06:56:56 2015 @@ -42,6 +42,7 @@ if (!m_hReadPipe) FATAL("Trying to close already closed read pipe"); CloseHandle(m_hReadPipe); + m_hReadPipe = NULL; } /** @@ -53,6 +54,7 @@ if (!m_hWritePipe) FATAL("Trying to close already closed write pipe"); CloseHandle(m_hWritePipe); + m_hWritePipe = NULL; } /**

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs