wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Charles Davis : ntdll: Implement DVD_EndSession() on Mac OS.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: df2bf3e3e5f2e8bf641189a247328c678baf001c URL: http://source.winehq.org/git/wine.git/?a=commit;h=df2bf3e3e5f2e8bf641189a24… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Oct 16 13:56:59 2009 -0600 ntdll: Implement DVD_EndSession() on Mac OS. --- dlls/ntdll/cdrom.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 43676d0..3094eda 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1977,6 +1977,14 @@ static NTSTATUS DVD_EndSession(int fd, const DVD_SESSION_ID *sid) return CDROM_GetStatusCode(ioctl(fd, DVD_AUTH, &auth_info)); #elif defined(__FreeBSD__) || defined(__NetBSD__) return STATUS_NOT_SUPPORTED; +#elif defined(__APPLE__) + dk_dvd_send_key_t dvdsk; + + dvdsk.format = kDVDKeyFormatAGID_Invalidate; + dvdsk.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + dvdsk.grantID = (uint8_t)*sid; + + return CDROM_GetStatusCode(ioctl(fd, DKIOCDVDSENDKEY, &dvdsk)); #else return STATUS_NOT_SUPPORTED; #endif

1 0

Charles Davis : ntdll: Implement DVD_StartSession() on Mac OS.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 05acaeb0f1e220149936abf0336d556e90acd00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05acaeb0f1e220149936abf03… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Oct 16 13:56:51 2009 -0600 ntdll: Implement DVD_StartSession() on Mac OS. --- dlls/ntdll/cdrom.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 94faf13..43676d0 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -81,6 +81,7 @@ # include <IOKit/IOKitLib.h> # include <IOKit/storage/IOMedia.h> # include <IOKit/storage/IOCDMediaBSDClient.h> +# include <IOKit/storage/IODVDMediaBSDClient.h> # include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h> # define SENSEBUFLEN kSenseDefaultSize #endif @@ -1939,6 +1940,20 @@ static NTSTATUS DVD_StartSession(int fd, const DVD_SESSION_ID *sid_in, PDVD_SESS return ret; #elif defined(__FreeBSD__) || defined(__NetBSD__) return STATUS_NOT_SUPPORTED; +#elif defined(__APPLE__) + NTSTATUS ret = STATUS_NOT_SUPPORTED; + dk_dvd_report_key_t dvdrk; + DVDAuthenticationGrantIDInfo agid_info; + + dvdrk.format = kDVDKeyFormatAGID_CSS; + dvdrk.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + if(sid_in) dvdrk.grantID = *(uint8_t*)sid_in; /* ? */ + dvdrk.bufferLength = sizeof(DVDAuthenticationGrantIDInfo); + dvdrk.buffer = &agid_info; + + ret = CDROM_GetStatusCode(ioctl(fd, DKIOCDVDREPORTKEY, &dvdrk)); + *sid_out = agid_info.grantID; + return ret; #else return STATUS_NOT_SUPPORTED; #endif

1 0

