wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Hans Leidekker : msi: Remove a component regardless of its install state, unless it's a permanent component.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 26299647f7eb6bcb8ffde301d620051575ca854d URL: http://source.winehq.org/git/wine.git/?a=commit;h=26299647f7eb6bcb8ffde301d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 7 15:55:48 2012 +0100 msi: Remove a component regardless of its install state, unless it's a permanent component. --- dlls/msi/action.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f338f25..88de118 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1982,8 +1982,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) continue; } TRACE("nobody wants component %s\n", debugstr_w(component->Component)); - if (component->anyAbsent && - (component->Installed == INSTALLSTATE_LOCAL || component->Installed == INSTALLSTATE_SOURCE)) + if (component->anyAbsent && component->ComponentId) { component->Action = INSTALLSTATE_ABSENT; component->ActionRequest = INSTALLSTATE_ABSENT;

1 0

Hans Leidekker : msi: Return correct length for the empty string from deformat_string.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 462ec1ba435eb4e5178f029efb836afdef9c9ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=462ec1ba435eb4e5178f029ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 7 15:55:26 2012 +0100 msi: Return correct length for the empty string from deformat_string. --- dlls/msi/format.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 033f69c..756c4d1 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -1023,24 +1023,23 @@ done: } /* wrapper to resist a need for a full rewrite right now */ -DWORD deformat_string( MSIPACKAGE *package, const WCHAR *ptr, WCHAR **data ) +DWORD deformat_string( MSIPACKAGE *package, const WCHAR *fmt, WCHAR **data ) { - if (ptr) - { - DWORD len = 0; - MSIRECORD *rec = MSI_CreateRecord( 1 ); - - MSI_RecordSetStringW( rec, 0, ptr ); - MSI_FormatRecordW( package, rec, NULL, &len ); + DWORD len; + MSIRECORD *rec; - len++; - *data = msi_alloc( len * sizeof(WCHAR) ); - if (len > 1) MSI_FormatRecordW( package, rec, *data, &len ); - else *data[0] = 0; + *data = NULL; + if (!fmt) return 0; + if (!(rec = MSI_CreateRecord( 1 ))) return 0; + MSI_RecordSetStringW( rec, 0, fmt ); + MSI_FormatRecordW( package, rec, NULL, &len ); + if (!(*data = msi_alloc( ++len * sizeof(WCHAR) ))) + { msiobj_release( &rec->hdr ); - return len; + return 0; } - *data = NULL; - return 0; + MSI_FormatRecordW( package, rec, *data, &len ); + msiobj_release( &rec->hdr ); + return len; }

1 0

Piotr Caban : msvcp60: Fixed basic_streambuf class structure.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: f6542bbb96587e179a25f3991c25a3410acef7b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6542bbb96587e179a25f3991… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 15:15:42 2012 +0100 msvcp60: Fixed basic_streambuf class structure. --- dlls/msvcp60/ios.c | 142 ++++++++++++++++++++++++-------------------------- dlls/msvcp60/msvcp.h | 4 +- 2 files changed, 71 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6542bbb96587e179a25f…

1 0

Piotr Caban : msvcp: Fixed uninitialized variable access in num_get:: _Getffld and _Getifld functions.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 605ea649853743396cfecaee7067b7baf94482f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605ea649853743396cfecaee7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 15:15:29 2012 +0100 msvcp: Fixed uninitialized variable access in num_get::_Getffld and _Getifld functions. --- dlls/msvcp100/locale.c | 34 ++++++++++++++-------------------- dlls/msvcp60/locale.c | 34 ++++++++++++++-------------------- dlls/msvcp71/locale.c | 34 ++++++++++++++-------------------- dlls/msvcp90/locale.c | 34 ++++++++++++++-------------------- 4 files changed, 56 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=605ea649853743396cfec…

1 0

Piotr Caban : msvcp90: Destroy string returned by basic_stringbuf_char_str_get.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 654a3ec500f2bcb227c2c81a756947fe5d8504d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=654a3ec500f2bcb227c2c81a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 15:15:10 2012 +0100 msvcp90: Destroy string returned by basic_stringbuf_char_str_get. --- dlls/msvcp90/tests/ios.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 4370f0e..4875e85 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1094,6 +1094,7 @@ static void test_num_put_put_double(void) str = call_func1(p_basic_string_char_cstr, &pstr); ok(!strcmp(tests[i].str, str), "wrong output, expected = %s found = %s\n", tests[i].str, str); + call_func1(p_basic_string_char_dtor, &pstr); if(tests[i].lcl) call_func1(p_locale_dtor, &lcl); @@ -1120,6 +1121,7 @@ static void test_num_put_put_double(void) AtoW(wide, tests[i].str, strlen(tests[i].str)); ok(!lstrcmpW(wide, wstr), "wrong output, expected = %s found = %s\n", tests[i].str, wine_dbgstr_w(wstr)); + call_func1(p_basic_string_wchar_dtor, &pwstr); if(tests[i].lcl) call_func1(p_locale_dtor, &lcl);

1 0

Piotr Caban : msvcp90: Fixed long long printing in tests.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 9b0ce65bb68e003436efdba8c05ca8948e4c262b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0ce65bb68e003436efdba8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 15:14:45 2012 +0100 msvcp90: Fixed long long printing in tests. --- dlls/msvcp90/tests/ios.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index d7b7d1f..4370f0e 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -828,7 +828,8 @@ static void test_num_get_get_uint64(void) next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); - ok(tests[i].val == val, "wrong val, expected = %llu found %llu\n", (unsigned long long)tests[i].val, (unsigned long long)val); + ok(tests[i].val == val, "wrong val, expected = %lx%08lx found %lx%08lx\n", (unsigned long)(tests[i].val >> 32), + (unsigned long)tests[i].val, (unsigned long)(val >> 32), (unsigned long)val); ok(tests[i].next == next, "wrong next, expected = %c (%i) found = %c (%i)\n", tests[i].next, tests[i].next, next, next); if(tests[i].lcl) @@ -854,7 +855,8 @@ static void test_num_get_get_uint64(void) nextus = (unsigned short)(int)call_func1(p_basic_istream_wchar_get, &wss.base.base1); ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); - ok(tests[i].val == val, "wrong val, expected = %llu found %llu\n", (unsigned long long)tests[i].val, (unsigned long long)val); + ok(tests[i].val == val, "wrong val, expected = %lx%08lx found %lx%08lx\n", (unsigned long)(tests[i].val >> 32), + (unsigned long)tests[i].val, (unsigned long)(val >> 32), (unsigned long)val); testus = tests[i].next == EOF ? WEOF : (unsigned short)tests[i].next; ok(testus == nextus, "wrong next, expected = %c (%i) found = %c (%i)\n", testus, testus, nextus, nextus);

1 0

Piotr Caban : msvcrt: Fixed __p___mb_cur_max tests.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 9c319baa6670219e4ea6c6ae35f238c087ef2094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c319baa6670219e4ea6c6ae3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 12:51:51 2012 +0100 msvcrt: Fixed __p___mb_cur_max tests. --- dlls/msvcrt/tests/locale.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 73eeb91..6b09cdf 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -745,6 +745,10 @@ static void test__Gettnames(void) static void test___mb_cur_max_func(void) { int mb_cur_max; + CPINFO cp; + + setlocale(LC_ALL, "C"); + GetCPInfo(CP_ACP, &cp); /* for newer Windows */ if(!p___mb_cur_max_func) @@ -768,7 +772,13 @@ static void test___mb_cur_max_func(void) win_skip("Skipping __p___mb_cur_max tests\n"); else { mb_cur_max = *p__p___mb_cur_max(); - ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); + if (cp.MaxCharSize != 1) { + todo_wine ok(mb_cur_max == cp.MaxCharSize, "mb_cur_max = %d, expected %d\n", + mb_cur_max, cp.MaxCharSize); + } + else { + ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); + } /* some old Windows don't set chinese */ if (!setlocale(LC_ALL, "chinese"))

