wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Alexandre Julliard : loader: Hardcode Linux syscall numbers.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 6f1932dbca5ad0d6c00cfda8907a487cd3371215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f1932dbca5ad0d6c00cfda89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 21 16:00:07 2013 +0100 loader: Hardcode Linux syscall numbers. --- loader/main.c | 2 +- loader/preloader.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/loader/main.c b/loader/main.c index 74a8eb8..ac67290 100644 --- a/loader/main.c +++ b/loader/main.c @@ -114,7 +114,7 @@ static void check_command_line( int argc, char *argv[] ) /* separate thread to check for NPTL and TLS features */ static void *needs_pthread( void *arg ) { - pid_t tid = syscall( SYS_gettid ); + pid_t tid = syscall( 224 /* SYS_gettid */ ); /* check for NPTL */ if (tid != -1 && tid != getpid()) return (void *)1; /* check for TLS glibc */ diff --git a/loader/preloader.c b/loader/preloader.c index a94c52c..ba43f0a 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -236,14 +236,14 @@ static inline __attribute__((noreturn)) void wld_exit( int code ) { for (;;) /* avoid warning */ __asm__ __volatile__( "pushl %%ebx; movl %1,%%ebx; int $0x80; popl %%ebx" - : : "a" (SYS_exit), "r" (code) ); + : : "a" (1 /* SYS_exit */), "r" (code) ); } static inline int wld_open( const char *name, int flags ) { int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (SYS_open), "r" (name), "c" (flags) ); + : "=a" (ret) : "0" (5 /* SYS_open */), "r" (name), "c" (flags) ); return SYSCALL_RET(ret); } @@ -251,7 +251,7 @@ static inline int wld_close( int fd ) { int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (SYS_close), "r" (fd) ); + : "=a" (ret) : "0" (6 /* SYS_close */), "r" (fd) ); return SYSCALL_RET(ret); } @@ -260,7 +260,7 @@ static inline ssize_t wld_read( int fd, void *buffer, size_t len ) int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) - : "0" (SYS_read), "r" (fd), "c" (buffer), "d" (len) + : "0" (3 /* SYS_read */), "r" (fd), "c" (buffer), "d" (len) : "memory" ); return SYSCALL_RET(ret); } @@ -269,7 +269,7 @@ static inline ssize_t wld_write( int fd, const void *buffer, size_t len ) { int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (SYS_write), "r" (fd), "c" (buffer), "d" (len) ); + : "=a" (ret) : "0" (4 /* SYS_write */), "r" (fd), "c" (buffer), "d" (len) ); return SYSCALL_RET(ret); } @@ -277,7 +277,7 @@ static inline int wld_mprotect( const void *addr, size_t len, int prot ) { int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (SYS_mprotect), "r" (addr), "c" (len), "d" (prot) ); + : "=a" (ret) : "0" (125 /* SYS_mprotect */), "r" (addr), "c" (len), "d" (prot) ); return SYSCALL_RET(ret); } @@ -302,35 +302,35 @@ static void *wld_mmap( void *start, size_t len, int prot, int flags, int fd, off args.fd = fd; args.offset = offset; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (SYS_mmap), "q" (&args) : "memory" ); + : "=a" (ret) : "0" (90 /* SYS_mmap */), "q" (&args) : "memory" ); return (void *)SYSCALL_RET(ret); } static inline uid_t wld_getuid(void) { uid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (SYS_getuid) ); + __asm__( "int $0x80" : "=a" (ret) : "0" (24 /* SYS_getuid */) ); return ret; } static inline uid_t wld_geteuid(void) { uid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (SYS_geteuid) ); + __asm__( "int $0x80" : "=a" (ret) : "0" (49 /* SYS_geteuid */) ); return ret; } static inline gid_t wld_getgid(void) { gid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (SYS_getgid) ); + __asm__( "int $0x80" : "=a" (ret) : "0" (47 /* SYS_getgid */) ); return ret; } static inline gid_t wld_getegid(void) { gid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (SYS_getegid) ); + __asm__( "int $0x80" : "=a" (ret) : "0" (50 /* SYS_getegid */) ); return ret; } @@ -338,7 +338,7 @@ static inline int wld_prctl( int code, long arg ) { int ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (SYS_prctl), "r" (code), "c" (arg) ); + : "=a" (ret) : "0" (172 /* SYS_prctl */), "r" (code), "c" (arg) ); return SYSCALL_RET(ret); }

