March 2015 - Wine-commits - list.winehq.org

Bruno Jesus : kernel32: GetTempPathW must zero the remaining buffer.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: f16cf541068831074a6891688d947f0ce32abdd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16cf541068831074a6891688… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Feb 28 20:11:08 2015 -0300 kernel32: GetTempPathW must zero the remaining buffer. --- dlls/kernel32/path.c | 6 +++++- dlls/kernel32/tests/path.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 475b1f6..1048214 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -623,9 +623,13 @@ DWORD WINAPI GetTempPathW( DWORD count, LPWSTR path ) if (count) { - lstrcpynW(path, tmp_path, count); + lstrcpynW(path, tmp_path, ret); if (count >= ret) + { + /* the remaining buffer must be zeroed */ + memset(path + ret, 0, (count - ret) * sizeof(WCHAR)); ret--; /* return length without 0 */ + } else if (count < 4) path[0] = 0; /* avoid returning ambiguous "X:" */ } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 8b07b8f..a5c0f41 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1012,7 +1012,6 @@ static void test_GetTempPathW(char* tmp_dir) ok(len == lstrlenW(buf), "returned length should be equal to the length of string\n"); /* The rest of the buffer must be zeroed */ for(len++; len < sizeof(buf) / sizeof(buf[0]); len++) - todo_wine ok(buf[len] == '\0', "expected NULL at [%d], got 0x%x\n", len, buf[len]); }

1 0

Marcus Meissner : dsound: If 3d sound is disabled, just return (Coverity).
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: a83e8e88ea05822e21aace9e0b82060bfa1dc02f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83e8e88ea05822e21aace9e0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Mar 1 14:04:56 2015 +0100 dsound: If 3d sound is disabled, just return (Coverity). --- dlls/dsound/sound3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index c53783e..439cfac 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -177,7 +177,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) TRACE("3D processing disabled\n"); /* this one is here only to eliminate annoying warning message */ DSOUND_RecalcVolPan (&dsb->volpan); - break; + return; case DS3DMODE_NORMAL: TRACE("Normal 3D processing mode\n"); /* we need to calculate distance between buffer and listener*/

1 0

