September 2013 - Wine-commits

Frédéric Delanoy : wmc: Use BOOL type where appropriate.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: bf36cf284eb97e19f8e271b3bd8e66fdab11b8e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf36cf284eb97e19f8e271b3b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 28 08:44:58 2013 +0200 wmc: Use BOOL type where appropriate. --- tools/wmc/po.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index de15e24..489c7d4 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -297,7 +297,7 @@ static void po_xerror2( int severity, po_message_t message1, static const struct po_xerror_handler po_xerror_handler = { po_xerror, po_xerror2 }; -static int is_english( int lan ) +static BOOL is_english( int lan ) { return lan == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); }

1 0

Frédéric Delanoy : wrc: Use BOOL type where appropriate.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 5f607a95dfd2d207141da03e5413246ce1fa6216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f607a95dfd2d207141da03e5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 28 08:44:59 2013 +0200 wrc: Use BOOL type where appropriate. --- tools/wrc/po.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 5d4f485..d6ea262 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -54,17 +54,17 @@ struct mo_file /* ... rest of file data here */ }; -static int is_english( const language_t *lan ) +static BOOL is_english( const language_t *lan ) { return lan->id == LANG_ENGLISH && lan->sub == SUBLANG_DEFAULT; } -static int is_rtl_language( const language_t *lan ) +static BOOL is_rtl_language( const language_t *lan ) { return lan->id == LANG_ARABIC || lan->id == LANG_HEBREW || lan->id == LANG_PERSIAN; } -static int uses_larger_font( const language_t *lan ) +static BOOL uses_larger_font( const language_t *lan ) { return lan->id == LANG_CHINESE || lan->id == LANG_JAPANESE || lan->id == LANG_KOREAN; } @@ -810,7 +810,7 @@ static void add_po_menu( const resource_t *english, const resource_t *res ) add_po_menu_items( po, english_items, items, res->res.men->lvc.language ); } -static int string_has_context( const string_t *str ) +static BOOL string_has_context( const string_t *str ) { char *id, *id_buffer, *context;

1 0

Daniel Jelinski : include: Define ERROR_REQUEST_PAUSED.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: d15416a563c77e76ca483893e0bc8e8e1ab61793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15416a563c77e76ca483893e… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Sep 20 22:46:59 2013 +0200 include: Define ERROR_REQUEST_PAUSED. --- include/winerror.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index edd8af0..9d988fb 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1147,6 +1147,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_PRINTER_NOT_FOUND 3012 #define ERROR_PRINTER_DRIVER_WARNED 3013 #define ERROR_PRINTER_DRIVER_BLOCKED 3014 +#define ERROR_REQUEST_PAUSED 3050 #define ERROR_WINS_INTERNAL 4000 #define ERROR_CAN_NOT_DEL_LOCAL_WINS 4001 #define ERROR_STATIC_INIT 4002

1 0

Rico Schüller : d3dx9: Handle FX/ TX blobs in D3DXFindShaderComment().
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: e615c67bc72ed1dafc6584a15380561b96c5ee68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e615c67bc72ed1dafc6584a15… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Sep 30 01:19:00 2013 +0200 d3dx9: Handle FX/TX blobs in D3DXFindShaderComment(). --- dlls/d3dx9_36/shader.c | 14 +++++++++++++- dlls/d3dx9_36/tests/shader.c | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 2ff967c..460fe5a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -154,6 +154,7 @@ const char * WINAPI D3DXGetVertexShaderProfile(struct IDirect3DDevice9 *device) HRESULT WINAPI D3DXFindShaderComment(const DWORD *byte_code, DWORD fourcc, const void **data, UINT *size) { const DWORD *ptr = byte_code; + DWORD version; TRACE("byte_code %p, fourcc %x, data %p, size %p\n", byte_code, fourcc, data, size); @@ -161,7 +162,18 @@ HRESULT WINAPI D3DXFindShaderComment(const DWORD *byte_code, DWORD fourcc, const if (size) *size = 0; if (!byte_code) return D3DERR_INVALIDCALL; - if (!is_valid_bytecode(*byte_code)) return D3DXERR_INVALIDDATA; + + version = *ptr >> 16; + if (version != 0x4658 /* FX */ + && version != 0x5458 /* TX */ + && version != 0x7ffe + && version != 0x7fff + && version != 0xfffe /* VS */ + && version != 0xffff) /* PS */ + { + WARN("Invalid data supplied\n"); + return D3DXERR_INVALIDDATA; + } while (*++ptr != D3DSIO_END) { diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 02e69af..c19617f 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -20,12 +20,23 @@ #include "wine/test.h" #include "d3dx9.h" +#define FCC_TEXT MAKEFOURCC('T','E','X','T') +#define FCC_CTAB MAKEFOURCC('C','T','A','B') + static const DWORD shader_zero[] = {0x0}; static const DWORD shader_invalid[] = {0xeeee0100}; static const DWORD shader_empty[] = {0xfffeffff, 0x0000ffff}; +static const DWORD simple_fx[] = {0x46580000, 0x0002fffe, FCC_TEXT, 0x00000000, 0x0000ffff}; + +static const DWORD simple_tx[] = {0x54580000, 0x0002fffe, FCC_TEXT, 0x00000000, 0x0000ffff}; + +static const DWORD simple_7ffe[] = {0x7ffe0000, 0x0002fffe, FCC_TEXT, 0x00000000, 0x0000ffff}; + +static const DWORD simple_7fff[] = {0x7fff0000, 0x0002fffe, FCC_TEXT, 0x00000000, 0x0000ffff}; + static const DWORD simple_vs[] = { 0xfffe0101, /* vs_1_1 */ 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ @@ -44,9 +55,6 @@ static const DWORD simple_ps[] = { 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ 0x0000ffff}; /* END */ -#define FCC_TEXT MAKEFOURCC('T','E','X','T') -#define FCC_CTAB MAKEFOURCC('C','T','A','B') - static const DWORD shader_with_ctab[] = { 0xfffe0300, /* vs_3_0 */ 0x0002fffe, FCC_TEXT, 0x00000000, /* TEXT comment */ @@ -320,7 +328,7 @@ static void test_find_shader_comment(void) hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - ok(data == shader_with_ctab + 6, "Got result %p, expected %p.\n", data, shader_with_ctab + 6); + ok(data == shader_with_ctab + 6, "Got result %p, expected %p\n", data, shader_with_ctab + 6); hr = D3DXFindShaderComment(shader_with_ctab, 0, &data, &size); ok(hr == S_FALSE, "Got result %x, expected 1 (S_FALSE)\n", hr); @@ -334,8 +342,8 @@ static void test_find_shader_comment(void) hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, &size); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - ok(data == shader_with_ctab + 6, "Got result %p, expected %p.\n", data, shader_with_ctab + 6); - ok(size == 28, "Got result %d, expected 28\n", size); + ok(data == shader_with_ctab + 6, "Got result %p, expected %p\n", data, shader_with_ctab + 6); + ok(size == 28, "Got result %u, expected 28\n", size); hr = D3DXFindShaderComment(shader_zero, MAKEFOURCC('C','T','A','B'), &data, &size); ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); @@ -351,6 +359,26 @@ static void test_find_shader_comment(void) ok(hr == S_FALSE, "Got result %x, expected %x (S_FALSE)\n", hr, S_FALSE); ok(!data, "Got %p, expected NULL\n", data); ok(!size, "Got %u, expected 0\n", size); + + hr = D3DXFindShaderComment(simple_fx, FCC_TEXT, &data, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(data == simple_fx + 3, "Got result %p, expected %p\n", data, simple_fx + 3); + ok(size == 4, "Got result %u, expected 4\n", size); + + hr = D3DXFindShaderComment(simple_tx, FCC_TEXT, &data, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(data == simple_tx + 3, "Got result %p, expected %p\n", data, simple_tx + 3); + ok(size == 4, "Got result %u, expected 4\n", size); + + hr = D3DXFindShaderComment(simple_7ffe, FCC_TEXT, &data, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(data == simple_7ffe + 3, "Got result %p, expected %p\n", data, simple_7ffe + 3); + ok(size == 4, "Got result %u, expected 4\n", size); + + hr = D3DXFindShaderComment(simple_7fff, FCC_TEXT, &data, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(data == simple_7fff + 3, "Got result %p, expected %p\n", data, simple_7fff + 3); + ok(size == 4, "Got result %u, expected 4\n", size); } static void test_get_shader_constant_table_ex(void)

1 0

Thomas Faber : mmdevapi: Fix build with MSVC.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 513f8286cbeff8d7e226229b8fb08bc8ea963a31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=513f8286cbeff8d7e226229b8… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Sep 30 14:13:13 2013 +0200 mmdevapi: Fix build with MSVC. --- dlls/mmdevapi/devenum.c | 3 ++- dlls/mmdevapi/mmdevapi.h | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 21a3530..eebf4ed 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -569,7 +569,8 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls { /* ::Load cannot assume the interface stays alive after the function returns, * so just create the interface on the stack, saves a lot of complicated code */ - IPropertyBagImpl bag = { { &PB_Vtbl }, This->devguid }; + IPropertyBagImpl bag = { { &PB_Vtbl } }; + bag.devguid = This->devguid; hr = IPersistPropertyBag_Load(ppb, &bag.IPropertyBag_iface, NULL); IPersistPropertyBag_Release(ppb); if (FAILED(hr)) diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index c511240..2a04780 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -41,18 +41,18 @@ typedef struct _DriverFuncs { * If multiple drivers think they are valid, they will return a * priority value reflecting the likelihood that they are actually * valid. See enum _DriverPriority. */ - int WINAPI (*pGetPriority)(void); + int (WINAPI *pGetPriority)(void); /* ids gets an array of human-friendly endpoint names * keys gets an array of driver-specific stuff that is used * in GetAudioEndpoint to identify the endpoint * it is the caller's responsibility to free both arrays, and * all of the elements in both arrays with HeapFree() */ - HRESULT WINAPI (*pGetEndpointIDs)(EDataFlow flow, WCHAR ***ids, + HRESULT (WINAPI *pGetEndpointIDs)(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, UINT *default_index); - HRESULT WINAPI (*pGetAudioEndpoint)(void *key, IMMDevice *dev, + HRESULT (WINAPI *pGetAudioEndpoint)(void *key, IMMDevice *dev, IAudioClient **out); - HRESULT WINAPI (*pGetAudioSessionManager)(IMMDevice *device, + HRESULT (WINAPI *pGetAudioSessionManager)(IMMDevice *device, IAudioSessionManager2 **out); } DriverFuncs;

1 0

Dmitry Timoshkov : ntdll: Unify the checks for asynchronous NtWriteFile behaviour.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 5e5fb99755aa8f8ca6ffae2a451ebdeb45e05403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5fb99755aa8f8ca6ffae2a4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 30 20:19:20 2013 +0900 ntdll: Unify the checks for asynchronous NtWriteFile behaviour. --- dlls/ntdll/file.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1cc8f87..13bcb3c 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -950,7 +950,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; - BOOL send_completion = FALSE; + BOOL send_completion = FALSE, async_write; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)!\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); @@ -967,9 +967,11 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, goto done; } + async_write = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); + if (type == FD_TYPE_FILE) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) + if (async_write && (!offset || offset->QuadPart < 0)) { status = STATUS_INVALID_PARAMETER; goto done; @@ -1007,7 +1009,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, } } - if (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) + if (!async_write) /* update file pointer position */ lseek( unix_handle, off + result, SEEK_SET ); @@ -1018,7 +1020,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, } else if (type == FD_TYPE_SERIAL) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && + if (async_write && (!offset || (offset->QuadPart < 0 && offset->QuadPart != (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */))) { status = STATUS_INVALID_PARAMETER; @@ -1055,7 +1057,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + if (async_write) { async_fileio_write *fileio;

1 0

Dmitry Timoshkov : ntdll: Don't use asynchronous file IO in the loader.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: c7afb0bb882fd0ca6656b9c6a503b4465916a927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7afb0bb882fd0ca6656b9c6a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 30 20:19:39 2013 +0900 ntdll: Don't use asynchronous file IO in the loader. --- dlls/ntdll/loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b3abad0..b1c7600 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1881,7 +1881,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, 0 )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; goto found; } @@ -1916,7 +1916,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, 0 )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; } found: RtlFreeUnicodeString( &nt_name );

