ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

commit stragglers from main tree

Browse Source 
svn path=/branches/ros-amd64-bringup/; revision=44477
This commit is contained in:
Samuel Serapion
2009-12-09 01:20:38 +00:00
parent fee45191b7
commit 9ed44b0a95
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/directx/wine/wined3d/wined3d_private.h
+1 -1
View File
@@ -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,
reactos/include/reactos/libs/pseh/pseh2_64.h
+26 -6
View File
@@ -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
reactos/lib/3rdparty/mingw/mingw.rbuild
Vendored
+1 -1
View File
@@ -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 -->