Nikolay Sivov : services: Locate service image in proper system dir for WOW64 case.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 38bba54f325880a35acc98d1c5c408beb629414b URL: http://source.winehq.org/git/wine.git/?a=commit;h=38bba54f325880a35acc98d1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 1 02:24:02 2015 +0300 services: Locate service image in proper system dir for WOW64 case. --- programs/services/services.c | 106 +++++++++++++++++++++++++++++-------------- 1 file changed, 71 insertions(+), 35 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index dd79770..1335837 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -621,35 +621,15 @@ static LPWSTR service_get_pipe_name(void) return name; } -static DWORD service_start_process(struct service_entry *service_entry, HANDLE *process) +static DWORD get_service_binary_path(const struct service_entry *service_entry, WCHAR **path) { - PROCESS_INFORMATION pi; - STARTUPINFOW si; - LPWSTR path = NULL; - DWORD size; - BOOL r; - - service_lock_exclusive(service_entry); - - if (!env) - { - HANDLE htok; - - if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok)) - CreateEnvironmentBlock(&env, htok, FALSE); - - if (!env) - WINE_ERR("failed to create services environment\n"); - } + DWORD size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName, NULL, 0); - size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,NULL,0); - path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); - if (!path) - { - service_unlock(service_entry); + *path = HeapAlloc(GetProcessHeap(), 0, size*sizeof(WCHAR)); + if (!*path) return ERROR_NOT_ENOUGH_SERVER_MEMORY; - } - ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,path,size); + + ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName, *path, size); if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER) { @@ -660,25 +640,81 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * GetSystemDirectoryW( system_dir, MAX_PATH ); if (is_win64) { - if (!GetBinaryTypeW( path, &type )) + if (!GetBinaryTypeW( *path, &type )) { - HeapFree( GetProcessHeap(), 0, path ); - service_unlock(service_entry); + HeapFree( GetProcessHeap(), 0, *path ); return GetLastError(); } if (type == SCS_32BIT_BINARY) GetSystemWow64DirectoryW( system_dir, MAX_PATH ); } len = strlenW( system_dir ) + sizeof(winedeviceW)/sizeof(WCHAR) + strlenW(service_entry->name); - HeapFree( GetProcessHeap(), 0, path ); - if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + HeapFree( GetProcessHeap(), 0, *path ); + if (!(*path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + return ERROR_NOT_ENOUGH_SERVER_MEMORY; + + lstrcpyW( *path, system_dir ); + lstrcatW( *path, winedeviceW ); + lstrcatW( *path, service_entry->name ); + return ERROR_SUCCESS; + } + + /* if service image is configured to systemdir, redirect it to wow64 systemdir */ + if (service_entry->is_wow64) + { + WCHAR system_dir[MAX_PATH], *redirected; + DWORD len; + + GetSystemDirectoryW( system_dir, MAX_PATH ); + len = strlenW( system_dir ); + + if (strncmpiW( system_dir, *path, len )) + return ERROR_SUCCESS; + + GetSystemWow64DirectoryW( system_dir, MAX_PATH ); + + redirected = HeapAlloc( GetProcessHeap(), 0, (strlenW( *path ) + strlenW( system_dir ))*sizeof(WCHAR)); + if (!redirected) { - service_unlock(service_entry); + HeapFree( GetProcessHeap(), 0, *path ); return ERROR_NOT_ENOUGH_SERVER_MEMORY; } - lstrcpyW( path, system_dir ); - lstrcatW( path, winedeviceW ); - lstrcatW( path, service_entry->name ); + + strcpyW( redirected, system_dir ); + strcatW( redirected, &(*path)[len] ); + HeapFree( GetProcessHeap(), 0, *path ); + *path = redirected; + TRACE("redirected to %s\n", debugstr_w(redirected)); + } + + return ERROR_SUCCESS; +} + +static DWORD service_start_process(struct service_entry *service_entry, HANDLE *process) +{ + PROCESS_INFORMATION pi; + STARTUPINFOW si; + LPWSTR path = NULL; + DWORD err; + BOOL r; + + service_lock_exclusive(service_entry); + + if (!env) + { + HANDLE htok; + + if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok)) + CreateEnvironmentBlock(&env, htok, FALSE); + + if (!env) + WINE_ERR("failed to create services environment\n"); + } + + if ((err = get_service_binary_path(service_entry, &path))) + { + service_unlock(service_entry); + return err; } ZeroMemory(&si, sizeof(STARTUPINFOW));

1 0

Amine Khaldi : include: Correct DDSCAPS2 and DDSURFACEDESC2 structures and their uses.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 21bfc8c440f5d478bbb91f2f631ff02c37d2d2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bfc8c440f5d478bbb91f2f6… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sat Feb 28 09:22:59 2015 +0100 include: Correct DDSCAPS2 and DDSURFACEDESC2 structures and their uses. --- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 24 ++++++++++++------------ dlls/ddraw/tests/ddraw4.c | 16 ++++++++-------- dlls/ddraw/tests/ddraw7.c | 18 +++++++++--------- dlls/ddraw/utils.c | 10 +++++----- dlls/ddrawex/ddraw.c | 4 ++-- dlls/dxdiagn/provider.c | 4 ++-- include/ddraw.h | 10 ++++++++-- 9 files changed, 49 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21bfc8c440f5d478bbb91…

1 0

Nikolay Sivov : include/debug.h: Support tracing of VT_BSTR|VT_BYREF.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 5bd6b569cda5788b4d8ba028e99cf9ea17a521b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd6b569cda5788b4d8ba028e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 14:38:31 2015 +0300 include/debug.h: Support tracing of VT_BSTR|VT_BYREF. --- include/wine/debug.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/wine/debug.h b/include/wine/debug.h index 5465935..9028cb5 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -277,6 +277,8 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) if (V_VT(v) & VT_BYREF) { if (V_VT(v) == (VT_VARIANT|VT_BYREF)) return wine_dbg_sprintf( "%p {VT_VARIANT|VT_BYREF: %s}", v, wine_dbgstr_variant(V_VARIANTREF(v)) ); + if (V_VT(v) == (VT_BSTR|VT_BYREF)) + return wine_dbg_sprintf( "%p {VT_BSTR|VT_BYREF: %s}", v, wine_dbgstr_w(*V_BSTRREF(v)) ); return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_BYREF(v) ); }