1 0

Jacek Caban : mshtml: Added IHTMLObjectElement:: name property implementation.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 1017c2b3ee44b0e520527fc40ea6b1d91fa56041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1017c2b3ee44b0e520527fc40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 12:55:28 2012 +0100 mshtml: Added IHTMLObjectElement::name property implementation. --- dlls/mshtml/htmlobject.c | 21 +++++++++++++++++---- dlls/mshtml/tests/dom.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index fc22419..9e9bbdd 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -162,15 +162,28 @@ static HRESULT WINAPI HTMLObjectElement_get_align(IHTMLObjectElement *iface, BST static HRESULT WINAPI HTMLObjectElement_put_name(IHTMLObjectElement *iface, BSTR v) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLObjectElement_SetName(This->nsobject, &nsstr); + nsAString_Finish(&nsstr); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLObjectElement_get_name(IHTMLObjectElement *iface, BSTR *p) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLObjectElement_GetName(This->nsobject, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLObjectElement_put_codeBase(IHTMLObjectElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 26567d2..3f9bd5f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -56,7 +56,7 @@ static const char elem_test_str[] = "<textarea id=\"X\">text text</textarea>" "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td>td1 text</td><td>td2 text</td></tr></tbody></table>" "<script id=\"sc\" type=\"text/javascript\">\n</script>" - "<test /><object id=\"objid\" vspace=100></object><embed />" + "<test /><object id=\"objid\" name=\"objname\" vspace=100></object><embed />" "<img id=\"imgid\" name=\"WineImg\"/>" "<iframe src=\"about:blank\" id=\"ifr\"></iframe>" "<form id=\"frm\"></form>" @@ -1573,6 +1573,40 @@ static void _test_object_vspace(unsigned line, IUnknown *unk, LONG exl) IHTMLObjectElement_Release(object); } +#define test_object_name(a,b) _test_object_name(__LINE__,a,b) +static void _test_object_name(unsigned line, IHTMLElement *elem, const char *exname) +{ + IHTMLObjectElement *object = _get_object_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLObjectElement_get_name(object, &str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + if(exname) + ok_(__FILE__,line)(!strcmp_wa(str, exname), "name=%s, expected %s\n", wine_dbgstr_w(str), exname); + else + ok_(__FILE__,line)(!str, "name=%s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); + IHTMLObjectElement_Release(object); +} + +#define set_object_name(a,b) _set_object_name(__LINE__,a,b) +static void _set_object_name(unsigned line, IHTMLElement *elem, const char *name) +{ + IHTMLObjectElement *object = _get_object_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + str = a2bstr(name); + hres = IHTMLObjectElement_put_name(object, str); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + SysFreeString(str); + IHTMLObjectElement_Release(object); + + _test_object_name(line, elem, name); +} + #define create_option_elem(d,t,v) _create_option_elem(__LINE__,d,t,v) static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *doc, const char *txt, const char *val) @@ -5914,6 +5948,9 @@ static void test_elems(IHTMLDocument2 *doc) ok(elem != NULL, "elem == NULL\n"); if(elem) { test_object_vspace((IUnknown*)elem, 100); + test_object_name(elem, "objname"); + set_object_name(elem, "test"); + set_object_name(elem, NULL); IHTMLElement_Release(elem); }

1 0

Alexandre Julliard : opengl32: Don' t substitute OpenGL types that are already defined in wgl.h.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: a56c5b185e1817232f3edd3469ff885d26b91b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56c5b185e1817232f3edd346… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 18:06:42 2012 +0100 opengl32: Don't substitute OpenGL types that are already defined in wgl.h. --- dlls/opengl32/make_opengl | 11 +-- dlls/opengl32/opengl_ext.c | 334 +++++++++++++++++++++--------------------- dlls/opengl32/opengl_norm.c | 334 +++++++++++++++++++++--------------------- include/wine/wgl_driver.h | 336 +++++++++++++++++++++--------------------- 4 files changed, 503 insertions(+), 512 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a56c5b185e1817232f3ed…

1 0

Alexandre Julliard : wined3d: Make use of the generated wgl.h header.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: cf2b981ce09ec355cebae075afa6a9dbd247617f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2b981ce09ec355cebae075a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 13:54:32 2012 +0100 wined3d: Make use of the generated wgl.h header. --- dlls/wined3d/utils.c | 6 +- dlls/wined3d/wined3d_gl.h | 2257 +-------------------------------------------- 2 files changed, 5 insertions(+), 2258 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf2b981ce09ec355cebae…

1 0

Alexandre Julliard : winex11: Avoid using the system GL headers.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: e5b18af9e8bf48a8371655b243698ea88c3fbd87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b18af9e8bf48a8371655b24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 17:20:57 2012 +0100 winex11: Avoid using the system GL headers. --- dlls/winex11.drv/opengl.c | 217 ++++++++++++++++++++++++++++----------------- 1 files changed, 137 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5b18af9e8bf48a837165…

1 0

Alexandre Julliard : gdi32: Avoid using the system GL headers.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: af3f3cb1b29a7f926ea391f26ec4dfb626cea109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3f3cb1b29a7f926ea391f26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 14:43:02 2012 +0100 gdi32: Avoid using the system GL headers. --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/dibdrv/opengl.c | 34 ++++++++++++++++++++-------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 47fa96f..ea1b159 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll IMPORTLIB = gdi32 IMPORTS = advapi32 -EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@ @X_CFLAGS@ +EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@ EXTRALIBS = @CARBONLIB@ DELAYIMPORTS = usp10 diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index a6b83f0..778fb0b 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -21,13 +21,6 @@ #include "config.h" #include "wine/port.h" -#ifdef HAVE_GL_OSMESA_H -#include <GL/osmesa.h> -#undef APIENTRY -#undef GLAPI -#undef WINGDIAPI -#endif - #include "gdi_private.h" #include "dibdrv.h" @@ -38,8 +31,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); #ifdef SONAME_LIBOSMESA +#include "wine/wgl.h" #include "wine/wgl_driver.h" +#define OSMESA_COLOR_INDEX GL_COLOR_INDEX +#define OSMESA_RGBA GL_RGBA +#define OSMESA_BGRA 0x1 +#define OSMESA_ARGB 0x2 +#define OSMESA_RGB GL_RGB +#define OSMESA_BGR 0x4 +#define OSMESA_RGB_565 0x5 +#define OSMESA_ROW_LENGTH 0x10 +#define OSMESA_Y_UP 0x11 + +typedef struct osmesa_context *OSMesaContext; + extern BOOL WINAPI GdiSetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ); struct wgl_context @@ -54,13 +60,13 @@ static struct opengl_funcs opengl_funcs; static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; #undef USE_GL_FUNC -#define MAKE_FUNCPTR(f) static typeof(f) * p##f; -MAKE_FUNCPTR(OSMesaCreateContextExt) -MAKE_FUNCPTR(OSMesaDestroyContext) -MAKE_FUNCPTR(OSMesaGetProcAddress) -MAKE_FUNCPTR(OSMesaMakeCurrent) -MAKE_FUNCPTR(OSMesaPixelStore) -#undef MAKE_FUNCPTR +static OSMesaContext (*pOSMesaCreateContextExt)( GLenum format, GLint depthBits, GLint stencilBits, + GLint accumBits, OSMesaContext sharelist ); +static void (*pOSMesaDestroyContext)( OSMesaContext ctx ); +static void * (*pOSMesaGetProcAddress)( const char *funcName ); +static GLboolean (*pOSMesaMakeCurrent)( OSMesaContext ctx, void *buffer, GLenum type, + GLsizei width, GLsizei height ); +static void (*pOSMesaPixelStore)( GLint pname, GLint value ); static const struct {

1 0

Alexandre Julliard : opengl32: Avoid using the system GL headers.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: fdc1f2d43257fe304c192ec70f5a0305368c9b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc1f2d43257fe304c192ec70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 13:15:24 2012 +0100 opengl32: Avoid using the system GL headers. --- dlls/opengl32/Makefile.in | 1 - dlls/opengl32/make_opengl | 3 ++- dlls/opengl32/opengl_ext.c | 1 + dlls/opengl32/opengl_ext.h | 16 +--------------- dlls/opengl32/opengl_norm.c | 2 +- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index ff26507..ced0252 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -1,7 +1,6 @@ MODULE = opengl32.dll IMPORTLIB = opengl32 IMPORTS = user32 gdi32 advapi32 -EXTRAINCL = @X_CFLAGS@ C_SRCS = \ opengl_ext.c \ diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 7bcc34c..7d96653 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -945,9 +945,9 @@ print NORM " #include \"config.h\" #include <stdarg.h> -#include \"opengl_ext.h\" #include \"winternl.h\" #include \"wingdi.h\" +#include \"wine/wgl.h\" #include \"wine/wgl_driver.h\" #include \"wine/debug.h\" @@ -991,6 +991,7 @@ print EXT " #include \"opengl_ext.h\" #include \"winternl.h\" #include \"wingdi.h\" +#include \"wine/wgl.h\" #define WGL_WGLEXT_PROTOTYPES #include \"wine/wglext.h\" #include \"wine/wgl_driver.h\" diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index 49ff332..f7e258a 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -6,6 +6,7 @@ #include "opengl_ext.h" #include "winternl.h" #include "wingdi.h" +#include "wine/wgl.h" #define WGL_WGLEXT_PROTOTYPES #include "wine/wglext.h" #include "wine/wgl_driver.h" diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index eb35e54..5748e0c 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -19,22 +19,8 @@ #ifndef __DLLS_OPENGL32_OPENGL_EXT_H #define __DLLS_OPENGL32_OPENGL_EXT_H -#define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */ -#include <GL/gl.h> -#undef XMD_H - -#undef APIENTRY -#undef CALLBACK -#undef GLAPI -#undef WINAPI -#undef WINGDIAPI - -/* Redefines the constants */ -#define CALLBACK __stdcall -#define WINAPI __stdcall -#define APIENTRY WINAPI - #include "windef.h" +#include "wine/wgl.h" typedef struct { const char *name; /* name of the extension */ diff --git a/dlls/opengl32/opengl_norm.c b/dlls/opengl32/opengl_norm.c index ada172b..9e6e363 100644 --- a/dlls/opengl32/opengl_norm.c +++ b/dlls/opengl32/opengl_norm.c @@ -3,9 +3,9 @@ #include "config.h" #include <stdarg.h> -#include "opengl_ext.h" #include "winternl.h" #include "wingdi.h" +#include "wine/wgl.h" #include "wine/wgl_driver.h" #include "wine/debug.h"

1 0

Alexandre Julliard : opengl32: Generate our own wgl. h header from the OpenGL registry data.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 70e536f46b2b1e505b10074fb69c053a1809d8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e536f46b2b1e505b10074fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 13:14:58 2012 +0100 opengl32: Generate our own wgl.h header from the OpenGL registry data. --- dlls/opengl32/make_opengl | 122 +- include/wine/wgl.h | 5081 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 5173 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70e536f46b2b1e505b100…

1 0

Alexandre Julliard : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 00628bb6460e68a2bb2832005c5cb26658649f64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00628bb6460e68a2bb2832005… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 12:15:09 2012 +0100 opengl32: Update to the current OpenGL spec. --- dlls/opengl32/opengl_ext.c | 250 ++++++++++++++++++++++++------------------- dlls/opengl32/opengl_norm.c | 12 ++- include/wine/wgl_driver.h | 10 ++- 3 files changed, 156 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00628bb6460e68a2bb283…

1 0

Frédéric Delanoy : msi: Fix some leaks (coverity) .
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 85bf1082ce68612abd79863d7d61f232efd0601c URL: http://source.winehq.org/git/wine.git/?a=commit;h=85bf1082ce68612abd79863d7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 7 01:05:50 2012 +0100 msi: Fix some leaks (coverity). --- dlls/msi/msi.c | 3 +++ dlls/msi/package.c | 6 ++++-- dlls/msi/source.c | 3 +++ dlls/msi/where.c | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 4bcb5c5..92ef52c 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2215,7 +2215,10 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, if (!(val = msi_alloc( sz ))) return ERROR_OUTOFMEMORY; if ((r = msi_comp_find_prodcode(squished_pc, dwContext, szComponent, val, &sz))) + { + msi_free(val); return r; + } if (lstrlenW(val) > 2 && val[0] >= '0' && val[0] <= '9' && val[1] >= '0' && val[1] <= '9' && val[2] != ':') diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f398c10..015af00 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -638,10 +638,12 @@ static void set_msi_assembly_prop(MSIPACKAGE *package) return; size = GetFileVersionInfoSizeW(fusion, &handle); - if (!size) return; + if (!size) + goto done; version = msi_alloc(size); - if (!version) return; + if (!version) + goto done; if (!GetFileVersionInfoW(fusion, handle, size, version)) goto done; diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 881f3d2..ab8541c 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -763,7 +763,10 @@ UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, r = OpenSourceKey(product, &source, MSICODE_PRODUCT, context, FALSE); if (r != ERROR_SUCCESS) + { + msi_free(buffer); return r; + } sprintfW(buffer, format, typechar, index, value); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 45fda44..1bf7788 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -1253,6 +1253,8 @@ UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, if (r != ERROR_SUCCESS) { ERR("can't get table dimensions\n"); + table->view->ops->delete(table->view); + msi_free(table); goto end; }

1 0

Frédéric Delanoy : iphlapi: Fix some leaks ( coverity).
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 82c97d954d443ee94c3782be38bbae5bece34b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c97d954d443ee94c3782be3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 7 10:36:46 2012 +0100 iphlapi: Fix some leaks (coverity). --- dlls/iphlpapi/ifenum.c | 4 ++++ dlls/iphlpapi/iphlpapi_main.c | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 4f76d87..aff88cd 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -741,6 +741,8 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) ifp->ifa_addr); i++; } + if (ret) + HeapFree(GetProcessHeap(), 0, *ppIpAddrTable); } else ret = ERROR_OUTOFMEMORY; @@ -928,6 +930,8 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) &ifr->ifr_addr); i++; } + if (ret) + HeapFree(GetProcessHeap(), 0, *ppIpAddrTable); } else ret = ERROR_OUTOFMEMORY; diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index dae779c..16f138c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -784,6 +784,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index } if (ret) { + HeapFree(GetProcessHeap(), 0, v4addrs); HeapFree(GetProcessHeap(), 0, routeTable); return ret; }