1 0

Nikolay Sivov : xmllite: Handle empty elements and transition to content/ misc part, update depth on push.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 1ae300d75303b3b1a496bf97c116abbb92f6044f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae300d75303b3b1a496bf97c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 21 01:03:23 2013 +0400 xmllite: Handle empty elements and transition to content/misc part, update depth on push. --- dlls/xmllite/reader.c | 75 ++++++++++++++++++++++++++++++++++++------- dlls/xmllite/tests/reader.c | 37 ++++++++++++++++++--- 2 files changed, 95 insertions(+), 17 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c18dd41..e0e6542 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -52,7 +52,8 @@ typedef enum XmlReadInState_DTD, XmlReadInState_DTD_Misc, XmlReadInState_Element, - XmlReadInState_Content + XmlReadInState_Content, + XmlReadInState_MiscEnd } XmlReaderInternalState; typedef enum @@ -146,6 +147,7 @@ typedef struct UINT attr_count; struct list elements; strval strvalues[StringValue_Last]; + UINT depth; } xmlreader; struct input_buffer @@ -308,6 +310,13 @@ static void reader_clear_elements(xmlreader *reader) list_init(&reader->elements); } +static HRESULT reader_inc_depth(xmlreader *reader) +{ + /* FIXME: handle XmlReaderProperty_MaxElementDepth property */ + reader->depth++; + return S_OK; +} + static HRESULT reader_push_element(xmlreader *reader, strval *qname) { struct element *elem; @@ -319,6 +328,12 @@ static HRESULT reader_push_element(xmlreader *reader, strval *qname) hr = reader_strvaldup(reader, qname, &elem->qname); if (FAILED(hr)) return hr; + if (!list_empty(&reader->elements)) + { + hr = reader_inc_depth(reader); + if (FAILED(hr)) return hr; + } + list_add_head(&reader->elements, &elem->entry); return hr; } @@ -1447,7 +1462,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' [14 NS] EmptyElemTag ::= '<' QName (S Attribute)* S? '/>' */ -static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname) +static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname, int *empty) { static const WCHAR endW[] = {'/','>',0}; static const WCHAR gtW[] = {'>',0}; @@ -1461,11 +1476,16 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca reader_skipspaces(reader); - if (!reader_cmp(reader, endW)) return S_OK; + /* empty element */ + if ((*empty = !reader_cmp(reader, endW))) return S_OK; /* got a start tag */ if (!reader_cmp(reader, gtW)) + { + /* skip '>' */ + reader_skipn(reader, 1); return reader_push_element(reader, qname); + } FIXME("only empty elements/start tags without attribute list supported\n"); return E_NOTIMPL; @@ -1477,27 +1497,55 @@ static HRESULT reader_parse_element(xmlreader *reader) static const WCHAR ltW[] = {'<',0}; strval qname, prefix, local; HRESULT hr; + int empty; /* check if we are really on element */ if (reader_cmp(reader, ltW)) return S_FALSE; reader_shrink(reader); /* this handles empty elements too */ - hr = reader_parse_stag(reader, &prefix, &local, &qname); + empty = 0; + hr = reader_parse_stag(reader, &prefix, &local, &qname, &empty); if (FAILED(hr)) return hr; /* FIXME: need to check for defined namespace to reject invalid prefix, currently reject all prefixes */ if (prefix.len) return NC_E_UNDECLAREDPREFIX; + /* if we got empty element and stack is empty go straight to Misc */ + if (empty && list_empty(&reader->elements)) + reader->instate = XmlReadInState_MiscEnd; + else + reader->instate = XmlReadInState_Content; + reader->nodetype = XmlNodeType_Element; reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); - FIXME("element content parsing not implemented\n"); return hr; } +/* [13 NS] ETag ::= '</' QName S? '>' */ +static HRESULT reader_parse_endtag(xmlreader *reader) +{ + FIXME("ETag parsing not implemented\n"); + return E_NOTIMPL; +} + +/* [43] content ::= CharData? ((element | Reference | CDSect | PI | Comment) CharData?)* */ +static HRESULT reader_parse_content(xmlreader *reader) +{ + static const WCHAR etagW[] = {'<','/',0}; + reader_shrink(reader); + + /* handle end tag */ + if (!reader_cmp(reader, etagW)) + return reader_parse_endtag(reader); + + /* FIXME: handle the rest of possible content nodes */ + return reader_parse_element(reader); +} + static HRESULT reader_parse_nextnode(xmlreader *reader) { HRESULT hr; @@ -1562,11 +1610,9 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) return hr; break; case XmlReadInState_Element: - hr = reader_parse_element(reader); - if (FAILED(hr)) return hr; - - reader->instate = XmlReadInState_Content; - return hr; + return reader_parse_element(reader); + case XmlReadInState_Content: + return reader_parse_content(reader); default: FIXME("internal state %d not handled\n", reader->instate); return E_NOTIMPL; @@ -1642,6 +1688,8 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) } This->line = This->pos = 0; + reader_clear_elements(This); + This->depth = 0; /* just reset current input */ if (!input) @@ -1912,8 +1960,10 @@ static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) { - FIXME("(%p %p): stub\n", iface, depth); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)->(%p)\n", This, depth); + *depth = This->depth; + return S_OK; } static BOOL WINAPI xmlreader_IsEOF(IXmlReader* iface) @@ -2044,6 +2094,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->attr_count = 0; reader->attr = NULL; list_init(&reader->elements); + reader->depth = 0; for (i = 0; i < StringValue_Last; i++) reader->strvalues[i] = strval_empty; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 2ef9b6a..8a1f3f7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -687,10 +687,9 @@ static void test_read_xmldeclaration(void) ok(count == 3, "Expected 3, got %d\n", count); hr = IXmlReader_GetDepth(reader, &count); -todo_wine { ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); +todo_wine ok(count == 1, "Expected 1, got %d\n", count); -} hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got %08x\n", hr); @@ -1039,7 +1038,11 @@ static struct test_entry element_tests[] = { static void test_read_element(void) { struct test_entry *test = element_tests; + static const char stag[] = "<a><b>"; IXmlReader *reader; + XmlNodeType type; + IStream *stream; + UINT depth; HRESULT hr; hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); @@ -1047,9 +1050,6 @@ static void test_read_element(void) while (test->xml) { - XmlNodeType type; - IStream *stream; - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); @@ -1090,6 +1090,33 @@ static void test_read_element(void) test++; } + stream = create_stream_on_data(stag, strlen(stag)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 1; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 0, "got %d\n", depth); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 1; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 0, "got %d\n", depth); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 0; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 1, "got %d\n", depth); + + IStream_Release(stream); + IXmlReader_Release(reader); }