1 0

Sebastian Lackner : winex11: Call destroy_gl_drawable before destroying the window.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: e915cfd4e7ca78369a17172891b5a5f8e442d880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e915cfd4e7ca78369a1717289… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Sep 28 04:35:17 2013 +0200 winex11: Call destroy_gl_drawable before destroying the window. --- dlls/winex11.drv/window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1ff36eb..741a303 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1598,6 +1598,8 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; + destroy_gl_drawable( hwnd ); + if (!(data = get_win_data( hwnd ))) return; destroy_whole_window( data, FALSE ); @@ -1609,7 +1611,6 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) XDeleteContext( gdi_display, (XID)hwnd, win_data_context ); release_win_data( data ); HeapFree( GetProcessHeap(), 0, data ); - destroy_gl_drawable( hwnd ); }

1 0

Dmitry Timoshkov : ntdll: Unify the checks for asynchronous NtReadFile behaviour.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: fe3bc8c574a63b2e37cfe18803c150c54ca2e34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3bc8c574a63b2e37cfe1880… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 30 20:19:34 2013 +0900 ntdll: Unify the checks for asynchronous NtReadFile behaviour. --- dlls/ntdll/file.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 13bcb3c..62ae135 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -587,7 +587,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; - BOOL send_completion = FALSE; + BOOL send_completion = FALSE, async_read; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); @@ -604,9 +604,11 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } + async_read = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); + if (type == FD_TYPE_FILE) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) + if (async_read && (!offset || offset->QuadPart < 0)) { status = STATUS_INVALID_PARAMETER; goto done; @@ -623,7 +625,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } } - if (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) + if (!async_read) /* update file pointer position */ lseek( unix_handle, offset->QuadPart + result, SEEK_SET ); @@ -634,7 +636,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, } else if (type == FD_TYPE_SERIAL) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) + if (async_read && (!offset || offset->QuadPart < 0)) { status = STATUS_INVALID_PARAMETER; goto done; @@ -675,7 +677,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + if (async_read) { async_fileio_read *fileio; BOOL avail_mode;

1 0

Ken Thomases : winemac: Let Wine always drive window minimization; Cocoa just requests it.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 54291ad3d10aa75671811afd15578f7a9e8278b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54291ad3d10aa75671811afd1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Sep 30 10:29:23 2013 -0500 winemac: Let Wine always drive window minimization; Cocoa just requests it. --- dlls/winemac.drv/cocoa_window.h | 1 - dlls/winemac.drv/cocoa_window.m | 37 +++++++---------------- dlls/winemac.drv/event.c | 10 +++--- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/window.c | 61 ++++++++++++++++++++++++++------------- 6 files changed, 59 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54291ad3d10aa75671811…

1 0