1 0

Daniel Lehman : shell32: Initialize fAnyOperationsAborted in SHFileOperation.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 32f636f6d1adb5bac0268b738990ee6cdf43bafd URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f636f6d1adb5bac0268b738… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Nov 5 20:20:12 2012 -0800 shell32: Initialize fAnyOperationsAborted in SHFileOperation. --- dlls/shell32/shlfileop.c | 1 + dlls/shell32/tests/shlfileop.c | 52 +++++++++++++++++++++++++++++++++------- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index d07c588..787ba75 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1541,6 +1541,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) ZeroMemory(&op, sizeof(op)); op.req = lpFileOp; op.bManyItems = (flFrom.dwNumFiles > 1); + lpFileOp->fAnyOperationsAborted = FALSE; switch (lpFileOp->wFunc) { diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index f1e2a3e..9bf1e73 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -995,7 +995,11 @@ static void test_copy(void) shfo.fFlags |= FOF_NOERRORUI; set_curr_dir_path(from, "test1.txt\0test2.txt\0"); set_curr_dir_path(to, "test3.txt\0"); + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); + ok(shfo.fAnyOperationsAborted != 0xdeadbeef || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Expected TRUE/FALSE fAnyOperationsAborted not 0xdeadbeef\n"); if (retval == DE_FLDDESTISFILE || /* Vista and W2K8 */ retval == DE_INVALIDFILES) /* Win7 */ { @@ -1012,8 +1016,11 @@ static void test_copy(void) /* try to copy many files to nonexistent directory */ DeleteFile(to); shfo.fFlags &= ~FOF_NOERRORUI; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); + ok(!shfo.fAnyOperationsAborted || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Didn't expect aborted operations\n"); ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); ok(DeleteFile("test3.txt\\test1.txt"), "Expected test3.txt\\test1.txt to exist\n"); ok(DeleteFile("test3.txt\\test2.txt"), "Expected test3.txt\\test1.txt to exist\n"); @@ -1024,11 +1031,16 @@ static void test_copy(void) shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; shfo.pTo = "testdir2\\a.txt\0testdir2\\b.txt\0testdir2\\c.txt\0testdir2\\d.txt\0"; shfo.fFlags |= FOF_NOERRORUI | FOF_MULTIDESTFILES; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); + ok(shfo.fAnyOperationsAborted != 0xdeadbeef || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Expected TRUE/FALSE fAnyOperationsAborted not 0xdeadbeef\n"); if (dir_exists("testdir2\\a.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(DeleteFile("testdir2\\a.txt\\test1.txt"), "Expected testdir2\\a.txt\\test1.txt to exist\n"); RemoveDirectory("testdir2\\a.txt"); ok(DeleteFile("testdir2\\b.txt\\test2.txt"), "Expected testdir2\\b.txt\\test2.txt to exist\n"); @@ -1049,11 +1061,15 @@ static void test_copy(void) /* send in FOF_MULTIDESTFILES with too many destination files */ shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; shfo.pTo = "e.txt\0f.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); + ok(shfo.fAnyOperationsAborted != 0xdeadbeef || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Expected TRUE/FALSE fAnyOperationsAborted not 0xdeadbeef\n"); if (dir_exists("e.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(retval == DE_SAMEFILE, "Expected DE_SAMEFILE, got %d\n", retval); ok(DeleteFile("e.txt\\test1.txt"), "Expected e.txt\\test1.txt to exist\n"); RemoveDirectory("e.txt"); @@ -1072,8 +1088,11 @@ static void test_copy(void) /* use FOF_MULTIDESTFILES with files and a source directory */ shfo.pFrom = "test1.txt\0test2.txt\0test4.txt\0"; shfo.pTo = "testdir2\\a.txt\0testdir2\\b.txt\0testdir2\\c.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); + ok(!shfo.fAnyOperationsAborted || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Didn't expect aborted operations\n"); ok(retval == ERROR_SUCCESS || broken(retval == 0x100a1), /* WinMe */ "Expected ERROR_SUCCESS, got %d\n", retval); @@ -1085,13 +1104,17 @@ static void test_copy(void) /* try many dest files without FOF_MULTIDESTFILES flag */ shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; shfo.pTo = "a.txt\0b.txt\0c.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; shfo.fFlags &= ~FOF_MULTIDESTFILES; retval = SHFileOperation(&shfo); + ok(shfo.fAnyOperationsAborted != 0xdeadbeef || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Expected TRUE/FALSE fAnyOperationsAborted not 0xdeadbeef\n"); if (dir_exists("a.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(DeleteFile("a.txt\\test1.txt"), "Expected a.txt\\test1.txt to exist\n"); ok(DeleteFile("a.txt\\test2.txt"), "Expected a.txt\\test2.txt to exist\n"); ok(DeleteFile("a.txt\\test3.txt"), "Expected a.txt\\test3.txt to exist\n"); @@ -1099,7 +1122,11 @@ static void test_copy(void) } else { + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); + ok(shfo.fAnyOperationsAborted || + broken(!shfo.fAnyOperationsAborted), /* NT4 */ + "Expected aborted operations\n"); ok(!file_exists("a.txt"), "Expected a.txt to not exist\n"); } @@ -1157,8 +1184,11 @@ static void test_copy(void) init_shfo_tests(); shfo.pFrom = "test1.txt\0"; shfo.pTo = "b.txt\0c.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); + ok(!shfo.fAnyOperationsAborted || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Didn't expect aborted operations\n"); if (retval == DE_OPCANCELLED) { /* NT4 fails and doesn't copy any files */ @@ -1177,11 +1207,13 @@ static void test_copy(void) /* copy two file to three others, all fail */ shfo.pFrom = "test1.txt\0test2.txt\0"; shfo.pTo = "b.txt\0c.txt\0d.txt\0"; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); if (dir_exists("b.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(DeleteFile("b.txt\\test1.txt"), "Expected b.txt\\test1.txt to exist\n"); RemoveDirectory("b.txt"); ok(DeleteFile("c.txt\\test2.txt"), "Expected c.txt\\test2.txt to exist\n"); @@ -1191,7 +1223,7 @@ static void test_copy(void) { expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted || - broken(!shfo.fAnyOperationsAborted), /* NT4 */ + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ "Expected aborted operations\n"); ok(!DeleteFile("b.txt"), "Expected b.txt to not exist\n"); } @@ -1199,12 +1231,13 @@ static void test_copy(void) /* copy one file and one directory to three others */ shfo.pFrom = "test1.txt\0test4.txt\0"; shfo.pTo = "b.txt\0c.txt\0d.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); if (dir_exists("b.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(DeleteFile("b.txt\\test1.txt"), "Expected b.txt\\test1.txt to exist\n"); RemoveDirectory("b.txt"); ok(RemoveDirectory("c.txt\\test4.txt"), "Expected c.txt\\test4.txt to exist\n"); @@ -1214,7 +1247,7 @@ static void test_copy(void) { expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted || - broken(!shfo.fAnyOperationsAborted), /* NT4 */ + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ "Expected aborted operations\n"); ok(!DeleteFile("b.txt"), "Expected b.txt to not exist\n"); ok(!DeleteFile("c.txt"), "Expected c.txt to not exist\n"); @@ -1383,10 +1416,11 @@ static void test_copy(void) shfo.fFlags = FOF_NOCONFIRMATION; shfo.pFrom = "test1.txt\0"; shfo.pTo = "test2.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; /* without FOF_NOCONFIRMATION the confirmation is Yes/No */ retval = SHFileOperation(&shfo); ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(file_has_content("test2.txt", "test1.txt\n"), "The file was not copied\n"); shfo.pFrom = "test3.txt\0test1.txt\0";

1 0

Jacek Caban : widl: Ignore -app_config option.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 4d323d176caa2b835996976b3bcb9e36733eb271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d323d176caa2b835996976b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 11:25:21 2012 +0100 widl: Ignore -app_config option. --- tools/widl/widl.c | 11 +++++++++-- tools/widl/widl.man.in | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 8186b77..1718247 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -51,6 +51,7 @@ static const char usage[] = "Usage: widl [options...] infile.idl\n" " or: widl [options...] --dlldata-only name1 [name2...]\n" +" -app_config Ignored, present for midl compatibility\n" " -b arch Set the target architecture\n" " -c Generate client stub\n" " -d n Set debug level to 'n'\n" @@ -154,7 +155,8 @@ enum { WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, - WIN64_ALIGN_OPTION + WIN64_ALIGN_OPTION, + APP_CONFIG_OPTION }; static const char short_options[] = @@ -173,6 +175,7 @@ static const struct option long_options[] = { { "win64", 0, NULL, WIN64_OPTION }, { "win32-align", 1, NULL, WIN32_ALIGN_OPTION }, { "win64-align", 1, NULL, WIN64_ALIGN_OPTION }, + { "app_config", 0, NULL, APP_CONFIG_OPTION }, { NULL, 0, NULL, 0 } }; @@ -511,7 +514,7 @@ int main(int argc,char *argv[]) now = time(NULL); - while((optc = getopt_long(argc, argv, short_options, long_options, &opti)) != EOF) { + while((optc = getopt_long_only(argc, argv, short_options, long_options, &opti)) != EOF) { switch(optc) { case DLLDATA_OPTION: dlldata_name = xstrdup(optarg); @@ -558,6 +561,10 @@ int main(int argc,char *argv[]) if(win64_packing != 2 && win64_packing != 4 && win64_packing != 8) error("Packing must be one of 2, 4 or 8\n"); break; + case APP_CONFIG_OPTION: + /* widl does not distinguish between app_mode and default mode, + but we ignore this option for midl compatibility */ + break; case 'b': set_target( optarg ); break; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index f74328b..5b6e0de 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -114,6 +114,8 @@ prefixed with \fB0x\fR, it will be interpreted as an hexadecimal number. For the meaning of values, see the \fBDebug\fR section. .PP .B Miscellaneous options: +.IP "\fB-app_config\f" +Ignored, present for midl compatibility. .IP "\fB--local-stubs=\fIfile\fR" Generate empty stubs for call_as/local methods in an object interface and write them to \fIfile\fR.

1 0

Sam Edwards : opengl32: Implement the wglUseFontOutlines WGL_FONT_LINES format.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: ced7d66a112a03ea8d9482e47fb5ee61dccbc367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced7d66a112a03ea8d9482e47… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Nov 6 00:58:30 2012 -0700 opengl32: Implement the wglUseFontOutlines WGL_FONT_LINES format. --- dlls/opengl32/wgl.c | 62 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 43 insertions(+), 19 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index b5c61ce..fdb94e4 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1395,7 +1395,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; UINT glyph; const MAT2 identity = {{0,1},{0,0},{0,0},{0,1}}; - GLUtesselator *tess; + GLUtesselator *tess = NULL; LOGFONTW lf; HFONT old_font, unscaled_font; UINT em_size = 1024; @@ -1407,17 +1407,20 @@ static BOOL wglUseFontOutlines_common(HDC hdc, if(deviation <= 0.0) deviation = 1.0/em_size; - if (!load_libglu()) + if(format == WGL_FONT_POLYGONS) { - ERR("glu32 is required for this function but isn't available\n"); - return FALSE; - } + if (!load_libglu()) + { + ERR("glu32 is required for this function but isn't available\n"); + return FALSE; + } - tess = pgluNewTess(); - if(!tess) return FALSE; - pgluTessCallback(tess, GLU_TESS_VERTEX, (_GLUfuncptr)tess_callback_vertex); - pgluTessCallback(tess, GLU_TESS_BEGIN, (_GLUfuncptr)tess_callback_begin); - pgluTessCallback(tess, GLU_TESS_END, tess_callback_end); + tess = pgluNewTess(); + if(!tess) return FALSE; + pgluTessCallback(tess, GLU_TESS_VERTEX, (_GLUfuncptr)tess_callback_vertex); + pgluTessCallback(tess, GLU_TESS_BEGIN, (_GLUfuncptr)tess_callback_begin); + pgluTessCallback(tess, GLU_TESS_END, tess_callback_end); + } GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf); rc.left = rc.right = rc.bottom = 0; @@ -1471,7 +1474,8 @@ static BOOL wglUseFontOutlines_common(HDC hdc, funcs->gl.p_glNewList(listBase++, GL_COMPILE); funcs->gl.p_glFrontFace(GL_CW); - pgluTessBeginPolygon(tess, NULL); + if(format == WGL_FONT_POLYGONS) + pgluTessBeginPolygon(tess, NULL); while(!vertices) { @@ -1488,12 +1492,18 @@ static BOOL wglUseFontOutlines_common(HDC hdc, if(vertices) TRACE("\tstart %d, %d\n", pph->pfxStart.x.value, pph->pfxStart.y.value); - pgluTessBeginContour(tess); + if(format == WGL_FONT_POLYGONS) + pgluTessBeginContour(tess); + else + funcs->gl.p_glBegin(GL_LINE_LOOP); if(vertices) { fixed_to_double(pph->pfxStart, em_size, vertices); - pgluTessVertex(tess, vertices, vertices); + if(format == WGL_FONT_POLYGONS) + pgluTessVertex(tess, vertices, vertices); + else + funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); vertices += 3; } vertex_total++; @@ -1513,7 +1523,10 @@ static BOOL wglUseFontOutlines_common(HDC hdc, TRACE("\t\tline to %d, %d\n", ppc->apfx[i].x.value, ppc->apfx[i].y.value); fixed_to_double(ppc->apfx[i], em_size, vertices); - pgluTessVertex(tess, vertices, vertices); + if(format == WGL_FONT_POLYGONS) + pgluTessVertex(tess, vertices, vertices); + else + funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); vertices += 3; } fixed_to_double(ppc->apfx[i], em_size, previous); @@ -1558,7 +1571,10 @@ static BOOL wglUseFontOutlines_common(HDC hdc, vertices[0] = points[j].x; vertices[1] = points[j].y; vertices[2] = 0.0; - pgluTessVertex(tess, vertices, vertices); + if(format == WGL_FONT_POLYGONS) + pgluTessVertex(tess, vertices, vertices); + else + funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); vertices += 3; } } @@ -1569,20 +1585,27 @@ static BOOL wglUseFontOutlines_common(HDC hdc, break; default: ERR("\t\tcurve type = %d\n", ppc->wType); - pgluTessEndContour(tess); + if(format == WGL_FONT_POLYGONS) + pgluTessEndContour(tess); + else + funcs->gl.p_glEnd(); goto error_in_list; } ppc = (TTPOLYCURVE*)((char*)ppc + sizeof(*ppc) + (ppc->cpfx - 1) * sizeof(POINTFX)); } - pgluTessEndContour(tess); + if(format == WGL_FONT_POLYGONS) + pgluTessEndContour(tess); + else + funcs->gl.p_glEnd(); pph = (TTPOLYGONHEADER*)((char*)pph + pph->cb); } } error_in_list: - pgluTessEndPolygon(tess); + if(format == WGL_FONT_POLYGONS) + pgluTessEndPolygon(tess); funcs->gl.p_glTranslated((GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0); funcs->gl.p_glEndList(); HeapFree(GetProcessHeap(), 0, buf); @@ -1591,7 +1614,8 @@ error_in_list: error: DeleteObject(SelectObject(hdc, old_font)); - pgluDeleteTess(tess); + if(format == WGL_FONT_POLYGONS) + pgluDeleteTess(tess); return TRUE; }