1 0

Matteo Bruni : wined3d: Remove an obsolete comment.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 7f618695c624f532300ecff8735f94fec3f3a86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f618695c624f532300ecff87… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 27 13:18:19 2015 +0100 wined3d: Remove an obsolete comment. Wined3d doesn't actually require the GLX extension for multisampling at this point (while it does require FBOs). --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4ca13f4..89996d1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -127,7 +127,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_internalformat_query2", ARB_INTERNALFORMAT_QUERY2, }, {"GL_ARB_map_buffer_alignment", ARB_MAP_BUFFER_ALIGNMENT }, {"GL_ARB_map_buffer_range", ARB_MAP_BUFFER_RANGE }, - {"GL_ARB_multisample", ARB_MULTISAMPLE }, /* needs GLX_ARB_MULTISAMPLE as well */ + {"GL_ARB_multisample", ARB_MULTISAMPLE }, {"GL_ARB_multitexture", ARB_MULTITEXTURE }, {"GL_ARB_occlusion_query", ARB_OCCLUSION_QUERY }, {"GL_ARB_pixel_buffer_object", ARB_PIXEL_BUFFER_OBJECT },

1 0

Matteo Bruni : wined3d: Drop a few unnecessary &x[0].
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 2f804307bda0f62ac23c9a3387e185150868fede URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f804307bda0f62ac23c9a338… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 27 13:18:20 2015 +0100 wined3d: Drop a few unnecessary &x[0]. --- dlls/wined3d/state.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ccfe667..67570d5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1220,7 +1220,7 @@ void state_fogcolor(struct wined3d_context *context, const struct wined3d_state float col[4]; D3DCOLORTOGLFLOAT4(state->render_states[WINED3D_RS_FOGCOLOR], col); - gl_info->gl_ops.gl.p_glFogfv(GL_FOG_COLOR, &col[0]); + gl_info->gl_ops.gl.p_glFogfv(GL_FOG_COLOR, col); checkGLcall("glFog GL_FOG_COLOR"); } @@ -4867,11 +4867,10 @@ void light(struct wined3d_context *context, const struct wined3d_state *state, D { case WINED3D_LIGHT_POINT: /* Position */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, &lightInfo->lightPosn[0]); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightPosn); checkGLcall("glLightfv"); gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, lightInfo->cutoff); checkGLcall("glLightf"); - /* Attenuation - Are these right? guessing... */ gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_CONSTANT_ATTENUATION, lightInfo->OriginalParms.attenuation0); checkGLcall("glLightf"); @@ -4887,16 +4886,15 @@ void light(struct wined3d_context *context, const struct wined3d_state *state, D case WINED3D_LIGHT_SPOT: /* Position */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, &lightInfo->lightPosn[0]); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightPosn); checkGLcall("glLightfv"); /* Direction */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_SPOT_DIRECTION, &lightInfo->lightDirn[0]); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_SPOT_DIRECTION, lightInfo->lightDirn); checkGLcall("glLightfv"); gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_EXPONENT, lightInfo->exponent); checkGLcall("glLightf"); gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, lightInfo->cutoff); checkGLcall("glLightf"); - /* Attenuation - Are these right? guessing... */ gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_CONSTANT_ATTENUATION, lightInfo->OriginalParms.attenuation0); checkGLcall("glLightf"); @@ -4913,7 +4911,7 @@ void light(struct wined3d_context *context, const struct wined3d_state *state, D case WINED3D_LIGHT_DIRECTIONAL: /* Direction */ /* Note GL uses w position of 0 for direction! */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, &lightInfo->lightPosn[0]); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightPosn); checkGLcall("glLightfv"); gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, lightInfo->cutoff); checkGLcall("glLightf");

1 0