Matteo Bruni : d3dx9: D3DXAssembleShaderFromResource implementation.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: cbcf69985686f781819a285bdab9df3e02e14107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbcf69985686f781819a285bd… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Sep 15 20:23:00 2009 +0200 d3dx9: D3DXAssembleShaderFromResource implementation. --- dlls/d3dx9_36/d3dx9_36.spec | 4 ++-- dlls/d3dx9_36/shader.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 0d39114..08bb7f5 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -1,8 +1,8 @@ @ stdcall D3DXAssembleShader(ptr long ptr ptr long ptr ptr) @ stdcall D3DXAssembleShaderFromFileA(str ptr ptr long ptr ptr) @ stdcall D3DXAssembleShaderFromFileW(wstr ptr ptr long ptr ptr) -@ stub D3DXAssembleShaderFromResourceA -@ stub D3DXAssembleShaderFromResourceW +@ stdcall D3DXAssembleShaderFromResourceA(long str ptr ptr long ptr ptr) +@ stdcall D3DXAssembleShaderFromResourceW(long wstr ptr ptr long ptr ptr) @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) @ stub D3DXCheckCubeTextureRequirements @ stub D3DXCheckTextureRequirements diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 97b2384..c05f7b7 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -23,6 +23,7 @@ #include "windef.h" #include "wingdi.h" #include "d3dx9.h" +#include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -179,3 +180,43 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, FIXME("stub\n"); return D3DERR_INVALIDCALL; } + +HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, + LPCSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + HRSRC res; + LPCSTR buffer; + DWORD len; + + if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) + return D3DXERR_INVALIDDATA; + if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + return D3DXERR_INVALIDDATA; + return D3DXAssembleShader(buffer, len, defines, include, flags, + shader, error_messages); +} + +HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, + LPCWSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + HRSRC res; + LPCSTR buffer; + DWORD len; + + if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) + return D3DXERR_INVALIDDATA; + if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + return D3DXERR_INVALIDDATA; + return D3DXAssembleShader(buffer, len, defines, include, flags, + shader, error_messages); +}

1 0

Matteo Bruni : d3dx9: D3DXAssembleShader and D3DXAssembleShaderFromFile stubs.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: c31121dd35b41803b0e561a569b4df225895bd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31121dd35b41803b0e561a56… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Sep 15 20:17:14 2009 +0200 d3dx9: D3DXAssembleShader and D3DXAssembleShaderFromFile stubs. --- dlls/d3dx9_36/d3dx9_36.spec | 6 ++-- dlls/d3dx9_36/shader.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index d3fe3ac..0d39114 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -1,6 +1,6 @@ -@ stub D3DXAssembleShader -@ stub D3DXAssembleShaderFromFileA -@ stub D3DXAssembleShaderFromFileW +@ stdcall D3DXAssembleShader(ptr long ptr ptr long ptr ptr) +@ stdcall D3DXAssembleShaderFromFileA(str ptr ptr long ptr ptr) +@ stdcall D3DXAssembleShaderFromFileW(wstr ptr ptr long ptr ptr) @ stub D3DXAssembleShaderFromResourceA @ stub D3DXAssembleShaderFromResourceW @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 48499ac..97b2384 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -19,6 +19,7 @@ #include "config.h" #include "wine/port.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "windef.h" #include "wingdi.h" #include "d3dx9.h" @@ -131,3 +132,50 @@ LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device) return NULL; } + +HRESULT WINAPI D3DXAssembleShader(LPCSTR data, + UINT data_len, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + FIXME("stub\n"); + return D3DERR_INVALIDCALL; +} + +HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + LPWSTR filename_w = NULL; + DWORD len; + HRESULT ret; + + if (!filename) return D3DXERR_INVALIDDATA; + + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + filename_w = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filename_w) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filename_w, len); + + ret = D3DXAssembleShaderFromFileW(filename_w, defines, include, flags, shader, error_messages); + + HeapFree(GetProcessHeap(), 0, filename_w); + return ret; +} + +HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + FIXME("stub\n"); + return D3DERR_INVALIDCALL; +}

1 0