1 0

Sam Edwards : d3d9/tests: Add test for IDirect3DDevice9_Reset with BackBufferWidth/Height = 0.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: e21a4b291c45f1b079ffcc4ddcda7a74e6486516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21a4b291c45f1b079ffcc4dd… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Nov 6 06:34:58 2012 -0700 d3d9/tests: Add test for IDirect3DDevice9_Reset with BackBufferWidth/Height = 0. --- dlls/d3d9/tests/device.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8fd72cf..614538a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -860,6 +860,7 @@ static void test_reset(void) { HRESULT hr; HWND hwnd = NULL; + RECT winrect; IDirect3D9 *pD3d = NULL; D3DPRESENT_PARAMETERS d3dpp; D3DDISPLAYMODE d3ddm, d3ddm2; @@ -1064,6 +1065,55 @@ static void test_reset(void) IDirect3DSwapChain9_Release(pSwapchain); } + winrect.left = 0; + winrect.top = 0; + winrect.right = 200; + winrect.bottom = 150; + ok(AdjustWindowRect(&winrect, WS_OVERLAPPEDWINDOW, FALSE), "AdjustWindowRect failed\n"); + ok(SetWindowPos(hwnd, NULL, 0, 0, + winrect.right-winrect.left, + winrect.bottom-winrect.top, + SWP_NOMOVE|SWP_NOZORDER), + "SetWindowPos failed\n"); + + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = TRUE; + d3dpp.BackBufferWidth = 0; + d3dpp.BackBufferHeight = 0; + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); + hr = IDirect3DDevice9_TestCooperativeLevel(device1); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); + + ZeroMemory(&vp, sizeof(vp)); + hr = IDirect3DDevice9_GetViewport(device1, &vp); + ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr); + if(SUCCEEDED(hr)) + { + ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); + ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); + todo_wine ok(vp.Width == 200, "D3DVIEWPORT->Width = %d\n", vp.Width); + todo_wine ok(vp.Height == 150, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); + ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); + } + + hr = IDirect3DDevice9_GetSwapChain(device1, 0, &pSwapchain); + ok(hr == D3D_OK, "IDirect3DDevice9_GetSwapChain returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + ZeroMemory(&d3dpp, sizeof(d3dpp)); + hr = IDirect3DSwapChain9_GetPresentParameters(pSwapchain, &d3dpp); + ok(hr == D3D_OK, "IDirect3DSwapChain9_GetPresentParameters returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + todo_wine ok(d3dpp.BackBufferWidth == 200, "Back buffer width is %d\n", d3dpp.BackBufferWidth); + todo_wine ok(d3dpp.BackBufferHeight == 150, "Back buffer height is %d\n", d3dpp.BackBufferHeight); + } + IDirect3DSwapChain9_Release(pSwapchain); + } + ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = TRUE;

