Changeset 28475 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine
- Timestamp:
- Apr 19, 2010 3:27:01 PM (15 years ago)
- Location:
- trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine
- Files:
-
- 16 edited
-
dcetypes.idl (modified) (1 diff)
-
epm.idl (modified) (1 diff)
-
exception.h (modified) (2 diffs)
-
irot.idl (modified) (1 diff)
-
itss.idl (modified) (1 diff)
-
library.h (modified) (1 diff)
-
pthread.h (modified) (1 diff)
-
server_protocol.h (modified) (6 diffs)
-
svcctl.idl (modified) (1 diff)
-
test.h (modified) (7 diffs)
-
wine_common_ver.rc (modified) (1 diff)
-
wined3d.h (modified) (10 diffs)
-
wined3d.idl (modified) (9 diffs)
-
winedxgi.idl (modified) (1 diff)
-
winnet16.h (modified) (1 diff)
-
wpp.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/dcetypes.idl
r22496 r28475 17 17 * License along with this library; if not, write to the Free Software 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 */20 21 /*22 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice23 * other than GPL or LGPL is available it will apply instead, Sun elects to use only24 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where25 * a choice of LGPL license versions is made available with the language indicating26 * that LGPLv2 or any later version may be used, or where a choice of which version27 * of the LGPL is applied is otherwise unspecified.28 19 */ 29 20 -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/epm.idl
r22496 r28475 17 17 * License along with this library; if not, write to the Free Software 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 */20 21 /*22 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice23 * other than GPL or LGPL is available it will apply instead, Sun elects to use only24 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where25 * a choice of LGPL license versions is made available with the language indicating26 * that LGPLv2 or any later version may be used, or where a choice of which version27 * of the LGPL is applied is otherwise unspecified.28 19 */ 29 20 -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/exception.h
r21731 r28475 103 103 #define siglongjmp(buf,val) longjmp(buf,val) 104 104 #endif 105 106 extern void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, 107 void (*target)(void) ) DECLSPEC_HIDDEN DECLSPEC_NORETURN; 108 extern DWORD __wine_exception_handler( EXCEPTION_RECORD *record, 109 EXCEPTION_REGISTRATION_RECORD *frame, 110 CONTEXT *context, 111 EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; 112 extern DWORD __wine_exception_handler_page_fault( EXCEPTION_RECORD *record, 113 EXCEPTION_REGISTRATION_RECORD *frame, 114 CONTEXT *context, 115 EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; 116 extern DWORD __wine_exception_handler_all( EXCEPTION_RECORD *record, 117 EXCEPTION_REGISTRATION_RECORD *frame, 118 CONTEXT *context, 119 EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; 120 extern DWORD __wine_finally_handler( EXCEPTION_RECORD *record, 121 EXCEPTION_REGISTRATION_RECORD *frame, 122 CONTEXT *context, 123 EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; 105 124 106 125 #define __TRY \ … … 256 275 extern void __wine_enter_vm86( CONTEXT *context ); 257 276 258 #ifndef USE_COMPILER_EXCEPTIONS259 260 NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID);261 262 static inline void DECLSPEC_NORETURN __wine_unwind_target(void)263 {264 __WINE_FRAME *wine_frame = (__WINE_FRAME *)__wine_get_frame();265 __wine_pop_frame( &wine_frame->frame );266 siglongjmp( wine_frame->jmp, 1 );267 }268 269 /* wrapper for RtlUnwind since it clobbers registers on Windows */270 static inline void DECLSPEC_NORETURN __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame,271 EXCEPTION_RECORD *record,272 void (*target)(void) )273 {274 #if defined(__GNUC__) && defined(__i386__)275 int dummy1, dummy2, dummy3, dummy4;276 __asm__ __volatile__("pushl %%ebp\n\t"277 "pushl %%ebx\n\t"278 "pushl $0\n\t"279 "pushl %3\n\t"280 "pushl %2\n\t"281 "pushl %1\n\t"282 "call *%0\n\t"283 "popl %%ebx\n\t"284 "popl %%ebp"285 : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3), "=c" (dummy4)286 : "0" (RtlUnwind), "1" (frame), "2" (target), "3" (record)287 : "edx", "memory" );288 #else289 RtlUnwind( frame, target, record, 0 );290 #endif291 for (;;) target();292 }293 294 static inline void DECLSPEC_NORETURN __wine_unwind_frame( EXCEPTION_RECORD *record,295 EXCEPTION_REGISTRATION_RECORD *frame )296 {297 __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame;298 299 /* hack to make GetExceptionCode() work in handler */300 wine_frame->ExceptionCode = record->ExceptionCode;301 wine_frame->ExceptionRecord = wine_frame;302 303 __wine_rtl_unwind( frame, record, __wine_unwind_target );304 }305 306 static inline DWORD __wine_exception_handler( EXCEPTION_RECORD *record,307 EXCEPTION_REGISTRATION_RECORD *frame,308 CONTEXT *context,309 EXCEPTION_REGISTRATION_RECORD **pdispatcher )310 {311 __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame;312 EXCEPTION_POINTERS ptrs;313 314 if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL))315 return ExceptionContinueSearch;316 317 ptrs.ExceptionRecord = record;318 ptrs.ContextRecord = context;319 switch(wine_frame->u.filter( &ptrs ))320 {321 case EXCEPTION_CONTINUE_SEARCH:322 return ExceptionContinueSearch;323 case EXCEPTION_CONTINUE_EXECUTION:324 return ExceptionContinueExecution;325 case EXCEPTION_EXECUTE_HANDLER:326 break;327 }328 __wine_unwind_frame( record, frame );329 }330 331 static inline DWORD __wine_exception_handler_page_fault( EXCEPTION_RECORD *record,332 EXCEPTION_REGISTRATION_RECORD *frame,333 CONTEXT *context,334 EXCEPTION_REGISTRATION_RECORD **pdispatcher )335 {336 if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL))337 return ExceptionContinueSearch;338 if (record->ExceptionCode != STATUS_ACCESS_VIOLATION)339 return ExceptionContinueSearch;340 __wine_unwind_frame( record, frame );341 }342 343 static inline DWORD __wine_exception_handler_all( EXCEPTION_RECORD *record,344 EXCEPTION_REGISTRATION_RECORD *frame,345 CONTEXT *context,346 EXCEPTION_REGISTRATION_RECORD **pdispatcher )347 {348 if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL))349 return ExceptionContinueSearch;350 __wine_unwind_frame( record, frame );351 }352 353 static inline DWORD __wine_finally_handler( EXCEPTION_RECORD *record,354 EXCEPTION_REGISTRATION_RECORD *frame,355 CONTEXT *context,356 EXCEPTION_REGISTRATION_RECORD **pdispatcher )357 {358 if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))359 {360 __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame;361 wine_frame->u.finally_func( FALSE );362 }363 return ExceptionContinueSearch;364 }365 366 #endif /* USE_COMPILER_EXCEPTIONS */367 368 277 #ifdef __cplusplus 369 278 } -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/irot.idl
r22496 r28475 15 15 * License along with this library; if not, write to the Free Software 16 16 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 17 */18 19 /*20 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice21 * other than GPL or LGPL is available it will apply instead, Sun elects to use only22 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where23 * a choice of LGPL license versions is made available with the language indicating24 * that LGPLv2 or any later version may be used, or where a choice of which version25 * of the LGPL is applied is otherwise unspecified.26 17 */ 27 18 -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/itss.idl
r22496 r28475 15 15 * License along with this library; if not, write to the Free Software 16 16 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 17 */18 19 /*20 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice21 * other than GPL or LGPL is available it will apply instead, Sun elects to use only22 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where23 * a choice of LGPL license versions is made available with the language indicating24 * that LGPLv2 or any later version may be used, or where a choice of which version25 * of the LGPL is applied is otherwise unspecified.26 17 */ 27 18 -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/library.h
r25949 r28475 17 17 * License along with this library; if not, write to the Free Software 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 */20 21 /*22 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice23 * other than GPL or LGPL is available it will apply instead, Sun elects to use only24 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where25 * a choice of LGPL license versions is made available with the language indicating26 * that LGPLv2 or any later version may be used, or where a choice of which version27 * of the LGPL is applied is otherwise unspecified.28 19 */ 29 20 -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/pthread.h
r22496 r28475 17 17 * License along with this library; if not, write to the Free Software 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 */20 21 /*22 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice23 * other than GPL or LGPL is available it will apply instead, Sun elects to use only24 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where25 * a choice of LGPL license versions is made available with the language indicating26 * that LGPLv2 or any later version may be used, or where a choice of which version27 * of the LGPL is applied is otherwise unspecified.28 */29 30 /*31 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice32 * other than GPL or LGPL is available it will apply instead, Sun elects to use only33 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where34 * a choice of LGPL license versions is made available with the language indicating35 * that LGPLv2 or any later version may be used, or where a choice of which version36 * of the LGPL is applied is otherwise unspecified.37 */38 39 /*40 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice41 * other than GPL or LGPL is available it will apply instead, Sun elects to use only42 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where43 * a choice of LGPL license versions is made available with the language indicating44 * that LGPLv2 or any later version may be used, or where a choice of which version45 * of the LGPL is applied is otherwise unspecified.46 */47 48 /*49 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice50 * other than GPL or LGPL is available it will apply instead, Sun elects to use only51 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where52 * a choice of LGPL license versions is made available with the language indicating53 * that LGPLv2 or any later version may be used, or where a choice of which version54 * of the LGPL is applied is otherwise unspecified.55 19 */ 56 20 -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/server_protocol.h
r25949 r28475 152 152 struct { unsigned int eip, ebp, esp, eflags, cs, ss; } i386_regs; 153 153 struct { unsigned __int64 rip, rbp, rsp; 154 unsigned int cs, ss, flags ; } x86_64_regs;154 unsigned int cs, ss, flags, __pad; } x86_64_regs; 155 155 struct { unsigned __int64 fir; 156 unsigned int psr ; } alpha_regs;157 struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap ; } powerpc_regs;156 unsigned int psr, __pad; } alpha_regs; 157 struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; 158 158 struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; 159 159 } ctl; … … 735 735 int priority; 736 736 cpu_type_t cpu; 737 char __pad_60[4];737 int debugger_present; 738 738 }; 739 739 … … 4666 4666 struct reply_header __header; 4667 4667 }; 4668 4669 4670 4671 struct set_cursor_request 4672 { 4673 struct request_header __header; 4674 unsigned int flags; 4675 user_handle_t handle; 4676 int show_count; 4677 }; 4678 struct set_cursor_reply 4679 { 4680 struct reply_header __header; 4681 user_handle_t prev_handle; 4682 int prev_count; 4683 }; 4684 #define SET_CURSOR_HANDLE 0x01 4685 #define SET_CURSOR_COUNT 0x02 4668 4686 4669 4687 … … 4911 4929 REQ_alloc_user_handle, 4912 4930 REQ_free_user_handle, 4931 REQ_set_cursor, 4913 4932 REQ_NB_REQUESTS 4914 4933 }; … … 5159 5178 struct alloc_user_handle_request alloc_user_handle_request; 5160 5179 struct free_user_handle_request free_user_handle_request; 5180 struct set_cursor_request set_cursor_request; 5161 5181 }; 5162 5182 union generic_reply … … 5405 5425 struct alloc_user_handle_reply alloc_user_handle_reply; 5406 5426 struct free_user_handle_reply free_user_handle_reply; 5407 }; 5408 5409 #define SERVER_PROTOCOL_VERSION 395 5427 struct set_cursor_reply set_cursor_reply; 5428 }; 5429 5430 #define SERVER_PROTOCOL_VERSION 398 5410 5431 5411 5432 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/svcctl.idl
r22496 r28475 29 29 */ 30 30 31 /*32 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice33 * other than GPL or LGPL is available it will apply instead, Sun elects to use only34 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where35 * a choice of LGPL license versions is made available with the language indicating36 * that LGPLv2 or any later version may be used, or where a choice of which version37 * of the LGPL is applied is otherwise unspecified.38 */39 40 31 import "wtypes.idl"; 41 32 -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/test.h
r23571 r28475 75 75 static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } 76 76 77 /* strcmpW is avaiable for tests compiled under Wine, but not in standalone 78 * builds under Windows, so we reimplement it under a different name. */ 79 static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) 80 { 81 while (*str1 && (*str1 == *str2)) { str1++; str2++; } 82 return *str1 - *str2; 83 } 84 77 85 #ifdef STANDALONE 78 86 #define START_TEST(name) \ … … 84 92 #endif 85 93 94 #if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) 95 #define __winetest_cdecl __cdecl 96 #define __winetest_va_list __builtin_ms_va_list 97 #else 98 #define __winetest_cdecl 99 #define __winetest_va_list va_list 100 #endif 101 86 102 extern int broken( int condition ); 87 extern int winetest_vok( int condition, const char *msg, va_list ap );88 extern void winetest_vskip( const char *msg, va_list ap );103 extern int winetest_vok( int condition, const char *msg, __winetest_va_list ap ); 104 extern void winetest_vskip( const char *msg, __winetest_va_list ap ); 89 105 90 106 #ifdef __GNUC__ 91 107 92 extern intwinetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) ));93 extern void winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2)));94 extern void winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2)));95 extern void winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2)));108 extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); 109 extern void __winetest_cdecl winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); 110 extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); 111 extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); 96 112 97 113 #else /* __GNUC__ */ 98 114 99 extern intwinetest_ok( int condition, const char *msg, ... );100 extern void winetest_skip( const char *msg, ... );101 extern void winetest_win_skip( const char *msg, ... );102 extern void winetest_trace( const char *msg, ... );115 extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ); 116 extern void __winetest_cdecl winetest_skip( const char *msg, ... ); 117 extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ); 118 extern void __winetest_cdecl winetest_trace( const char *msg, ... ); 103 119 104 120 #endif /* __GNUC__ */ 105 121 106 #define ok_(file, line) (winetest_set_location(file, line), 0) ? 0 : winetest_ok122 #define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok 107 123 #define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip 108 124 #define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip … … 170 186 #include <stdio.h> 171 187 188 #if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) 189 # define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) 190 # define __winetest_va_end(list) __builtin_ms_va_end(list) 191 #else 192 # define __winetest_va_start(list,arg) va_start(list,arg) 193 # define __winetest_va_end(list) va_end(list) 194 #endif 195 172 196 struct test 173 197 { … … 285 309 * 0 if condition does not have the expected value, 1 otherwise 286 310 */ 287 int winetest_vok( int condition, const char *msg, va_list args )311 int winetest_vok( int condition, const char *msg, __winetest_va_list args ) 288 312 { 289 313 tls_data* data=get_tls_data(); … … 332 356 } 333 357 334 int winetest_ok( int condition, const char *msg, ... ) 335 { 336 va_list valist; 337 int rc; 338 339 va_start(valist, msg); 340 rc=winetest_vok(condition, msg, valist); 341 va_end(valist); 342 return rc; 343 } 344 345 void winetest_trace( const char *msg, ... ) 346 { 347 va_list valist; 358 void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) 359 { 360 __winetest_va_list valist; 361 362 __winetest_va_start(valist, msg); 363 winetest_vok(condition, msg, valist); 364 __winetest_va_end(valist); 365 } 366 367 void __winetest_cdecl winetest_trace( const char *msg, ... ) 368 { 369 __winetest_va_list valist; 348 370 tls_data* data=get_tls_data(); 349 371 … … 351 373 { 352 374 fprintf( stdout, "%s:%d: ", data->current_file, data->current_line ); 353 va_start(valist, msg);375 __winetest_va_start(valist, msg); 354 376 vfprintf(stdout, msg, valist); 355 va_end(valist);356 } 357 } 358 359 void winetest_vskip( const char *msg, va_list args )377 __winetest_va_end(valist); 378 } 379 } 380 381 void winetest_vskip( const char *msg, __winetest_va_list args ) 360 382 { 361 383 tls_data* data=get_tls_data(); … … 366 388 } 367 389 368 void winetest_skip( const char *msg, ... )369 { 370 va_list valist;371 va_start(valist, msg);390 void __winetest_cdecl winetest_skip( const char *msg, ... ) 391 { 392 __winetest_va_list valist; 393 __winetest_va_start(valist, msg); 372 394 winetest_vskip(msg, valist); 373 va_end(valist);374 } 375 376 void winetest_win_skip( const char *msg, ... )377 { 378 va_list valist;379 va_start(valist, msg);395 __winetest_va_end(valist); 396 } 397 398 void __winetest_cdecl winetest_win_skip( const char *msg, ... ) 399 { 400 __winetest_va_list valist; 401 __winetest_va_start(valist, msg); 380 402 if (strcmp(winetest_platform, "windows") == 0) 381 403 winetest_vskip(msg, valist); 382 404 else 383 405 winetest_vok(0, msg, valist); 384 va_end(valist);406 __winetest_va_end(valist); 385 407 } 386 408 -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wine_common_ver.rc
r25949 r28475 16 16 * License along with this library; if not, write to the Free Software 17 17 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 18 */19 20 /*21 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice22 * other than GPL or LGPL is available it will apply instead, Sun elects to use only23 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where24 * a choice of LGPL license versions is made available with the language indicating25 * that LGPLv2 or any later version may be used, or where a choice of which version26 * of the LGPL is applied is otherwise unspecified.27 18 */ 28 19 -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.h
r25949 r28475 1 /*** Autogenerated by WIDL 1.1. 36from ../../include/wine/wined3d.idl - Do not edit ***/1 /*** Autogenerated by WIDL 1.1.43 from ../../include/wine/wined3d.idl - Do not edit ***/ 2 2 3 3 #include <rpc.h> … … 343 343 WINED3DFMT_B8G8R8A8_UNORM = 114, 344 344 WINED3DFMT_B8G8R8X8_UNORM = 115, 345 WINED3DFMT_UYVY = 0x59565955,346 WINED3DFMT_YUY2 = 0x32595559,347 WINED3DFMT_YV12 = 0x32315659,348 WINED3DFMT_DXT1 = 0x31545844,349 WINED3DFMT_DXT2 = 0x32545844,350 WINED3DFMT_DXT3 = 0x33545844,351 WINED3DFMT_DXT4 = 0x34545844,352 WINED3DFMT_DXT5 = 0x35545844,353 WINED3DFMT_MULTI2_ARGB8 = 0x3154454d,354 WINED3DFMT_G8R8_G8B8 = 0x42475247,355 WINED3DFMT_R8G8_B8G8 = 0x47424752,356 WINED3DFMT_ATI2N = 0x32495441,357 WINED3DFMT_INST = 0x54534e49,358 WINED3DFMT_NVHU = 0x5548564e,359 WINED3DFMT_NVHS = 0x5348564e,345 WINED3DFMT_UYVY = (((ULONG)(unsigned char)'U' | ((ULONG)(unsigned char)'Y' << 8)) | ((ULONG)(unsigned char)'V' << 16)) | ((ULONG)(unsigned char)'Y' << 24), 346 WINED3DFMT_YUY2 = (((ULONG)(unsigned char)'Y' | ((ULONG)(unsigned char)'U' << 8)) | ((ULONG)(unsigned char)'Y' << 16)) | ((ULONG)(unsigned char)'2' << 24), 347 WINED3DFMT_YV12 = (((ULONG)(unsigned char)'Y' | ((ULONG)(unsigned char)'V' << 8)) | ((ULONG)(unsigned char)'1' << 16)) | ((ULONG)(unsigned char)'2' << 24), 348 WINED3DFMT_DXT1 = (((ULONG)(unsigned char)'D' | ((ULONG)(unsigned char)'X' << 8)) | ((ULONG)(unsigned char)'T' << 16)) | ((ULONG)(unsigned char)'1' << 24), 349 WINED3DFMT_DXT2 = (((ULONG)(unsigned char)'D' | ((ULONG)(unsigned char)'X' << 8)) | ((ULONG)(unsigned char)'T' << 16)) | ((ULONG)(unsigned char)'2' << 24), 350 WINED3DFMT_DXT3 = (((ULONG)(unsigned char)'D' | ((ULONG)(unsigned char)'X' << 8)) | ((ULONG)(unsigned char)'T' << 16)) | ((ULONG)(unsigned char)'3' << 24), 351 WINED3DFMT_DXT4 = (((ULONG)(unsigned char)'D' | ((ULONG)(unsigned char)'X' << 8)) | ((ULONG)(unsigned char)'T' << 16)) | ((ULONG)(unsigned char)'4' << 24), 352 WINED3DFMT_DXT5 = (((ULONG)(unsigned char)'D' | ((ULONG)(unsigned char)'X' << 8)) | ((ULONG)(unsigned char)'T' << 16)) | ((ULONG)(unsigned char)'5' << 24), 353 WINED3DFMT_MULTI2_ARGB8 = (((ULONG)(unsigned char)'M' | ((ULONG)(unsigned char)'E' << 8)) | ((ULONG)(unsigned char)'T' << 16)) | ((ULONG)(unsigned char)'1' << 24), 354 WINED3DFMT_G8R8_G8B8 = (((ULONG)(unsigned char)'G' | ((ULONG)(unsigned char)'R' << 8)) | ((ULONG)(unsigned char)'G' << 16)) | ((ULONG)(unsigned char)'B' << 24), 355 WINED3DFMT_R8G8_B8G8 = (((ULONG)(unsigned char)'R' | ((ULONG)(unsigned char)'G' << 8)) | ((ULONG)(unsigned char)'B' << 16)) | ((ULONG)(unsigned char)'G' << 24), 356 WINED3DFMT_ATI2N = (((ULONG)(unsigned char)'A' | ((ULONG)(unsigned char)'T' << 8)) | ((ULONG)(unsigned char)'I' << 16)) | ((ULONG)(unsigned char)'2' << 24), 357 WINED3DFMT_INST = (((ULONG)(unsigned char)'I' | ((ULONG)(unsigned char)'N' << 8)) | ((ULONG)(unsigned char)'S' << 16)) | ((ULONG)(unsigned char)'T' << 24), 358 WINED3DFMT_NVHU = (((ULONG)(unsigned char)'N' | ((ULONG)(unsigned char)'V' << 8)) | ((ULONG)(unsigned char)'H' << 16)) | ((ULONG)(unsigned char)'U' << 24), 359 WINED3DFMT_NVHS = (((ULONG)(unsigned char)'N' | ((ULONG)(unsigned char)'V' << 8)) | ((ULONG)(unsigned char)'H' << 16)) | ((ULONG)(unsigned char)'S' << 24), 360 360 WINED3DFMT_FORCE_DWORD = 0xffffffff 361 361 } WINED3DFORMAT; 362 362 typedef enum _WINED3DRENDERSTATETYPE { 363 WINED3DRS_TEXTUREHANDLE = 1,364 363 WINED3DRS_ANTIALIAS = 2, 365 WINED3DRS_TEXTUREADDRESS = 3,366 364 WINED3DRS_TEXTUREPERSPECTIVE = 4, 367 365 WINED3DRS_WRAPU = 5, … … 377 375 WINED3DRS_ALPHATESTENABLE = 15, 378 376 WINED3DRS_LASTPIXEL = 16, 379 WINED3DRS_TEXTUREMAG = 17,380 WINED3DRS_TEXTUREMIN = 18,381 377 WINED3DRS_SRCBLEND = 19, 382 378 WINED3DRS_DESTBLEND = 20, 383 WINED3DRS_TEXTUREMAPBLEND = 21,384 379 WINED3DRS_CULLMODE = 22, 385 380 WINED3DRS_ZFUNC = 23, … … 402 397 WINED3DRS_EDGEANTIALIAS = 40, 403 398 WINED3DRS_COLORKEYENABLE = 41, 404 WINED3DRS_BORDERCOLOR = 43,405 WINED3DRS_TEXTUREADDRESSU = 44,406 WINED3DRS_TEXTUREADDRESSV = 45,407 399 WINED3DRS_MIPMAPLODBIAS = 46, 408 400 WINED3DRS_ZBIAS = 47, … … 420 412 WINED3DRS_STENCILWRITEMASK = 59, 421 413 WINED3DRS_TEXTUREFACTOR = 60, 422 WINED3DRS_STIPPLEPATTERN00 = 64,423 WINED3DRS_STIPPLEPATTERN01 = 65,424 WINED3DRS_STIPPLEPATTERN02 = 66,425 WINED3DRS_STIPPLEPATTERN03 = 67,426 WINED3DRS_STIPPLEPATTERN04 = 68,427 WINED3DRS_STIPPLEPATTERN05 = 69,428 WINED3DRS_STIPPLEPATTERN06 = 70,429 WINED3DRS_STIPPLEPATTERN07 = 71,430 WINED3DRS_STIPPLEPATTERN08 = 72,431 WINED3DRS_STIPPLEPATTERN09 = 73,432 WINED3DRS_STIPPLEPATTERN10 = 74,433 WINED3DRS_STIPPLEPATTERN11 = 75,434 WINED3DRS_STIPPLEPATTERN12 = 76,435 WINED3DRS_STIPPLEPATTERN13 = 77,436 WINED3DRS_STIPPLEPATTERN14 = 78,437 WINED3DRS_STIPPLEPATTERN15 = 79,438 WINED3DRS_STIPPLEPATTERN16 = 80,439 WINED3DRS_STIPPLEPATTERN17 = 81,440 WINED3DRS_STIPPLEPATTERN18 = 82,441 WINED3DRS_STIPPLEPATTERN19 = 83,442 WINED3DRS_STIPPLEPATTERN20 = 84,443 WINED3DRS_STIPPLEPATTERN21 = 85,444 WINED3DRS_STIPPLEPATTERN22 = 86,445 WINED3DRS_STIPPLEPATTERN23 = 87,446 WINED3DRS_STIPPLEPATTERN24 = 88,447 WINED3DRS_STIPPLEPATTERN25 = 89,448 WINED3DRS_STIPPLEPATTERN26 = 90,449 WINED3DRS_STIPPLEPATTERN27 = 91,450 WINED3DRS_STIPPLEPATTERN28 = 92,451 WINED3DRS_STIPPLEPATTERN29 = 93,452 WINED3DRS_STIPPLEPATTERN30 = 94,453 WINED3DRS_STIPPLEPATTERN31 = 95,454 414 WINED3DRS_WRAP0 = 128, 455 415 WINED3DRS_WRAP1 = 129, … … 493 453 WINED3DRS_TWEENFACTOR = 170, 494 454 WINED3DRS_BLENDOP = 171, 495 WINED3DRS_POSITIONORDER = 172,496 WINED3DRS_NORMALORDER = 173,497 455 WINED3DRS_POSITIONDEGREE = 172, 498 456 WINED3DRS_NORMALDEGREE = 173, … … 7318 7276 void *data) = 0; 7319 7277 7278 virtual HRESULT STDMETHODCALLTYPE GetSurfaceFromDC( 7279 HDC dc, 7280 IWineD3DSurface **surface) = 0; 7281 7282 virtual HRESULT STDMETHODCALLTYPE AcquireFocusWindow( 7283 HWND window) = 0; 7284 7285 virtual void STDMETHODCALLTYPE ReleaseFocusWindow( 7286 ) = 0; 7287 7320 7288 }; 7321 7289 #else … … 8055 8023 HRESULT (STDMETHODCALLTYPE * callback)(IWineD3DResource *resource,void *pData), 8056 8024 void *data); 8025 8026 HRESULT (STDMETHODCALLTYPE *GetSurfaceFromDC)( 8027 IWineD3DDevice* This, 8028 HDC dc, 8029 IWineD3DSurface **surface); 8030 8031 HRESULT (STDMETHODCALLTYPE *AcquireFocusWindow)( 8032 IWineD3DDevice* This, 8033 HWND window); 8034 8035 void (STDMETHODCALLTYPE *ReleaseFocusWindow)( 8036 IWineD3DDevice* This); 8057 8037 8058 8038 END_INTERFACE … … 8200 8180 #define IWineD3DDevice_GetFrontBufferData(This,swapchain_idx,dst_surface) (This)->lpVtbl->GetFrontBufferData(This,swapchain_idx,dst_surface) 8201 8181 #define IWineD3DDevice_EnumResources(This,callback,data) (This)->lpVtbl->EnumResources(This,callback,data) 8182 #define IWineD3DDevice_GetSurfaceFromDC(This,dc,surface) (This)->lpVtbl->GetSurfaceFromDC(This,dc,surface) 8183 #define IWineD3DDevice_AcquireFocusWindow(This,window) (This)->lpVtbl->AcquireFocusWindow(This,window) 8184 #define IWineD3DDevice_ReleaseFocusWindow(This) (This)->lpVtbl->ReleaseFocusWindow(This) 8202 8185 #endif 8203 8186 … … 9439 9422 PRPC_MESSAGE pRpcMessage, 9440 9423 DWORD* pdwStubPhase); 9424 HRESULT STDMETHODCALLTYPE IWineD3DDevice_GetSurfaceFromDC_Proxy( 9425 IWineD3DDevice* This, 9426 HDC dc, 9427 IWineD3DSurface **surface); 9428 void __RPC_STUB IWineD3DDevice_GetSurfaceFromDC_Stub( 9429 IRpcStubBuffer* This, 9430 IRpcChannelBuffer* pRpcChannelBuffer, 9431 PRPC_MESSAGE pRpcMessage, 9432 DWORD* pdwStubPhase); 9433 HRESULT STDMETHODCALLTYPE IWineD3DDevice_AcquireFocusWindow_Proxy( 9434 IWineD3DDevice* This, 9435 HWND window); 9436 void __RPC_STUB IWineD3DDevice_AcquireFocusWindow_Stub( 9437 IRpcStubBuffer* This, 9438 IRpcChannelBuffer* pRpcChannelBuffer, 9439 PRPC_MESSAGE pRpcMessage, 9440 DWORD* pdwStubPhase); 9441 void STDMETHODCALLTYPE IWineD3DDevice_ReleaseFocusWindow_Proxy( 9442 IWineD3DDevice* This); 9443 void __RPC_STUB IWineD3DDevice_ReleaseFocusWindow_Stub( 9444 IRpcStubBuffer* This, 9445 IRpcChannelBuffer* pRpcChannelBuffer, 9446 PRPC_MESSAGE pRpcMessage, 9447 DWORD* pdwStubPhase); 9441 9448 9442 9449 #endif /* __IWineD3DDevice_INTERFACE_DEFINED__ */ -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.idl
r25949 r28475 22 22 * License along with this library; if not, write to the Free Software 23 23 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 24 */25 26 /*27 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice28 * other than GPL or LGPL is available it will apply instead, Sun elects to use only29 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where30 * a choice of LGPL license versions is made available with the language indicating31 * that LGPLv2 or any later version may be used, or where a choice of which version32 * of the LGPL is applied is otherwise unspecified.33 24 */ 34 25 … … 153 144 WINED3DDEGREE_FORCE_DWORD = 0x7fffffff 154 145 } WINED3DDEGREETYPE; 146 147 #define WINEMAKEFOURCC(ch0, ch1, ch2, ch3) \ 148 ((unsigned long)(unsigned char)(ch0) | ((unsigned long)(unsigned char)(ch1) << 8) | \ 149 ((unsigned long)(unsigned char)(ch2) << 16) | ((unsigned long)(unsigned char)(ch3) << 24)) 155 150 156 151 typedef enum _WINED3DFORMAT … … 273 268 WINED3DFMT_B8G8R8X8_UNORM, 274 269 /* FOURCC formats. */ 275 WINED3DFMT_UYVY = 0x59565955, /* UYVY */276 WINED3DFMT_YUY2 = 0x32595559, /* YUY2 */277 WINED3DFMT_YV12 = 0x32315659, /* YV12 */278 WINED3DFMT_DXT1 = 0x31545844, /* DXT1 */279 WINED3DFMT_DXT2 = 0x32545844, /* DXT2 */280 WINED3DFMT_DXT3 = 0x33545844, /* DXT3 */281 WINED3DFMT_DXT4 = 0x34545844, /* DXT4 */282 WINED3DFMT_DXT5 = 0x35545844, /* DXT5 */283 WINED3DFMT_MULTI2_ARGB8 = 0x3154454d, /* MET1 */284 WINED3DFMT_G8R8_G8B8 = 0x42475247, /* GRGB */285 WINED3DFMT_R8G8_B8G8 = 0x47424752, /* RGBG */286 WINED3DFMT_ATI2N = 0x32495441, /* ATI2 */287 WINED3DFMT_INST = 0x54534e49, /* INST */288 WINED3DFMT_NVHU = 0x5548564e, /* NVHU */289 WINED3DFMT_NVHS = 0x5348564e, /* NVHS */270 WINED3DFMT_UYVY = WINEMAKEFOURCC('U','Y','V','Y'), 271 WINED3DFMT_YUY2 = WINEMAKEFOURCC('Y','U','Y','2'), 272 WINED3DFMT_YV12 = WINEMAKEFOURCC('Y','V','1','2'), 273 WINED3DFMT_DXT1 = WINEMAKEFOURCC('D','X','T','1'), 274 WINED3DFMT_DXT2 = WINEMAKEFOURCC('D','X','T','2'), 275 WINED3DFMT_DXT3 = WINEMAKEFOURCC('D','X','T','3'), 276 WINED3DFMT_DXT4 = WINEMAKEFOURCC('D','X','T','4'), 277 WINED3DFMT_DXT5 = WINEMAKEFOURCC('D','X','T','5'), 278 WINED3DFMT_MULTI2_ARGB8 = WINEMAKEFOURCC('M','E','T','1'), 279 WINED3DFMT_G8R8_G8B8 = WINEMAKEFOURCC('G','R','G','B'), 280 WINED3DFMT_R8G8_B8G8 = WINEMAKEFOURCC('R','G','B','G'), 281 WINED3DFMT_ATI2N = WINEMAKEFOURCC('A','T','I','2'), 282 WINED3DFMT_INST = WINEMAKEFOURCC('I','N','S','T'), 283 WINED3DFMT_NVHU = WINEMAKEFOURCC('N','V','H','U'), 284 WINED3DFMT_NVHS = WINEMAKEFOURCC('N','V','H','S'), 290 285 291 286 WINED3DFMT_FORCE_DWORD = 0xffffffff … … 294 289 typedef enum _WINED3DRENDERSTATETYPE 295 290 { 296 WINED3DRS_TEXTUREHANDLE = 1, /* d3d7 */297 291 WINED3DRS_ANTIALIAS = 2, /* d3d7 */ 298 WINED3DRS_TEXTUREADDRESS = 3, /* d3d7 */299 292 WINED3DRS_TEXTUREPERSPECTIVE = 4, /* d3d7 */ 300 293 WINED3DRS_WRAPU = 5, /* d3d7 */ … … 310 303 WINED3DRS_ALPHATESTENABLE = 15, 311 304 WINED3DRS_LASTPIXEL = 16, 312 WINED3DRS_TEXTUREMAG = 17, /* d3d7 */313 WINED3DRS_TEXTUREMIN = 18, /* d3d7 */314 305 WINED3DRS_SRCBLEND = 19, 315 306 WINED3DRS_DESTBLEND = 20, 316 WINED3DRS_TEXTUREMAPBLEND = 21, /* d3d7 */317 307 WINED3DRS_CULLMODE = 22, 318 308 WINED3DRS_ZFUNC = 23, … … 335 325 WINED3DRS_EDGEANTIALIAS = 40, /* d3d7, d3d8 */ 336 326 WINED3DRS_COLORKEYENABLE = 41, /* d3d7 */ 337 WINED3DRS_BORDERCOLOR = 43, /* d3d7 */338 WINED3DRS_TEXTUREADDRESSU = 44, /* d3d7 */339 WINED3DRS_TEXTUREADDRESSV = 45, /* d3d7 */340 327 WINED3DRS_MIPMAPLODBIAS = 46, /* d3d7 */ 341 328 WINED3DRS_ZBIAS = 47, /* d3d7, d3d8 */ … … 353 340 WINED3DRS_STENCILWRITEMASK = 59, 354 341 WINED3DRS_TEXTUREFACTOR = 60, 355 WINED3DRS_STIPPLEPATTERN00 = 64,356 WINED3DRS_STIPPLEPATTERN01 = 65,357 WINED3DRS_STIPPLEPATTERN02 = 66,358 WINED3DRS_STIPPLEPATTERN03 = 67,359 WINED3DRS_STIPPLEPATTERN04 = 68,360 WINED3DRS_STIPPLEPATTERN05 = 69,361 WINED3DRS_STIPPLEPATTERN06 = 70,362 WINED3DRS_STIPPLEPATTERN07 = 71,363 WINED3DRS_STIPPLEPATTERN08 = 72,364 WINED3DRS_STIPPLEPATTERN09 = 73,365 WINED3DRS_STIPPLEPATTERN10 = 74,366 WINED3DRS_STIPPLEPATTERN11 = 75,367 WINED3DRS_STIPPLEPATTERN12 = 76,368 WINED3DRS_STIPPLEPATTERN13 = 77,369 WINED3DRS_STIPPLEPATTERN14 = 78,370 WINED3DRS_STIPPLEPATTERN15 = 79,371 WINED3DRS_STIPPLEPATTERN16 = 80,372 WINED3DRS_STIPPLEPATTERN17 = 81,373 WINED3DRS_STIPPLEPATTERN18 = 82,374 WINED3DRS_STIPPLEPATTERN19 = 83,375 WINED3DRS_STIPPLEPATTERN20 = 84,376 WINED3DRS_STIPPLEPATTERN21 = 85,377 WINED3DRS_STIPPLEPATTERN22 = 86,378 WINED3DRS_STIPPLEPATTERN23 = 87,379 WINED3DRS_STIPPLEPATTERN24 = 88,380 WINED3DRS_STIPPLEPATTERN25 = 89,381 WINED3DRS_STIPPLEPATTERN26 = 90,382 WINED3DRS_STIPPLEPATTERN27 = 91,383 WINED3DRS_STIPPLEPATTERN28 = 92,384 WINED3DRS_STIPPLEPATTERN29 = 93,385 WINED3DRS_STIPPLEPATTERN30 = 94,386 WINED3DRS_STIPPLEPATTERN31 = 95,387 342 WINED3DRS_WRAP0 = 128, 388 343 WINED3DRS_WRAP1 = 129, … … 426 381 WINED3DRS_TWEENFACTOR = 170, 427 382 WINED3DRS_BLENDOP = 171, 428 WINED3DRS_POSITIONORDER = 172,429 WINED3DRS_NORMALORDER = 173,430 383 WINED3DRS_POSITIONDEGREE = 172, 431 384 WINED3DRS_NORMALDEGREE = 173, … … 3471 3424 [in] void *data 3472 3425 ); 3426 HRESULT GetSurfaceFromDC( 3427 [in] HDC dc, 3428 [out] IWineD3DSurface **surface 3429 ); 3430 HRESULT AcquireFocusWindow( 3431 [in] HWND window 3432 ); 3433 void ReleaseFocusWindow( 3434 ); 3473 3435 } 3474 3436 -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winedxgi.idl
r22496 r28475 15 15 * License along with this library; if not, write to the Free Software 16 16 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 17 */18 19 /*20 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice21 * other than GPL or LGPL is available it will apply instead, Sun elects to use only22 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where23 * a choice of LGPL license versions is made available with the language indicating24 * that LGPLv2 or any later version may be used, or where a choice of which version25 * of the LGPL is applied is otherwise unspecified.26 17 */ 27 18 -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winnet16.h
r16477 r28475 209 209 */ 210 210 211 WORD WINAPI WNetGetUser16(LP CSTR,LPSTR,LPINT16);211 WORD WINAPI WNetGetUser16(LPSTR,LPINT16); 212 212 213 213 -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wpp.h
r25949 r28475 67 67 extern char *wpp_find_include( const char *name, const char *parent_name ); 68 68 extern int wpp_parse( const char *input, FILE *output ); 69 extern int wpp_parse_temp( const char *input, const char *output_base, char **output_name );70 69 extern void wpp_set_callbacks( const struct wpp_callbacks *callbacks ); 71 70
Note:
See TracChangeset
for help on using the changeset viewer.