1 0

Nikolay Sivov : xmllite: Add a name stack for elements.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 77735419eb58624eef936c536cd168d52197fa98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77735419eb58624eef936c536… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 20 23:46:25 2013 +0400 xmllite: Add a name stack for elements. --- dlls/xmllite/reader.c | 67 ++++++++++++++++++++++++++++++++++++++++-- dlls/xmllite/tests/reader.c | 5 +++ 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 058875a..c18dd41 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -124,6 +124,12 @@ struct attribute strval value; }; +struct element +{ + struct list entry; + strval qname; +}; + typedef struct { IXmlReader IXmlReader_iface; @@ -138,6 +144,7 @@ typedef struct struct list attrs; /* attributes list for current node */ struct attribute *attr; /* current attribute */ UINT attr_count; + struct list elements; strval strvalues[StringValue_Last]; } xmlreader; @@ -194,6 +201,21 @@ static inline void reader_free(xmlreader *reader, void *mem) m_free(reader->imalloc, mem); } +static HRESULT reader_strvaldup(xmlreader *reader, const strval *src, strval *dest) +{ + *dest = *src; + + if (src->str != strval_empty.str) + { + dest->str = reader_alloc(reader, (dest->len+1)*sizeof(WCHAR)); + if (!dest->str) return E_OUTOFMEMORY; + memcpy(dest->str, src->str, dest->len*sizeof(WCHAR)); + dest->str[dest->len] = 0; + } + + return S_OK; +} + /* reader input memory allocation functions */ static inline void *readerinput_alloc(xmlreaderinput *input, size_t len) { @@ -253,10 +275,9 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *localname, strval *val return S_OK; } -static void reader_free_strvalue(xmlreader *reader, XmlReaderStringValue type) +/* This one frees stored string value if needed */ +static void reader_free_strvalued(xmlreader *reader, strval *v) { - strval *v = &reader->strvalues[type]; - if (v->str != strval_empty.str) { reader_free(reader, v->str); @@ -264,6 +285,11 @@ static void reader_free_strvalue(xmlreader *reader, XmlReaderStringValue type) } } +static void reader_free_strvalue(xmlreader *reader, XmlReaderStringValue type) +{ + reader_free_strvalued(reader, &reader->strvalues[type]); +} + static void reader_free_strvalues(xmlreader *reader) { int type; @@ -271,6 +297,32 @@ static void reader_free_strvalues(xmlreader *reader) reader_free_strvalue(reader, type); } +static void reader_clear_elements(xmlreader *reader) +{ + struct element *elem, *elem2; + LIST_FOR_EACH_ENTRY_SAFE(elem, elem2, &reader->elements, struct element, entry) + { + reader_free_strvalued(reader, &elem->qname); + reader_free(reader, elem); + } + list_init(&reader->elements); +} + +static HRESULT reader_push_element(xmlreader *reader, strval *qname) +{ + struct element *elem; + HRESULT hr; + + elem = reader_alloc(reader, sizeof(*elem)); + if (!elem) return E_OUTOFMEMORY; + + hr = reader_strvaldup(reader, qname, &elem->qname); + if (FAILED(hr)) return hr; + + list_add_head(&reader->elements, &elem->entry); + return hr; +} + /* always make a copy, cause strings are supposed to be null terminated */ static void reader_set_strvalue(xmlreader *reader, XmlReaderStringValue type, const strval *value) { @@ -1398,6 +1450,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname) { static const WCHAR endW[] = {'/','>',0}; + static const WCHAR gtW[] = {'>',0}; HRESULT hr; /* skip '<' */ @@ -1410,7 +1463,11 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca if (!reader_cmp(reader, endW)) return S_OK; - FIXME("only empty elements without attributes supported\n"); + /* got a start tag */ + if (!reader_cmp(reader, gtW)) + return reader_push_element(reader, qname); + + FIXME("only empty elements/start tags without attribute list supported\n"); return E_NOTIMPL; } @@ -1561,6 +1618,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); reader_clear_attrs(This); + reader_clear_elements(This); reader_free_strvalues(This); reader_free(This, This); if (imalloc) IMalloc_Release(imalloc); @@ -1985,6 +2043,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) list_init(&reader->attrs); reader->attr_count = 0; reader->attr = NULL; + list_init(&reader->elements); for (i = 0; i < StringValue_Last; i++) reader->strvalues[i] = strval_empty; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7394564..2ef9b6a 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -888,6 +888,7 @@ static const char misc_test_xml[] = "" " \t \r \n" "" + "<a>" ; static struct nodes_test misc_test = { @@ -899,6 +900,7 @@ static struct nodes_test misc_test = { XmlNodeType_Comment, XmlNodeType_Whitespace, XmlNodeType_Comment, + XmlNodeType_Element, XmlNodeType_None } }; @@ -1028,6 +1030,9 @@ static struct test_entry element_tests[] = { { "<a:b/>", "a:b", "", NC_E_UNDECLAREDPREFIX }, { "<:a/>", NULL, NULL, NC_E_QNAMECHARACTER }, { "< a/>", NULL, NULL, NC_E_QNAMECHARACTER }, + { "<a>", "a", "", S_OK }, + { "<a >", "a", "", S_OK }, + { "<a \r \t\n>", "a", "", S_OK }, { NULL } };

1 0

Henri Verbeet : wined3d: Move "vs_clipping" to the shader caps.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: c525cf381d9bb54454e04df24fde3bf5447cb537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c525cf381d9bb54454e04df24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:37 2013 +0100 wined3d: Move "vs_clipping" to the shader caps. --- dlls/wined3d/arb_program_shader.c | 4 +++- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 4 +++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f502260..0d0db64 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5062,7 +5062,9 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh caps->ps_1x_max_value = 0.0f; } - caps->vs_clipping = use_nv_clip(gl_info); + caps->wined3d_caps = 0; + if (use_nv_clip(gl_info)) + caps->wined3d_caps |= WINED3D_SHADER_CAP_VS_CLIPPING; } static BOOL shader_arb_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 984fa3b..cedb39e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5659,7 +5659,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->ps_version = shader_caps.ps_version; device->d3d_vshader_constantF = shader_caps.vs_uniform_count; device->d3d_pshader_constantF = shader_caps.ps_uniform_count; - device->vs_clipping = shader_caps.vs_clipping; + device->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; fragment_pipeline = adapter->fragment_pipe; fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3b47358..a9ca2cd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6205,7 +6205,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s */ caps->ps_1x_max_value = 8.0; - caps->vs_clipping = TRUE; + caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING; } static BOOL shader_glsl_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 596066f..2bb5f21 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1549,7 +1549,7 @@ static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct s caps->vs_uniform_count = 0; caps->ps_uniform_count = 0; caps->ps_1x_max_value = 0.0f; - caps->vs_clipping = FALSE; + caps->wined3d_caps = 0; } static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b1688d1..f59a736 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -714,6 +714,8 @@ extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN; typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); +#define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001 + struct shader_caps { UINT vs_version; @@ -724,7 +726,7 @@ struct shader_caps DWORD ps_uniform_count; float ps_1x_max_value; - BOOL vs_clipping; + DWORD wined3d_caps; }; enum tex_types