1 0

Dmitry Timoshkov : gdiplus: Avoid GdipCloneMatrix calls for the graphics transformation matrix.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 0a81a34643db45e1ee66d00c9c3b0c0abbdb990b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a81a34643db45e1ee66d00c9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 7 11:36:26 2012 +0800 gdiplus: Avoid GdipCloneMatrix calls for the graphics transformation matrix. --- dlls/gdiplus/font.c | 9 +-- dlls/gdiplus/gdiplus_private.h | 10 ++-- dlls/gdiplus/graphics.c | 126 +++++++++++++--------------------------- 3 files changed, 49 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a81a34643db45e1ee66d…

1 0

Frédéric Delanoy : cmd/tests: Simplify 'if' comparison tests.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 250ce222b97851d1261023018194268119edf753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=250ce222b97851d1261023018… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 7 00:51:17 2012 +0100 cmd/tests: Simplify 'if' comparison tests. --- programs/cmd/tests/test_builtins.cmd | 91 +++++++++++---------------- programs/cmd/tests/test_builtins.cmd.exp | 100 +++++++++++++++--------------- 2 files changed, 86 insertions(+), 105 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7f90549..e7b8516 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -649,7 +649,6 @@ if 1==0 (echo doom) else@tab@echo quake echo --- comparison operators rem NT4 misevaluates conditionals in for loops so we have to use subroutines as workarounds -rem Imbricated for loops parameters are currently not expanded correctly; this prevents usage of simpler imbricated for loops in tests echo ------ for strings rem NT4 stops processing of the whole batch file as soon as it finds a rem comparison operator non fully uppercased, such as lss instead of LSS, so we @@ -662,11 +661,9 @@ if not "-1" LSS "1" (echo negative numbers as well) else echo NT4 if /i foo LSS FoOc echo if /i seems to work for LSS if /I not foo LSS FOOb echo if /I seems to be broken for LSS set STR_PARMS=A B AB BA AA -for %%i in (%STR_PARMS%) do call :LSStest %%i A -for %%i in (%STR_PARMS%) do call :LSStest %%i B -for %%i in (%STR_PARMS%) do call :LSStest %%i AB -for %%i in (%STR_PARMS%) do call :LSStest %%i BA -for %%i in (%STR_PARMS%) do call :LSStest %%i AA +for %%i in (%STR_PARMS%) do ( + for %%j in (%STR_PARMS%) do ( + call :LSStest %%i %%j)) if b LSS B (echo b LSS B) else echo NT4 if /I b LSS B echo b LSS B insensitive if b LSS A echo b LSS A @@ -675,11 +672,9 @@ if a LSS B (echo a LSS B) else echo NT4 if /I a LSS B echo a LSS B insensitive if A LSS b echo A LSS b if /I A LSS b echo A LSS b insensitive -for %%i in (%STR_PARMS%) do call :LEQtest %%i A -for %%i in (%STR_PARMS%) do call :LEQtest %%i B -for %%i in (%STR_PARMS%) do call :LEQtest %%i AB -for %%i in (%STR_PARMS%) do call :LEQtest %%i BA -for %%i in (%STR_PARMS%) do call :LEQtest %%i AA +for %%i in (%STR_PARMS%) do ( + for %%j in (%STR_PARMS%) do ( + call :LEQtest %%i %%j)) if b LEQ B (echo b LEQ B) else echo NT4 if /I b LEQ B echo b LEQ B insensitive if b LEQ A echo b LEQ A @@ -688,27 +683,19 @@ if a LEQ B (echo a LEQ B) else echo NT4 if /I a LEQ B echo a LEQ B insensitive if A LEQ b echo A LEQ b if /I A LEQ b echo A LEQ b insensitive -for %%i in (%STR_PARMS%) do call :EQUtest %%i A -for %%i in (%STR_PARMS%) do call :EQUtest %%i B -for %%i in (%STR_PARMS%) do call :EQUtest %%i AB -for %%i in (%STR_PARMS%) do call :EQUtest %%i BA -for %%i in (%STR_PARMS%) do call :EQUtest %%i AA +for %%i in (%STR_PARMS%) do ( + for %%j in (%STR_PARMS%) do ( + call :EQUtest %%i %%j)) if /I A EQU a echo A EQU a insensitive -for %%i in (%STR_PARMS%) do call :NEQtest %%i A -for %%i in (%STR_PARMS%) do call :NEQtest %%i B -for %%i in (%STR_PARMS%) do call :NEQtest %%i AB -for %%i in (%STR_PARMS%) do call :NEQtest %%i BA -for %%i in (%STR_PARMS%) do call :NEQtest %%i AA -for %%i in (%STR_PARMS%) do call :GEQtest %%i A -for %%i in (%STR_PARMS%) do call :GEQtest %%i B -for %%i in (%STR_PARMS%) do call :GEQtest %%i AB -for %%i in (%STR_PARMS%) do call :GEQtest %%i BA -for %%i in (%STR_PARMS%) do call :GEQtest %%i AA -for %%i in (%STR_PARMS%) do call :GTRtest %%i A -for %%i in (%STR_PARMS%) do call :GTRtest %%i B -for %%i in (%STR_PARMS%) do call :GTRtest %%i AB -for %%i in (%STR_PARMS%) do call :GTRtest %%i BA -for %%i in (%STR_PARMS%) do call :GTRtest %%i AA +for %%i in (%STR_PARMS%) do ( + for %%j in (%STR_PARMS%) do ( + call :NEQtest %%i %%j)) +for %%i in (%STR_PARMS%) do ( + for %%j in (%STR_PARMS%) do ( + call :GEQtest %%i %%j)) +for %%i in (%STR_PARMS%) do ( + for %%j in (%STR_PARMS%) do ( + call :GTRtest %%i %%j)) echo ------ for numbers if -1 LSS 1 (echo negative numbers handled) if not -1 LSS -10 (echo negative numbers handled) @@ -718,34 +705,28 @@ if 4 LSS 0x5 (echo hexa handled) if not -1 LSS -0x1A (echo also in negative form) if 11 LSS 101 (echo 11 LSS 101) set INT_PARMS=0 1 10 9 -for %%i in (%INT_PARMS%) do call :LSStest %%i 0 -for %%i in (%INT_PARMS%) do call :LSStest %%i 1 -for %%i in (%INT_PARMS%) do call :LSStest %%i 10 -for %%i in (%INT_PARMS%) do call :LSStest %%i 9 -for %%i in (%INT_PARMS%) do call :LEQtest %%i 0 -for %%i in (%INT_PARMS%) do call :LEQtest %%i 1 -for %%i in (%INT_PARMS%) do call :LEQtest %%i 10 -for %%i in (%INT_PARMS%) do call :LEQtest %%i 9 -for %%i in (%INT_PARMS%) do call :EQUtest %%i 0 -for %%i in (%INT_PARMS%) do call :EQUtest %%i 1 -for %%i in (%INT_PARMS%) do call :EQUtest %%i 10 -for %%i in (%INT_PARMS%) do call :EQUtest %%i 9 +for %%i in (%INT_PARMS%) do ( + for %%j in (%INT_PARMS%) do ( + call :LSStest %%i %%j)) +for %%i in (%INT_PARMS%) do ( + for %%j in (%INT_PARMS%) do ( + call :LEQtest %%i %%j)) +for %%i in (%INT_PARMS%) do ( + for %%j in (%INT_PARMS%) do ( + call :EQUtest %%i %%j)) if 011 EQU 9 (echo octal ok) if 0xA1 EQU 161 (echo hexa ok) if 0xA1 EQU "161" (echo hexa should be recognized) else (echo string/hexa compare ok) if "0xA1" EQU 161 (echo hexa should be recognized) else (echo string/hexa compare ok) -for %%i in (%INT_PARMS%) do call :NEQtest %%i 0 -for %%i in (%INT_PARMS%) do call :NEQtest %%i 1 -for %%i in (%INT_PARMS%) do call :NEQtest %%i 10 -for %%i in (%INT_PARMS%) do call :NEQtest %%i 9 -for %%i in (%INT_PARMS%) do call :GEQtest %%i 0 -for %%i in (%INT_PARMS%) do call :GEQtest %%i 1 -for %%i in (%INT_PARMS%) do call :GEQtest %%i 10 -for %%i in (%INT_PARMS%) do call :GEQtest %%i 9 -for %%i in (%INT_PARMS%) do call :GTRtest %%i 0 -for %%i in (%INT_PARMS%) do call :GTRtest %%i 1 -for %%i in (%INT_PARMS%) do call :GTRtest %%i 10 -for %%i in (%INT_PARMS%) do call :GTRtest %%i 9 +for %%i in (%INT_PARMS%) do ( + for %%j in (%INT_PARMS%) do ( + call :NEQtest %%i %%j)) +for %%i in (%INT_PARMS%) do ( + for %%j in (%INT_PARMS%) do ( + call :GEQtest %%i %%j)) +for %%i in (%INT_PARMS%) do ( + for %%j in (%INT_PARMS%) do ( + call :GTRtest %%i %%j)) echo ------ for numbers and stringified numbers if not "1" EQU 1 (echo strings and integers not equal) else echo foo if not 1 EQU "1" (echo strings and integers not equal) else echo foo diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d3612b6..1d42a96 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -446,15 +446,15 @@ numbers in quotes are handled as strings negative numbers as well@or_broken@NT4 if /i seems to work for LSS A LSS B -AB LSS B -AA LSS B A LSS AB -AA LSS AB A LSS BA +A LSS AA B LSS BA +AB LSS B AB LSS BA +AA LSS B +AA LSS AB AA LSS BA -A LSS AA b LSS B@or_broken@NT4 a LSS B@or_broken@NT4 a LSS B insensitive @@ -462,18 +462,18 @@ A LSS b A LSS b insensitive A LEQ A A LEQ B -B LEQ B -AB LEQ B -AA LEQ B A LEQ AB -AB LEQ AB -AA LEQ AB A LEQ BA +A LEQ AA +B LEQ B B LEQ BA +AB LEQ B +AB LEQ AB AB LEQ BA BA LEQ BA +AA LEQ B +AA LEQ AB AA LEQ BA -A LEQ AA AA LEQ AA b LEQ B@or_broken@NT4 b LEQ B insensitive @@ -487,51 +487,51 @@ AB EQU AB BA EQU BA AA EQU AA A EQU a insensitive -B NEQ A -AB NEQ A -BA NEQ A -AA NEQ A A NEQ B -AB NEQ B -BA NEQ B -AA NEQ B A NEQ AB -B NEQ AB -BA NEQ AB -AA NEQ AB A NEQ BA -B NEQ BA -AB NEQ BA -AA NEQ BA A NEQ AA +B NEQ A +B NEQ AB +B NEQ BA B NEQ AA +AB NEQ A +AB NEQ B +AB NEQ BA AB NEQ AA +BA NEQ A +BA NEQ B +BA NEQ AB BA NEQ AA +AA NEQ A +AA NEQ B +AA NEQ AB +AA NEQ BA A GEQ A B GEQ A -AB GEQ A -BA GEQ A -AA GEQ A B GEQ B -BA GEQ B B GEQ AB +B GEQ AA +AB GEQ A AB GEQ AB +AB GEQ AA +BA GEQ A +BA GEQ B BA GEQ AB BA GEQ BA -B GEQ AA -AB GEQ AA BA GEQ AA +AA GEQ A AA GEQ AA B GTR A +B GTR AB +B GTR AA AB GTR A +AB GTR AA BA GTR A -AA GTR A BA GTR B -B GTR AB BA GTR AB -B GTR AA -AB GTR AA BA GTR AA +AA GTR A ------ for numbers negative numbers handled negative numbers handled @@ -542,19 +542,19 @@ also in negative form 11 LSS 101 0 LSS 1 0 LSS 10 -1 LSS 10 -9 LSS 10 0 LSS 9 +1 LSS 10 1 LSS 9 +9 LSS 10 0 LEQ 0 0 LEQ 1 -1 LEQ 1 0 LEQ 10 +0 LEQ 9 +1 LEQ 1 1 LEQ 10 +1 LEQ 9 10 LEQ 10 9 LEQ 10 -0 LEQ 9 -1 LEQ 9 9 LEQ 9 0 EQU 0 1 EQU 1 @@ -564,34 +564,34 @@ octal ok hexa ok string/hexa compare ok string/hexa compare ok -1 NEQ 0 -10 NEQ 0 -9 NEQ 0 0 NEQ 1 -10 NEQ 1 -9 NEQ 1 0 NEQ 10 -1 NEQ 10 -9 NEQ 10 0 NEQ 9 +1 NEQ 0 +1 NEQ 10 1 NEQ 9 +10 NEQ 0 +10 NEQ 1 10 NEQ 9 +9 NEQ 0 +9 NEQ 1 +9 NEQ 10 0 GEQ 0 1 GEQ 0 -10 GEQ 0 -9 GEQ 0 1 GEQ 1 +10 GEQ 0 10 GEQ 1 -9 GEQ 1 10 GEQ 10 10 GEQ 9 +9 GEQ 0 +9 GEQ 1 9 GEQ 9 1 GTR 0 10 GTR 0 -9 GTR 0 10 GTR 1 -9 GTR 1 10 GTR 9 +9 GTR 0 +9 GTR 1 ------ for numbers and stringified numbers strings and integers not equal strings and integers not equal

