wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

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

← Newer
1
...
54
55
56
57
58
59
60
...
71
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