1 0

Henri Verbeet : wined3d: Move "ffp_proj_control" to the fragment caps.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 0e0e3b76f5af48e4f67870fa1035537bf20964af URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0e3b76f5af48e4f67870fa1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:36 2013 +0100 wined3d: Move "ffp_proj_control" to the fragment caps. --- dlls/wined3d/arb_program_shader.c | 11 ++++++++--- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 8 ++++++-- dlls/wined3d/nvidia_texture_shader.c | 3 +-- dlls/wined3d/shader.c | 6 +++++- dlls/wined3d/state.c | 3 +-- dlls/wined3d/wined3d_private.h | 4 +++- 7 files changed, 25 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e0e3b76f5af48e4f6787…

1 0

Henri Verbeet : wined3d: Get rid of the select_shader_mode() call in wined3d_get_device_caps().
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 75a38fa2fad5ea2652351be0006f1ab60b0dffde URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a38fa2fad5ea2652351be00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:35 2013 +0100 wined3d: Get rid of the select_shader_mode() call in wined3d_get_device_caps(). The shader backend already returns the correct caps. --- dlls/wined3d/directx.c | 35 ++++------------------------------- 1 files changed, 4 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7b388af..e442734 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4528,8 +4528,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte { const struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; const struct wined3d_gl_info *gl_info = &adapter->gl_info; - int vs_selected_mode; - int ps_selected_mode; struct shader_caps shader_caps; struct fragment_caps fragment_caps; DWORD ckey_caps, blit_caps, fx_caps, pal_caps; @@ -4540,12 +4538,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte if (adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - - /* ------------------------------------------------ - The following fields apply to both d3d8 and d3d9 - ------------------------------------------------ */ - /* Not quite true, but use h/w supported by opengl I suppose */ caps->DeviceType = (device_type == WINED3D_DEVICE_TYPE_HAL) ? WINED3D_DEVICE_TYPE_HAL : WINED3D_DEVICE_TYPE_REF; caps->AdapterOrdinal = adapter_idx; @@ -4929,30 +4921,11 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ caps->PrimitiveMiscCaps |= fragment_caps.PrimitiveMiscCaps; - /* This takes care for disabling vertex shader or pixel shader caps while leaving the other one enabled. - * Ignore shader model capabilities if disabled in config - */ - if (vs_selected_mode == SHADER_NONE) - { - TRACE("Vertex shader disabled in config, reporting version 0.0.\n"); - caps->VertexShaderVersion = 0; - caps->MaxVertexShaderConst = 0; - } - else - { - caps->VertexShaderVersion = shader_caps.vs_version; - caps->MaxVertexShaderConst = shader_caps.vs_uniform_count; - } + caps->VertexShaderVersion = shader_caps.vs_version; + caps->MaxVertexShaderConst = shader_caps.vs_uniform_count; - if (ps_selected_mode == SHADER_NONE) - { - TRACE("Pixel shader disabled in config, reporting version 0.0.\n"); - caps->PixelShaderVersion = 0; - caps->PixelShader1xMaxValue = 0.0f; - } else { - caps->PixelShaderVersion = shader_caps.ps_version; - caps->PixelShader1xMaxValue = shader_caps.ps_1x_max_value; - } + caps->PixelShaderVersion = shader_caps.ps_version; + caps->PixelShader1xMaxValue = shader_caps.ps_1x_max_value; caps->TextureOpCaps = fragment_caps.TextureOpCaps; caps->MaxTextureBlendStages = fragment_caps.MaxTextureBlendStages;

1 0

Henri Verbeet : ddraw: Avoid LPD3DDRAWPRIMITIVESTRIDEDDATA.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: ec1511ea0cdf7895483b1c0a828b9d2ff0213abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1511ea0cdf7895483b1c0a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:34 2013 +0100 ddraw: Avoid LPD3DDRAWPRIMITIVESTRIDEDDATA. --- include/d3d.h | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 6158045..22dafa8 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1177,8 +1177,11 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; STDMETHOD(SetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; STDMETHOD(GetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; - STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; - STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; + STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE primitive_type, DWORD fvf, + D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, DWORD flags) PURE; + STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE primitive_type, DWORD fvf, + D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, WORD *indices, DWORD index_count, + DWORD flags) PURE; STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, DWORD start_vertex, DWORD vertex_count, DWORD flags) PURE; STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, @@ -1322,8 +1325,11 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; STDMETHOD(SetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; STDMETHOD(GetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; - STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; - STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; + STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE primitive_type, DWORD fvf, + D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, DWORD flags) PURE; + STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE primitive_type, DWORD fvf, + D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, WORD *indices, DWORD index_count, + DWORD flags) PURE; STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb, DWORD start_vertex, DWORD vertex_count, DWORD flags) PURE; STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb,