Matteo Bruni : d3dx9: Add D3DXAssembleShader and related declarations.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 3cd744e98bf6f7efd640a39c607488af5f9bfbeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd744e98bf6f7efd640a39c6… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Sep 15 20:09:03 2009 +0200 d3dx9: Add D3DXAssembleShader and related declarations. --- include/d3dx9shader.h | 79 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 899077e..a15cab6 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -21,6 +21,27 @@ #ifndef __D3DX9SHADER_H__ #define __D3DX9SHADER_H__ +#define D3DXSHADER_DEBUG 0x1 +#define D3DXSHADER_SKIPVALIDATION 0x2 +#define D3DXSHADER_SKIPOPTIMIZATION 0x4 +#define D3DXSHADER_PACKMATRIX_ROWMAJOR 0x8 +#define D3DXSHADER_PACKMATRIX_COLUMNMAJOR 0x10 +#define D3DXSHADER_PARTIALPRECISION 0x20 +#define D3DXSHADER_FORCE_VS_SOFTWARE_NOOPT 0x40 +#define D3DXSHADER_FORCE_PS_SOFTWARE_NOOPT 0x80 +#define D3DXSHADER_NO_PRESHADER 0x100 +#define D3DXSHADER_AVOID_FLOW_CONTROL 0x200 +#define D3DXSHADER_PREFER_FLOW_CONTROL 0x400 +#define D3DXSHADER_ENABLE_BACKWARDS_COMPATIBILITY 0x1000 +#define D3DXSHADER_IEEE_STRICTNESS 0x2000 + +#define D3DXSHADER_OPTIMIZATION_LEVEL0 0x4000 +#define D3DXSHADER_OPTIMIZATION_LEVEL1 0x0 +#define D3DXSHADER_OPTIMIZATION_LEVEL2 0xC000 +#define D3DXSHADER_OPTIMIZATION_LEVEL3 0x8000 + +#define D3DXSHADER_USE_LEGACY_D3DX9_31_DLL 0x10000 + typedef LPCSTR D3DXHANDLE; typedef enum D3DXPARAMETER_CLASS @@ -64,6 +85,26 @@ typedef struct _D3DXMACRO { LPCSTR Definition; } D3DXMACRO, *LPD3DXMACRO; +typedef enum _D3DXINCLUDE_TYPE +{ + D3DXINC_LOCAL, + D3DXINC_SYSTEM, + D3DXINC_FORCE_DWORD = 0x7fffffff, +} D3DXINCLUDE_TYPE, *LPD3DXINCLUDE_TYPE; + +#undef INTERFACE +#define INTERFACE ID3DXInclude + +DECLARE_INTERFACE(ID3DXInclude) +{ + STDMETHOD(Open)(THIS_ D3DXINCLUDE_TYPE include_type, LPCSTR filename, LPCVOID parent_data, LPCVOID *data, UINT *bytes) PURE; + STDMETHOD(Close)(THIS_ LPCVOID data) PURE; +}; + +#define ID3DXInclude_Open(p,a,b,c,d,e) (p)->lpVtbl->Open(p,a,b,c,d,e) +#define ID3DXInclude_Close(p,a) (p)->lpVtbl->Close(p,a) + +typedef struct ID3DXInclude *LPD3DXINCLUDE; #ifdef __cplusplus extern "C" { @@ -74,6 +115,44 @@ UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code); DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code); LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device); +HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + +HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + +HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, + LPCSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + +HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, + LPCWSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + +HRESULT WINAPI D3DXAssembleShader(LPCSTR data, + UINT data_len, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + #ifdef __cplusplus } #endif

1 0

Francois Gouget : comctl32: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 32bba6222b79681ad4da606362d53550f36c3b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32bba6222b79681ad4da60636… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:35:12 2009 +0200 comctl32: Add a trailing '\n' to a Wine trace. --- dlls/comctl32/tab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 22af8d7..15534af 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -312,7 +312,7 @@ static LRESULT TAB_SetCurFocus (TAB_INFO *infoPtr, INT iItem) static inline LRESULT TAB_SetToolTips (TAB_INFO *infoPtr, HWND hwndToolTip) { - TRACE("%p %p", infoPtr, hwndToolTip); + TRACE("%p %p\n", infoPtr, hwndToolTip); infoPtr->hwndToolTip = hwndToolTip; return 0; }

1 0

