diff --git a/reactos/dll/directx/wine/wined3d/wined3d_private.h b/reactos/dll/directx/wine/wined3d/wined3d_private.h
index 24066c9562e..9b1c4d40e57 100644
--- a/reactos/dll/directx/wine/wined3d/wined3d_private.h
+++ b/reactos/dll/directx/wine/wined3d/wined3d_private.h
@@ -2551,7 +2551,7 @@ BOOL is_invalid_op(IWineD3DDeviceImpl *This, int stage, WINED3DTEXTUREOP op,
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,
diff --git a/reactos/include/reactos/libs/pseh/pseh2_64.h b/reactos/include/reactos/libs/pseh/pseh2_64.h
index 35661d5c7a5..fd582a1e1f3 100644
--- a/reactos/include/reactos/libs/pseh/pseh2_64.h
+++ b/reactos/include/reactos/libs/pseh/pseh2_64.h
@@ -2,14 +2,34 @@
#define KJK_PSEH2_H_
-#define _SEH2_TRY if(1)
-#define _SEH2_EXCEPT(x) else
-#define _SEH2_END
-#define _SEH2_GetExceptionCode() (0)
-#define _SEH2_YIELD(x) x
+#define _SEH2_TRY if(1) {
+#define _SEH2_EXCEPT(...) } if(0) {
+#define _SEH2_END }
+#define _SEH2_YIELD(STMT_) STMT_
#define _SEH2_LEAVE
-#define _SEH2_FINALLY
+#define _SEH2_FINALLY } if(1) {
+#define _SEH2_GetExceptionInformation() (GetExceptionInformation())
+#define _SEH2_GetExceptionCode() (0)
+#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
diff --git a/reactos/lib/3rdparty/mingw/mingw.rbuild b/reactos/lib/3rdparty/mingw/mingw.rbuild
index d0fa578bb4f..1b544f59879 100644
--- a/reactos/lib/3rdparty/mingw/mingw.rbuild
+++ b/reactos/lib/3rdparty/mingw/mingw.rbuild
@@ -18,7 +18,7 @@
dllentry.c
dummy_mingwthrd.c
gccmain.c
-
+ getopt.c
gs_support.c
merr.c