1 0

Henri Verbeet : ddraw: Avoid LPD3DVERTEXBUFFERDESC.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 0b135993988534270b443f2975ba5d9654d00f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b135993988534270b443f297… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:33 2013 +0100 ddraw: Avoid LPD3DVERTEXBUFFERDESC. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 692220a..6158045 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1473,7 +1473,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer,IUnknown) STDMETHOD(ProcessVertices)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, IDirect3DVertexBuffer *src_buffer, DWORD src_idx, IDirect3DDevice3 *device, DWORD flags) PURE; - STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; + STDMETHOD(GetVertexBufferDesc)(THIS_ D3DVERTEXBUFFERDESC *desc) PURE; STDMETHOD(Optimize)(THIS_ IDirect3DDevice3 *device, DWORD flags) PURE; }; #undef INTERFACE @@ -1518,7 +1518,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer7,IUnknown) STDMETHOD(ProcessVertices)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, IDirect3DVertexBuffer7 *src_buffer, DWORD src_idx, IDirect3DDevice7 *device, DWORD flags) PURE; - STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; + STDMETHOD(GetVertexBufferDesc)(THIS_ D3DVERTEXBUFFERDESC *desc) PURE; STDMETHOD(Optimize)(THIS_ IDirect3DDevice7 *device, DWORD flags) PURE; STDMETHOD(ProcessVerticesStrided)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, D3DDRAWPRIMITIVESTRIDEDDATA *data, DWORD fvf, IDirect3DDevice7 *device, DWORD flags) PURE;