1 0

Henri Verbeet : wined3d: Use more consistent names for the various bumpenv uniforms.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: e8b0de1e144f2aede080a604293183156121209e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b0de1e144f2aede080a6042… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:27 2012 +0100 wined3d: Use more consistent names for the various bumpenv uniforms. --- dlls/wined3d/glsl_shader.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c5c27ac..781105b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -116,9 +116,9 @@ struct glsl_ps_program GLhandleARB id; GLint *uniform_f_locations; GLint uniform_i_locations[MAX_CONST_I]; - GLint bumpenvmat_location[MAX_TEXTURES]; - GLint luminancescale_location[MAX_TEXTURES]; - GLint luminanceoffset_location[MAX_TEXTURES]; + GLint bumpenv_mat_location[MAX_TEXTURES]; + GLint bumpenv_lum_scale_location[MAX_TEXTURES]; + GLint bumpenv_lum_offset_location[MAX_TEXTURES]; GLint ycorrection_location; GLint np2_fixup_location; const struct ps_np2fixup_info *np2_fixup_info; @@ -788,24 +788,24 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, { const float *data; - if (prog->ps.bumpenvmat_location[i] == -1) + if (prog->ps.bumpenv_mat_location[i] == -1) continue; data = (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_MAT00]; - GL_EXTCALL(glUniformMatrix2fvARB(prog->ps.bumpenvmat_location[i], 1, 0, data)); + GL_EXTCALL(glUniformMatrix2fvARB(prog->ps.bumpenv_mat_location[i], 1, 0, data)); checkGLcall("glUniformMatrix2fvARB"); /* texbeml needs the luminance scale and offset too. If texbeml * is used, needsbumpmat is set too, so we can check that in the * needsbumpmat check. */ - if (prog->ps.luminancescale_location[i] != -1) + if (prog->ps.bumpenv_lum_scale_location[i] != -1) { const GLfloat *scale = (const GLfloat *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LSCALE]; const GLfloat *offset = (const GLfloat *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LOFFSET]; - GL_EXTCALL(glUniform1fvARB(prog->ps.luminancescale_location[i], 1, scale)); + GL_EXTCALL(glUniform1fvARB(prog->ps.bumpenv_lum_scale_location[i], 1, scale)); checkGLcall("glUniform1fvARB"); - GL_EXTCALL(glUniform1fvARB(prog->ps.luminanceoffset_location[i], 1, offset)); + GL_EXTCALL(glUniform1fvARB(prog->ps.bumpenv_lum_offset_location[i], 1, offset)); checkGLcall("glUniform1fvARB"); } } @@ -1148,12 +1148,12 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (!(map & 1)) continue; - shader_addline(buffer, "uniform mat2 bumpenvmat%d;\n", i); + shader_addline(buffer, "uniform mat2 bumpenv_mat%u;\n", i); if (reg_maps->luminanceparams & (1 << i)) { - shader_addline(buffer, "uniform float luminancescale%d;\n", i); - shader_addline(buffer, "uniform float luminanceoffset%d;\n", i); + shader_addline(buffer, "uniform float bumpenv_lum_scale%u;\n", i); + shader_addline(buffer, "uniform float bumpenv_lum_offset%u;\n", i); extra_constants_needed++; } @@ -3933,7 +3933,7 @@ static void shader_glsl_texbem(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1, &coord_param); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, - "T%u%s + vec4(bumpenvmat%d * %s, 0.0, 0.0)%s", sampler_idx, coord_mask, sampler_idx, + "T%u%s + vec4(bumpenv_mat%u * %s, 0.0, 0.0)%s", sampler_idx, coord_mask, sampler_idx, coord_param.param_str, coord_mask); if (ins->handler_idx == WINED3DSIH_TEXBEML) @@ -3944,7 +3944,7 @@ static void shader_glsl_texbem(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_2, &luminance_param); shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); - shader_addline(ins->ctx->buffer, "%s%s *= (%s * luminancescale%d + luminanceoffset%d);\n", + shader_addline(ins->ctx->buffer, "%s%s *= (%s * bumpenv_lum_scale%u + bumpenv_lum_offset%u);\n", dst_param.reg_name, dst_param.mask_str, luminance_param.param_str, sampler_idx, sampler_idx); } @@ -3959,7 +3959,7 @@ static void shader_glsl_bem(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1, &src1_param); shader_glsl_append_dst(ins->ctx->buffer, ins); - shader_addline(ins->ctx->buffer, "%s + bumpenvmat%d * %s);\n", + shader_addline(ins->ctx->buffer, "%s + bumpenv_mat%u * %s);\n", src0_param.param_str, sampler_idx, src1_param.param_str); } @@ -4854,12 +4854,12 @@ static void set_glsl_shader_program(const struct wined3d_context *context, for (i = 0; i < MAX_TEXTURES; ++i) { - sprintf(name, "bumpenvmat%u", i); - entry->ps.bumpenvmat_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); - sprintf(name, "luminancescale%u", i); - entry->ps.luminancescale_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); - sprintf(name, "luminanceoffset%u", i); - entry->ps.luminanceoffset_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); + sprintf(name, "bumpenv_mat%u", i); + entry->ps.bumpenv_mat_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); + sprintf(name, "bumpenv_lum_scale%u", i); + entry->ps.bumpenv_lum_scale_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); + sprintf(name, "bumpenv_lum_offset%u", i); + entry->ps.bumpenv_lum_offset_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); } if (ps_compile_args.np2_fixup)

1 0

Henri Verbeet : wined3d: Introduce a separate structure for the ps specific fields in struct glsl_shader_prog_link .
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 9b118257c414709163e4094abc2d21424eec52d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b118257c414709163e4094ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:26 2012 +0100 wined3d: Introduce a separate structure for the ps specific fields in struct glsl_shader_prog_link. --- dlls/wined3d/glsl_shader.c | 116 ++++++++++++++++++++++++-------------------- 1 files changed, 63 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b118257c414709163e40…

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
29
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 November 2012