[sserapion] 44477: commit stragglers from main tree

Author: sserapion
Date: Wed Dec  9 02:20:38 2009
New Revision: 44477

URL: http://svn.reactos.org/svn/reactos?rev=44477&view=rev
Log:
commit stragglers from main tree

Modified:
    branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/wined3d_private.h
    branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h
    branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild

Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/wined3d_private.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/wined3d_private.h
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/wined3d_private.h
[iso-8859-1] Wed Dec  9 02:20:38 2009
@@ -2551,7 +2551,7 @@
 void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEXTUREOP
op,
         DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) DECLSPEC_HIDDEN;
 void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords,
-        BOOL transformed, DWORD coordtype, BOOL ffp_can_disable_proj) DECLSPEC_HIDDEN;
+        BOOL transformed, WINED3DFORMAT coordtype, BOOL ffp_can_disable_proj)
DECLSPEC_HIDDEN;
 void texture_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock,
         struct wined3d_context *context) DECLSPEC_HIDDEN;
 void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock,

Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h [iso-8859-1]
Wed Dec  9 02:20:38 2009
@@ -2,14 +2,34 @@
 #define KJK_PSEH2_H_
 
 
-#define _SEH2_TRY if(1)
-#define _SEH2_EXCEPT(x) else
-#define _SEH2_END
+#define _SEH2_TRY if(1) {
+#define _SEH2_EXCEPT(...) } if(0) {
+#define _SEH2_END }
+#define _SEH2_YIELD(STMT_) STMT_
+#define _SEH2_LEAVE
+#define _SEH2_FINALLY } if(1) {
+#define _SEH2_GetExceptionInformation() (GetExceptionInformation())
 #define _SEH2_GetExceptionCode() (0)
-#define _SEH2_YIELD(x) x
-#define _SEH2_LEAVE
-#define _SEH2_FINALLY
+#define _SEH2_AbnormalTermination() (0)
 
+struct _EXCEPTION_RECORD;
+struct _EXCEPTION_POINTERS;
+struct _CONTEXT;
+
+typedef int (__cdecl * _SEH2FrameHandler_t)
+(
+	struct _EXCEPTION_RECORD *,
+	void *,
+	struct _CONTEXT *,
+	void *
+);
+
+typedef struct __SEH2Registration
+{
+	struct __SEH2Registration * SER_Prev;
+	_SEH2FrameHandler_t SER_Handler;
+}
+_SEH2Registration_t;
 
 
 #endif

Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3…
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Wed
Dec  9 02:20:38 2009
@@ -18,7 +18,7 @@
 	<file>dllentry.c</file>
 	<file>dummy_mingwthrd.c</file>
 	<file>gccmain.c</file>
-	<!-- file>getopt.c</file -->
+	<file>getopt.c</file>
 	<file>gs_support.c</file>
 	<file>merr.c</file>
 	<!-- file>mingw_custom.c</file -->