1 0

Christian Costa : d3dx9_36: Fill children info into ID3DXFileData object.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 5880ff01be8bdae02e8584a5e7744ef1e191f202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5880ff01be8bdae02e8584a5e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 21 08:41:02 2013 +0100 d3dx9_36: Fill children info into ID3DXFileData object. --- dlls/d3dx9_36/xfile.c | 67 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index afc0def..8020467 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -60,7 +60,10 @@ typedef struct { typedef struct { ID3DXFileData ID3DXFileData_iface; LONG ref; + BOOL reference; IDirectXFileData *dxfile_data; + ULONG nb_children; + ID3DXFileData **children; } ID3DXFileDataImpl; @@ -117,6 +120,11 @@ static ULONG WINAPI ID3DXFileDataImpl_Release(ID3DXFileData *iface) if (!ref) { + ULONG i; + + for (i = 0; i < This->nb_children; i++) + (This->children[i])->lpVtbl->Release(This->children[i]); + HeapFree(GetProcessHeap(), 0, This->children); IDirectXFileData_Release(This->dxfile_data); HeapFree(GetProcessHeap(), 0, This); } @@ -266,21 +274,70 @@ static const ID3DXFileDataVtbl ID3DXFileData_Vtbl = }; -static HRESULT ID3DXFileDataImpl_Create(IDirectXFileData *dxfile_data, ID3DXFileData **ret_iface) +static HRESULT ID3DXFileDataImpl_Create(IDirectXFileObject *dxfile_object, ID3DXFileData **ret_iface) { ID3DXFileDataImpl *object; + IDirectXFileObject *data_object; + HRESULT ret; - TRACE("(%p, %p)\n", dxfile_data, ret_iface); + TRACE("(%p, %p)\n", dxfile_object, ret_iface); *ret_iface = NULL; - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->ID3DXFileData_iface.lpVtbl = &ID3DXFileData_Vtbl; object->ref = 1; - object->dxfile_data = dxfile_data; + + ret = IDirectXFileObject_QueryInterface(dxfile_object, &IID_IDirectXFileData, (void **)&object->dxfile_data); + if (FAILED(ret)) + { + IDirectXFileDataReference *reference; + + ret = IDirectXFileObject_QueryInterface(dxfile_object, &IID_IDirectXFileDataReference, (void **)&reference); + if (SUCCEEDED(ret)) + { + ret = IDirectXFileDataReference_Resolve(reference, &object->dxfile_data); + if (FAILED(ret)) + { + HeapFree(GetProcessHeap(), 0, object); + return E_FAIL; + } + } + else + { + FIXME("Don't known what to do with binary object\n"); + HeapFree(GetProcessHeap(), 0, object); + return E_FAIL; + } + } + + while (SUCCEEDED(ret = IDirectXFileData_GetNextObject(object->dxfile_data, &data_object))) + { + if (object->children) + object->children = HeapReAlloc(GetProcessHeap(), 0, object->children, sizeof(ID3DXFileData*) * (object->nb_children + 1)); + else + object->children = HeapAlloc(GetProcessHeap(), 0, sizeof(ID3DXFileData*)); + if (!object->children) + { + ret = E_OUTOFMEMORY; + break; + } + ret = ID3DXFileDataImpl_Create(data_object, &object->children[object->nb_children]); + if (ret != S_OK) + break; + object->nb_children++; + } + + if (ret != DXFILEERR_NOMOREOBJECTS) + { + (&object->ID3DXFileData_iface)->lpVtbl->Release(&object->ID3DXFileData_iface); + return ret; + } + + TRACE("Found %u children\n", object->nb_children); *ret_iface = &object->ID3DXFileData_iface; @@ -534,7 +591,7 @@ static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const voi ret = E_OUTOFMEMORY; break; } - ret = ID3DXFileDataImpl_Create(data_object, &object->children[object->nb_children]); + ret = ID3DXFileDataImpl_Create((IDirectXFileObject*)data_object, &object->children[object->nb_children]); if (ret != S_OK) break; object->nb_children++;

1 0