Francois Gouget : shell32: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 915b69e2a72dabe9fb03ce1b52558f1d2040817e URL: http://source.winehq.org/git/wine.git/?a=commit;h=915b69e2a72dabe9fb03ce1b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:28:22 2009 +0200 shell32: Fix compilation on systems that don't support nameless unions. --- dlls/shell32/tests/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 7d9e7b2..5e97f61 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1408,7 +1408,7 @@ static void hook_WaitForInputIdle(void *new_func) /* Search for the correct imported module by walking the import descriptors */ import_descriptor = (PIMAGE_IMPORT_DESCRIPTOR)(base + import_directory_rva); - while (import_descriptor->OriginalFirstThunk != 0) + while (U(*import_descriptor).OriginalFirstThunk != 0) { char *import_module_name; @@ -1423,7 +1423,7 @@ static void hook_WaitForInputIdle(void *new_func) * arrays. We need the import name table to find the imported * routine and the import address table to patch the address, so * walk them side by side */ - int_entry = (PIMAGE_THUNK_DATA)(base + import_descriptor->OriginalFirstThunk); + int_entry = (PIMAGE_THUNK_DATA)(base + U(*import_descriptor).OriginalFirstThunk); iat_entry = (PIMAGE_THUNK_DATA)(base + import_descriptor->FirstThunk); while (int_entry->u1.Ordinal != 0) {

1 0

Francois Gouget : shlwapi: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: af6c873b5489eaad656d01b09581d9788b0b5f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6c873b5489eaad656d01b09… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:29:10 2009 +0200 shlwapi: Fix compilation on systems that don't support nameless unions. --- dlls/shlwapi/regstream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index eb906a7..4dc15ad 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -221,7 +221,7 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, D return STG_E_INVALIDFUNCTION; /* we cut off the high part here */ - This->dwPos = tmp.LowPart; + This->dwPos = tmp.u.LowPart; if (plibNewPosition) plibNewPosition->QuadPart = This->dwPos; @@ -240,7 +240,7 @@ static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewS TRACE("(%p, %s)\n", This, wine_dbgstr_longlong(libNewSize.QuadPart)); /* we cut off the high part here */ - newLen = libNewSize.LowPart; + newLen = libNewSize.u.LowPart; newBuf = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pbBuffer, newLen); if (!newBuf) return STG_E_INSUFFICIENTMEMORY;

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 323f163af41c1f07326eee015f2c48744da565e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=323f163af41c1f07326eee015… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:28:08 2009 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 1a6023f..e05c967 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3220,7 +3220,7 @@ static void GetDCFormatTest(void) ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd.dwWidth = 64; ddsd.dwHeight = 64; - ddsd.ddpfPixelFormat = testdata[i].fmt; + U4(ddsd).ddpfPixelFormat = testdata[i].fmt; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL);

1 0

Francois Gouget : ntdll/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 9b89b85e5f49bffae4afa9c863d04b9f9b9c7f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b89b85e5f49bffae4afa9c86… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:28:14 2009 +0200 ntdll/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ntdll/tests/directory.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 6b621df..ea722dd 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -184,7 +184,7 @@ static void test_NtQueryDirectoryFile(void) pNtQueryDirectoryFile( dirh, NULL, NULL, NULL, &io, data, sizeof(data), FileBothDirectoryInformation, FALSE, NULL, TRUE ); - ok (io.Status == STATUS_SUCCESS, "filed to query directory; status %x\n", io.Status); + ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); data_len = io.Information; ok (data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n"); @@ -198,9 +198,9 @@ static void test_NtQueryDirectoryFile(void) if (dir_info->NextEntryOffset == 0) { pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, sizeof(data), FileBothDirectoryInformation, FALSE, NULL, FALSE ); - if (io.Status == STATUS_NO_MORE_FILES) + if (U(io).Status == STATUS_NO_MORE_FILES) break; - ok (io.Status == STATUS_SUCCESS, "filed to query directory; status %x\n", io.Status); + ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); data_len = io.Information; if (data_len < sizeof(FILE_BOTH_DIRECTORY_INFORMATION)) break;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009