September 2013 - Wine-Commits

Nikolay Sivov : xmllite: Fix node type for whitespace text nodes in Content .
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: ece36f17d06a8b3ac98ea4dfc333c0d5381b16a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece36f17d06a8b3ac98ea4dfc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 29 18:55:20 2013 +0400 xmllite: Fix node type for whitespace text nodes in Content. --- dlls/xmllite/reader.c | 5 ++++- dlls/xmllite/tests/reader.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 325a7a5..b181230 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2205,7 +2205,7 @@ static HRESULT reader_parse_chardata(xmlreader *reader) ptr = start = reader_get_cur(reader); /* There's no text */ if (!*ptr || *ptr == '<') return S_OK; - reader->nodetype = XmlNodeType_Text; + reader->nodetype = is_wchar_space(*ptr) ? XmlNodeType_Whitespace : XmlNodeType_Text; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CharData; reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); @@ -2232,6 +2232,9 @@ static HRESULT reader_parse_chardata(xmlreader *reader) } reader_skipn(reader, 1); + + /* this covers a case when text has leading whitespace chars */ + if (!is_wchar_space(*ptr)) reader->nodetype = XmlNodeType_Text; ptr++; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 04761cb..6296028 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -943,11 +943,13 @@ static const char misc_test_xml[] = " \t \r \n" "" "<a>" + "\r\n\t" "<b/>" "text" "" "text2" "<?pi pibody ?>" + "\r\n" "</a>" ; @@ -961,11 +963,13 @@ static struct nodes_test misc_test = { XmlNodeType_Whitespace, XmlNodeType_Comment, XmlNodeType_Element, + XmlNodeType_Whitespace, XmlNodeType_Element, XmlNodeType_Text, XmlNodeType_Comment, XmlNodeType_Text, XmlNodeType_ProcessingInstruction, + XmlNodeType_Whitespace, XmlNodeType_EndElement, XmlNodeType_None }

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::y implementation.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: 93f9d824ebecccccb0f135c324dc35eaad352fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f9d824ebecccccb0f135c32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 14:18:14 2013 +0200 mshtml: Added IHTMLEventObj::y implementation. --- dlls/mshtml/htmlevent.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ec56029..a7b2969 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -646,10 +646,24 @@ static HRESULT WINAPI HTMLEventObj_get_x(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); + LONG y = 0; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsevent) { + nsIDOMUIEvent *ui_event; + nsresult nsres; - *p = -1; + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMUIEvent, (void**)&ui_event); + if(NS_SUCCEEDED(nsres)) { + /* NOTE: pageY is not exactly right here. */ + nsres = nsIDOMUIEvent_GetPageY(ui_event, &y); + assert(nsres == NS_OK); + nsIDOMUIEvent_Release(ui_event); + } + } + + *p = y; return S_OK; }

1 0

Dmitry Timoshkov : ntdll: Unify the checks for asynchronous NtReadFile behaviour.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

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

Frédéric Delanoy : wrc: Use BOOL type where appropriate.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

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

Alexandre Julliard : wineconsole: Run a command shell by default.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: 761301b6696d856acd4bc602e097b160b46b5338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761301b6696d856acd4bc602e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 30 14:31:23 2013 +0200 wineconsole: Run a command shell by default. --- programs/wineconsole/wineconsole.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index d298705..7698521 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -780,6 +780,9 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) else return IDS_CMD_INVALID_BACKEND; } + else if (!strncmp(wci->ptr, "--help", 6) && + (!wci->ptr[6] || wci->ptr[6] == ' ' || wci->ptr[6] == '\t')) + return IDS_CMD_ABOUT|WINECON_CMD_SHOW_USAGE; else return IDS_CMD_INVALID_OPTION|WINECON_CMD_SHOW_USAGE; } @@ -788,8 +791,7 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) return 0; while (*wci->ptr == ' ' || *wci->ptr == '\t') wci->ptr++; - if (*wci->ptr == 0) - return IDS_CMD_ABOUT|WINECON_CMD_SHOW_USAGE; + if (*wci->ptr == 0) wci->ptr = "cmd"; return 0; }

1 0