Ken Thomases : winemac: Implement a WINDOW_CLOSE_REQUESTED event to allow closing windows.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: ed367c504df4703677abfa42dc7620cc58a55d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed367c504df4703677abfa42d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 21 00:08:12 2013 -0600 winemac: Implement a WINDOW_CLOSE_REQUESTED event to allow closing windows. --- dlls/winemac.drv/cocoa_window.m | 4 +++ dlls/winemac.drv/event.c | 16 ++++++++++++- dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 5 ++++ dlls/winemac.drv/macdrv_main.c | 2 + dlls/winemac.drv/window.c | 49 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e647cd0..36bd600 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -437,6 +437,10 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) */ - (BOOL)windowShouldClose:(id)sender { + macdrv_event event; + event.type = WINDOW_CLOSE_REQUESTED; + event.window = (macdrv_window)[self retain]; + [queue postEvent:&event]; return NO; } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index fcef550..effaa92 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -31,6 +31,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(event); /* return the name of an Mac event */ static const char *dbgstr_event(int type) { + static const char * const event_names[] = { + "WINDOW_CLOSE_REQUESTED", + }; + + if (0 <= type && type < NUM_EVENT_TYPES) return event_names[type]; return wine_dbg_sprintf("Unknown event %d", type); } @@ -40,8 +45,14 @@ static const char *dbgstr_event(int type) */ static macdrv_event_mask get_event_mask(DWORD mask) { + macdrv_event_mask event_mask = 0; + if ((mask & QS_ALLINPUT) == QS_ALLINPUT) return -1; - return 0; + + if (mask & QS_POSTMESSAGE) + event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); + + return event_mask; } @@ -62,6 +73,9 @@ void macdrv_handle_event(macdrv_event *event) switch (event->type) { + case WINDOW_CLOSE_REQUESTED: + macdrv_window_close_requested(hwnd); + break; default: TRACE(" ignoring\n"); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 7fe4109..524408f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -117,4 +117,6 @@ extern struct window_surface *create_surface(macdrv_window window, const RECT *r extern void set_window_surface(macdrv_window window, struct window_surface *window_surface) DECLSPEC_HIDDEN; extern void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha) DECLSPEC_HIDDEN; +extern void macdrv_window_close_requested(HWND hwnd) DECLSPEC_HIDDEN; + #endif /* __WINE_MACDRV_H */ diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 31bbb2d..f7f2f1d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -121,6 +121,11 @@ extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDE /* event */ +enum { + WINDOW_CLOSE_REQUESTED, + NUM_EVENT_TYPES +}; + typedef uint32_t macdrv_event_mask; typedef struct macdrv_event { diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 4776dd3..2a9e0ac 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -35,6 +35,8 @@ DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; */ static BOOL process_attach(void) { + assert(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); + if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; macdrv_err_on = ERR_ON(macdrv); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index cd7be9e..e22a155 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1230,3 +1230,52 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, done: release_win_data(data); } + + +/*********************************************************************** + * macdrv_window_close_requested + * + * Handler for WINDOW_CLOSE_REQUESTED events. + */ +void macdrv_window_close_requested(HWND hwnd) +{ + /* Ignore the delete window request if the window has been disabled. This + * is to disallow applications from being closed while in a modal state. + */ + if (IsWindowEnabled(hwnd)) + { + HMENU hSysMenu; + + if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) return; + hSysMenu = GetSystemMenu(hwnd, FALSE); + if (hSysMenu) + { + UINT state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); + if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) + return; + } + if (GetActiveWindow() != hwnd) + { + LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, + (WPARAM)GetAncestor(hwnd, GA_ROOT), + MAKELPARAM(HTCLOSE, WM_NCLBUTTONDOWN)); + switch(ma) + { + case MA_NOACTIVATEANDEAT: + case MA_ACTIVATEANDEAT: + return; + case MA_NOACTIVATE: + break; + case MA_ACTIVATE: + case 0: + SetActiveWindow(hwnd); + break; + default: + WARN("unknown WM_MOUSEACTIVATE code %d\n", (int) ma); + break; + } + } + + PostMessageW(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); + } +}

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
74
Older →

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 January 2013