Matteo Bruni : wined3d: Add a couple checkGLcall() in surface_prepare_rb() .
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 8ed9c2a11bf8a61909ef0940d0dee3611a6c003e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed9c2a11bf8a61909ef0940d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 27 13:18:21 2015 +0100 wined3d: Add a couple checkGLcall() in surface_prepare_rb(). --- dlls/wined3d/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 36806ec..c045591 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2923,6 +2923,7 @@ void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, surface->rb_multisample); gl_info->fbo_ops.glRenderbufferStorageMultisample(GL_RENDERBUFFER, surface->resource.multisample_type, surface->resource.format->glInternal, surface->pow2Width, surface->pow2Height); + checkGLcall("glRenderbufferStorageMultisample()"); TRACE("Created multisample rb %u.\n", surface->rb_multisample); } else @@ -2934,6 +2935,7 @@ void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, surface->rb_resolved); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, surface->resource.format->glInternal, surface->pow2Width, surface->pow2Height); + checkGLcall("glRenderbufferStorage()"); TRACE("Created resolved rb %u.\n", surface->rb_resolved); } }

1 0

Matteo Bruni : wined3d: Drop redundant check for instanced rendering from drawStridedFast.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: db80aba5ad526b8691dace1c4c20b5cbc85389a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db80aba5ad526b8691dace1c4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 27 13:18:22 2015 +0100 wined3d: Drop redundant check for instanced rendering from drawStridedFast. We need GL_ARB_instanced_arrays to be able to take the fastest path and that's already checked in draw_primitive. Note that GL_ARB_instanced_arrays provides glDrawElementsInstanced if GL_ARB_draw_instanced is not supported so we don't need to explicitly check for the latter. --- dlls/wined3d/drawprim.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 98e7cf4..4916c05 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -44,26 +44,19 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit GLenum idxtype = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; if (instance_count) { - if (!gl_info->supported[ARB_DRAW_INSTANCED] && !gl_info->supported[ARB_INSTANCED_ARRAYS]) + if (start_instance) + FIXME("Start instance (%u) not supported.\n", start_instance); + if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) { - FIXME("Instanced drawing not supported.\n"); + GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); + checkGLcall("glDrawElementsInstancedBaseVertex"); } else { - if (start_instance) - FIXME("Start instance (%u) not supported.\n", start_instance); - if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) - { - GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, - (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); - checkGLcall("glDrawElementsInstancedBaseVertex"); - } - else - { - GL_EXTCALL(glDrawElementsInstanced(primitive_type, count, idxtype, - (const char *)idx_data + (idx_size * start_idx), instance_count)); - checkGLcall("glDrawElementsInstanced"); - } + GL_EXTCALL(glDrawElementsInstanced(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count)); + checkGLcall("glDrawElementsInstanced"); } } else if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX])

1 0

Matteo Bruni : d3d9: Pack structures to 4-bytes alignment on x86.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 41556170f231aa6ae6a5e227d8e030cf941817e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41556170f231aa6ae6a5e227d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 27 13:18:23 2015 +0100 d3d9: Pack structures to 4-bytes alignment on x86. Reported by Christoph von Wittich. --- include/d3d9caps.h | 8 ++++++++ include/d3d9types.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/include/d3d9caps.h b/include/d3d9caps.h index 838e1f3..5cc757b 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -20,6 +20,10 @@ #ifndef __WINE_D3D9CAPS_H #define __WINE_D3D9CAPS_H +#ifdef __i386__ +#include <pshpack4.h> +#endif + /* * Definitions */ @@ -392,4 +396,8 @@ typedef struct _D3DCAPS9 { } D3DCAPS9; +#ifdef __i386__ +#include <poppack.h> +#endif + #endif diff --git a/include/d3d9types.h b/include/d3d9types.h index fd7c4ce..3afcf89 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -21,6 +21,10 @@ #ifndef __WINE_D3D9TYPES_H #define __WINE_D3D9TYPES_H +#ifdef __i386__ +#include <pshpack4.h> +#endif + /***************************************************************************** * Direct 3D v9 #defines */ @@ -1580,4 +1584,8 @@ typedef enum _D3DSHADER_COMPARISON D3DSPC_RESERVED1, } D3DSHADER_COMPARISON; +#ifdef __i386__ +#include <poppack.h> +#endif + #endif /* __WINE_D3D9TYPES_H */

1 0