Henri Verbeet : d3dcompiler: Get rid of the BWRITER_COMPARISON_TYPE typedef .
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: 1b6e9d245c2a76f158ff25b66fdde7d0eaf12232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b6e9d245c2a76f158ff25b66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 30 09:40:43 2013 +0200 d3dcompiler: Get rid of the BWRITER_COMPARISON_TYPE typedef. --- dlls/d3dcompiler_43/asmparser.c | 9 ++++----- dlls/d3dcompiler_43/asmshader.y | 2 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 13 +++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index c57343f..2d167de 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -501,11 +501,10 @@ static void asmparser_texreg2rgb(struct asm_parser *This, DWORD mod, DWORD shift * go through asmparser_instr). */ -static void asmparser_instr(struct asm_parser *This, DWORD opcode, - DWORD mod, DWORD shift, - BWRITER_COMPARISON_TYPE comp, - const struct shader_reg *dst, - const struct src_regs *srcs, int expectednsrcs) { +static void asmparser_instr(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift, + enum bwriter_comparison_type comp, const struct shader_reg *dst, + const struct src_regs *srcs, int expectednsrcs) +{ struct instruction *instr; unsigned int i; BOOL firstreg = TRUE; diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index 4109745..c0e0793 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -92,7 +92,7 @@ int asmshader_lex(void); DWORD mod; DWORD shift; } modshift; - BWRITER_COMPARISON_TYPE comptype; + enum bwriter_comparison_type comptype; struct { DWORD dclusage; unsigned int regnum; diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index d25b4e5..3489162 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -54,7 +54,8 @@ enum shader_type ST_PIXEL }; -typedef enum BWRITER_COMPARISON_TYPE { +enum bwriter_comparison_type +{ BWRITER_COMPARISON_NONE, BWRITER_COMPARISON_GT, BWRITER_COMPARISON_EQ, @@ -62,7 +63,7 @@ typedef enum BWRITER_COMPARISON_TYPE { BWRITER_COMPARISON_LT, BWRITER_COMPARISON_NE, BWRITER_COMPARISON_LE -} BWRITER_COMPARISON_TYPE; +}; struct constant { DWORD regnum; @@ -89,7 +90,7 @@ struct instruction { DWORD opcode; DWORD dstmod; DWORD shift; - BWRITER_COMPARISON_TYPE comptype; + enum bwriter_comparison_type comptype; BOOL has_dst; struct shader_reg dst; struct shader_reg *src; @@ -215,9 +216,9 @@ struct asmparser_backend { void (*end)(struct asm_parser *This); - void (*instr)(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift, - BWRITER_COMPARISON_TYPE comp, const struct shader_reg *dst, - const struct src_regs *srcs, int expectednsrcs); + void (*instr)(struct asm_parser *parser, DWORD opcode, DWORD mod, DWORD shift, + enum bwriter_comparison_type comp, const struct shader_reg *dst, + const struct src_regs *srcs, int expectednsrcs); }; struct instruction *alloc_instr(unsigned int srcs) DECLSPEC_HIDDEN;

1 0

Ken Thomases : winemac: Let Wine always drive window minimization; Cocoa just requests it.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

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

Dmitry Timoshkov : ntdll: Unify the checks for asynchronous NtWriteFile behaviour.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

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

Rico Schüller : d3dx9: Handle FX/ TX blobs in D3DXFindShaderComment().
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

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

Frédéric Delanoy : winemac.drv: Use BOOL type where appropriate.
by Alexandre Julliard Sept. 30, 2013

Sept. 30, 2013

Module: wine Branch: master Commit: 66a95f6d4520b22cc8569ecc96beb8d383964b3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a95f6d4520b22cc8569ecc9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 28 08:44:57 2013 +0200 winemac.drv: Use BOOL type where appropriate. --- dlls/winemac.drv/image.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/image.c b/dlls/winemac.drv/image.c index a39564a..4090350 100644 --- a/dlls/winemac.drv/image.c +++ b/dlls/winemac.drv/image.c @@ -58,7 +58,8 @@ CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmCol unsigned char *mask_bits, int mask_size, int width, int height, int istep) { - int i, has_alpha = FALSE; + int i; + BOOL has_alpha = FALSE; DWORD *ptr; CGBitmapInfo alpha_format; CGColorSpaceRef colorspace;

1 0