VirtualBox

Ignore:
Timestamp:
Jul 21, 2009 9:16:52 AM (16 years ago)
Author:
vboxsync
Message:

crOpenGL: update to wine 1.1.26

Location:
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/exception.h

    r19678 r21731  
    223223}
    224224
     225static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void)
     226{
     227#if defined(__GNUC__) && defined(__i386__)
     228    EXCEPTION_REGISTRATION_RECORD *ret;
     229    __asm__ __volatile__(".byte 0x64\n\tmovl (0),%0" : "=r" (ret) );
     230    return ret;
     231#else
     232    NT_TIB *teb = (NT_TIB *)NtCurrentTeb();
     233    return teb->ExceptionList;
     234#endif
     235}
     236
    225237/* Exception handling flags - from OS/2 2.0 exception handling */
    226238
    … …  
    248260NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID);
    249261
     262static 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
    250269/* wrapper for RtlUnwind since it clobbers registers on Windows */
    251 static inline void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record )
     270static inline void DECLSPEC_NORETURN __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame,
     271                                                        EXCEPTION_RECORD *record,
     272                                                        void (*target)(void) )
    252273{
    253274#if defined(__GNUC__) && defined(__i386__)
    254     int dummy1, dummy2, dummy3;
     275    int dummy1, dummy2, dummy3, dummy4;
    255276    __asm__ __volatile__("pushl %%ebp\n\t"
    256277                         "pushl %%ebx\n\t"
    257278                         "pushl $0\n\t"
     279                         "pushl %3\n\t"
    258280                         "pushl %2\n\t"
    259                          "pushl $0\n\t"
    260281                         "pushl %1\n\t"
    261282                         "call *%0\n\t"
    262283                         "popl %%ebx\n\t"
    263284                         "popl %%ebp"
    264                          : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3)
    265                          : "0" (RtlUnwind), "1" (frame), "2" (record)
    266                          : "ecx", "edx", "memory" );
     285                         : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3), "=c" (dummy4)
     286                         : "0" (RtlUnwind), "1" (frame), "2" (target), "3" (record)
     287                         : "edx", "memory" );
    267288#else
    268     RtlUnwind( frame, 0, record, 0 );
    269 #endif
     289    RtlUnwind( frame, target, record, 0 );
     290#endif
     291    for (;;) target();
    270292}
    271293
    … …  
    279301    wine_frame->ExceptionRecord = wine_frame;
    280302
    281     __wine_rtl_unwind( frame, record );
    282     __wine_pop_frame( frame );
    283     siglongjmp( wine_frame->jmp, 1 );
     303    __wine_rtl_unwind( frame, record, __wine_unwind_target );
    284304}
    285305

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/port.h

    r19678 r21731  
    213213#define M_PI_2 1.570796326794896619
    214214#endif
    215 
    216 
    217 /* Macros to define assembler functions somewhat portably */
    218 
    219 #if defined(__GNUC__) && !defined(__INTERIX) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__APPLE__)
    220 # define __ASM_GLOBAL_FUNC(name,code) \
    221       __asm__( ".text\n\t" \
    222                ".align 4\n\t" \
    223                ".globl " __ASM_NAME(#name) "\n\t" \
    224                __ASM_FUNC(#name) "\n" \
    225                __ASM_NAME(#name) ":\n\t" \
    226                code \
    227                "\n\t.previous" );
    228 #else  /* defined(__GNUC__) && !defined(__MINGW32__) && !defined(__APPLE__)  */
    229 # define __ASM_GLOBAL_FUNC(name,code) \
    230       void __asm_dummy_##name(void) { \
    231           asm( ".align 4\n\t" \
    232                ".globl " __ASM_NAME(#name) "\n\t" \
    233                __ASM_FUNC(#name) "\n" \
    234                __ASM_NAME(#name) ":\n\t" \
    235                code ); \
    236       }
    237 #endif  /* __GNUC__ */
    238215
    239216

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/pthread.h

    r19678 r21731  
    1717 * License along with this library; if not, write to the Free Software
    1818 * 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 choice
     23 * other than GPL or LGPL is available it will apply instead, Sun elects to use only
     24 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
     25 * a choice of LGPL license versions is made available with the language indicating
     26 * that LGPLv2 or any later version may be used, or where a choice of which version
     27 * 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 choice
     32 * other than GPL or LGPL is available it will apply instead, Sun elects to use only
     33 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
     34 * a choice of LGPL license versions is made available with the language indicating
     35 * that LGPLv2 or any later version may be used, or where a choice of which version
     36 * 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 choice
     41 * other than GPL or LGPL is available it will apply instead, Sun elects to use only
     42 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
     43 * a choice of LGPL license versions is made available with the language indicating
     44 * that LGPLv2 or any later version may be used, or where a choice of which version
     45 * of the LGPL is applied is otherwise unspecified.
    1946 */
    2047

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/server_protocol.h

    r19678 r21731  
    703703    int          exit_code;
    704704    int          priority;
     705    cpu_type_t   cpu;
     706    char __pad_60[4];
    705707};
    706708
    … …  
    53205322};
    53215323
    5322 #define SERVER_PROTOCOL_VERSION 386
     5324#define SERVER_PROTOCOL_VERSION 387
    53235325
    53245326#endif /* __WINE_WINE_SERVER_PROTOCOL_H */

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.h

    r20612 r21731  
    1 /*** Autogenerated by WIDL 1.1.23 from ../../include/wine/wined3d.idl - Do not edit ***/
     1/*** Autogenerated by WIDL 1.1.26 from ../../include/wine/wined3d.idl - Do not edit ***/
    22
    33#include <rpc.h>
    … …  
    22432243} WINED3DTRIPATCH_INFO;
    22442244typedef struct _WINED3DADAPTER_IDENTIFIER {
    2245     char *Driver;
    2246     char *Description;
    2247     char *DeviceName;
    2248     LARGE_INTEGER *DriverVersion;
    2249     DWORD *VendorId;
    2250     DWORD *DeviceId;
    2251     DWORD *SubSysId;
    2252     DWORD *Revision;
    2253     GUID *DeviceIdentifier;
    2254     DWORD *WHQLLevel;
     2245    char *driver;
     2246    UINT driver_size;
     2247    char *description;
     2248    UINT description_size;
     2249    char *device_name;
     2250    UINT device_name_size;
     2251    LARGE_INTEGER driver_version;
     2252    DWORD vendor_id;
     2253    DWORD device_id;
     2254    DWORD subsystem_id;
     2255    DWORD revision;
     2256    GUID device_identifier;
     2257    DWORD whql_level;
    22552258} WINED3DADAPTER_IDENTIFIER;
    22562259typedef struct _WINED3DPRESENT_PARAMETERS {
    … …  
    22722275} WINED3DPRESENT_PARAMETERS;
    22732276typedef struct _WINED3DSURFACE_DESC {
    2274     WINED3DFORMAT *Format;
    2275     WINED3DRESOURCETYPE *Type;
    2276     DWORD *Usage;
    2277     WINED3DPOOL *Pool;
    2278     UINT *Size;
    2279     WINED3DMULTISAMPLE_TYPE *MultiSampleType;
    2280     DWORD *MultiSampleQuality;
    2281     UINT *Width;
    2282     UINT *Height;
     2277    WINED3DFORMAT format;
     2278    WINED3DRESOURCETYPE resource_type;
     2279    DWORD usage;
     2280    WINED3DPOOL pool;
     2281    UINT size;
     2282    WINED3DMULTISAMPLE_TYPE multisample_type;
     2283    DWORD multisample_quality;
     2284    UINT width;
     2285    UINT height;
    22832286} WINED3DSURFACE_DESC;
    22842287typedef struct _WINED3DVOLUME_DESC {
    2285     WINED3DFORMAT *Format;
    2286     WINED3DRESOURCETYPE *Type;
    2287     DWORD *Usage;
    2288     WINED3DPOOL *Pool;
    2289     UINT *Size;
    2290     UINT *Width;
    2291     UINT *Height;
    2292     UINT *Depth;
     2288    WINED3DFORMAT Format;
     2289    WINED3DRESOURCETYPE Type;
     2290    DWORD Usage;
     2291    WINED3DPOOL Pool;
     2292    UINT Size;
     2293    UINT Width;
     2294    UINT Height;
     2295    UINT Depth;
    22932296} WINED3DVOLUME_DESC;
    22942297typedef struct _WINED3DCLIPSTATUS {
    … …  
    23922395    UINT Size;
    23932396} WINED3DBUFFER_DESC;
    2394 typedef struct glDescriptor {
    2395     UINT textureName;
    2396     UINT srgbTextureName;
    2397     int level;
    2398     int target;
    2399 } glDescriptor;
    24002397typedef struct WineDirect3DStridedData {
    24012398    WINED3DFORMAT format;
    … …  
    39803977        IWineD3DBase *container) = 0;
    39813978
    3982     virtual void STDMETHODCALLTYPE GetGlDesc(
    3983         glDescriptor **desc) = 0;
    3984 
    39853979    virtual const void * STDMETHODCALLTYPE GetData(
    39863980        ) = 0;
    … …  
    41984192        IWineD3DSurface* This,
    41994193        IWineD3DBase *container);
    4200 
    4201     void (STDMETHODCALLTYPE *GetGlDesc)(
    4202         IWineD3DSurface* This,
    4203         glDescriptor **desc);
    42044194
    42054195    const void * (STDMETHODCALLTYPE *GetData)(
    … …  
    42824272#define IWineD3DSurface_SaveSnapshot(This,filename) (This)->lpVtbl->SaveSnapshot(This,filename)
    42834273#define IWineD3DSurface_SetContainer(This,container) (This)->lpVtbl->SetContainer(This,container)
    4284 #define IWineD3DSurface_GetGlDesc(This,desc) (This)->lpVtbl->GetGlDesc(This,desc)
    42854274#define IWineD3DSurface_GetData(This) (This)->lpVtbl->GetData(This)
    42864275#define IWineD3DSurface_SetFormat(This,format) (This)->lpVtbl->SetFormat(This,format)
    … …  
    45384527    IWineD3DBase *container);
    45394528void __RPC_STUB IWineD3DSurface_SetContainer_Stub(
    4540     IRpcStubBuffer* This,
    4541     IRpcChannelBuffer* pRpcChannelBuffer,
    4542     PRPC_MESSAGE pRpcMessage,
    4543     DWORD* pdwStubPhase);
    4544 void STDMETHODCALLTYPE IWineD3DSurface_GetGlDesc_Proxy(
    4545     IWineD3DSurface* This,
    4546     glDescriptor **desc);
    4547 void __RPC_STUB IWineD3DSurface_GetGlDesc_Stub(
    45484529    IRpcStubBuffer* This,
    45494530    IRpcChannelBuffer* pRpcChannelBuffer,
    … …  
    69396920        UINT level,
    69406921        IWineD3DSurface **surface,
    6941         WINED3DRESOURCETYPE resource_type,
    69426922        DWORD usage,
    69436923        WINED3DPOOL pool,
    … …  
    75517531        UINT level,
    75527532        IWineD3DSurface **surface,
    7553         WINED3DRESOURCETYPE resource_type,
    75547533        DWORD usage,
    75557534        WINED3DPOOL pool,
    … …  
    82348213#define IWineD3DDevice_CreateIndexBuffer(This,length,usage,pool,index_buffer,parent) (This)->lpVtbl->CreateIndexBuffer(This,length,usage,pool,index_buffer,parent)
    82358214#define IWineD3DDevice_CreateStateBlock(This,type,stateblock,parent) (This)->lpVtbl->CreateStateBlock(This,type,stateblock,parent)
    8236 #define IWineD3DDevice_CreateSurface(This,width,height,format,lockable,discard,level,surface,resource_type,usage,pool,multisample_type,multisample_quality,surface_type,parent) (This)->lpVtbl->CreateSurface(This,width,height,format,lockable,discard,level,surface,resource_type,usage,pool,multisample_type,multisample_quality,surface_type,parent)
     8215#define IWineD3DDevice_CreateSurface(This,width,height,format,lockable,discard,level,surface,usage,pool,multisample_type,multisample_quality,surface_type,parent) (This)->lpVtbl->CreateSurface(This,width,height,format,lockable,discard,level,surface,usage,pool,multisample_type,multisample_quality,surface_type,parent)
    82378216#define IWineD3DDevice_CreateRendertargetView(This,resource,parent,rendertarget_view) (This)->lpVtbl->CreateRendertargetView(This,resource,parent,rendertarget_view)
    82388217#define IWineD3DDevice_CreateTexture(This,width,height,levels,usage,format,pool,texture,parent) (This)->lpVtbl->CreateTexture(This,width,height,levels,usage,format,pool,texture,parent)
    … …  
    84198398    UINT level,
    84208399    IWineD3DSurface **surface,
    8421     WINED3DRESOURCETYPE resource_type,
    84228400    DWORD usage,
    84238401    WINED3DPOOL pool,

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.idl

    r20612 r21731  
    17011701typedef struct _WINED3DADAPTER_IDENTIFIER
    17021702{
    1703     char *Driver;
    1704     char *Description;
    1705     char *DeviceName;
    1706     LARGE_INTEGER *DriverVersion;
    1707     DWORD *VendorId;
    1708     DWORD *DeviceId;
    1709     DWORD *SubSysId;
    1710     DWORD *Revision;
    1711     GUID *DeviceIdentifier;
    1712     DWORD *WHQLLevel;
     1703    char *driver;
     1704    UINT driver_size;
     1705    char *description;
     1706    UINT description_size;
     1707    char *device_name;
     1708    UINT device_name_size;
     1709    LARGE_INTEGER driver_version;
     1710    DWORD vendor_id;
     1711    DWORD device_id;
     1712    DWORD subsystem_id;
     1713    DWORD revision;
     1714    GUID device_identifier;
     1715    DWORD whql_level;
    17131716} WINED3DADAPTER_IDENTIFIER;
    17141717
    … …  
    17341737typedef struct _WINED3DSURFACE_DESC
    17351738{
    1736     WINED3DFORMAT *Format;
    1737     WINED3DRESOURCETYPE *Type;
    1738     DWORD *Usage;
    1739     WINED3DPOOL *Pool;
    1740     UINT *Size;
    1741     WINED3DMULTISAMPLE_TYPE *MultiSampleType;
    1742     DWORD *MultiSampleQuality;
    1743     UINT *Width;
    1744     UINT *Height;
     1739    WINED3DFORMAT format;
     1740    WINED3DRESOURCETYPE resource_type;
     1741    DWORD usage;
     1742    WINED3DPOOL pool;
     1743    UINT size;
     1744    WINED3DMULTISAMPLE_TYPE multisample_type;
     1745    DWORD multisample_quality;
     1746    UINT width;
     1747    UINT height;
    17451748} WINED3DSURFACE_DESC;
    17461749
    17471750typedef struct _WINED3DVOLUME_DESC
    17481751{
    1749     WINED3DFORMAT *Format;
    1750     WINED3DRESOURCETYPE *Type;
    1751     DWORD *Usage;
    1752     WINED3DPOOL *Pool;
    1753     UINT *Size;
    1754     UINT *Width;
    1755     UINT *Height;
    1756     UINT *Depth;
     1752    WINED3DFORMAT Format;
     1753    WINED3DRESOURCETYPE Type;
     1754    DWORD Usage;
     1755    WINED3DPOOL Pool;
     1756    UINT Size;
     1757    UINT Width;
     1758    UINT Height;
     1759    UINT Depth;
    17571760} WINED3DVOLUME_DESC;
    17581761
    … …  
    18921895    UINT Size;
    18931896} WINED3DBUFFER_DESC;
    1894 
    1895 typedef struct glDescriptor
    1896 {
    1897     UINT textureName, srgbTextureName;
    1898     int level;
    1899     int /*GLenum*/ target;
    1900 } glDescriptor;
    19011897
    19021898typedef struct WineDirect3DStridedData
    … …  
    25392535        [in] IWineD3DBase *container
    25402536    );
    2541     void GetGlDesc(
    2542         [out] glDescriptor **desc
    2543     );
    25442537    const void *GetData(
    25452538    );
    … …  
    29422935        [in] UINT level,
    29432936        [out] IWineD3DSurface **surface,
    2944         [in] WINED3DRESOURCETYPE resource_type,
    29452937        [in] DWORD usage,
    29462938        [in] WINED3DPOOL pool,
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette