December 2005 - Wine-commits

Alexandre Julliard : Take advantage of the __EXCEPT_PAGE_FAULT macro.
by Alexandre Julliard 17 Dec '05

17 Dec '05

Module: wine Branch: refs/heads/master Commit: ae964ac801b3077f5361559abd6645d21fc35d1f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae964ac801b3077f5361559… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 17:17:57 2005 +0100 Take advantage of the __EXCEPT_PAGE_FAULT macro. --- dlls/crypt32/cert.c | 10 ---- dlls/crypt32/encode.c | 98 ++++++++++++++++++++------------------------ dlls/dbghelp/msc.c | 9 ---- dlls/ddraw/main.c | 10 ---- dlls/kernel/atom.c | 10 ---- dlls/kernel/computername.c | 16 ++----- dlls/kernel/file.c | 9 ---- dlls/kernel/heap.c | 20 ++------- dlls/kernel/ne_module.c | 10 ---- dlls/kernel/resource.c | 13 +----- dlls/kernel/string.c | 24 ++++------- dlls/kernel/virtual.c | 16 ++----- dlls/msvcrt/cpp.c | 14 +----- dlls/ntdll/debugtools.c | 12 +---- dlls/ntdll/loader.c | 10 ---- dlls/ntdll/relay.c | 10 ---- dlls/ntdll/resource.c | 13 +----- dlls/ntdll/sec.c | 12 +---- dlls/ole32/rpc.c | 9 ---- dlls/user/cursoricon.c | 13 ------ dlls/user/lstr.c | 11 +---- dlls/winmm/driver.c | 2 - dlls/winmm/lolvldrv.c | 2 - 23 files changed, 92 insertions(+), 261 deletions(-)

1 0

Huw Davies : x11drv: Get the visual for the GLXPixmap from the current pixel format.
by Alexandre Julliard 17 Dec '05

17 Dec '05

Module: wine Branch: refs/heads/master Commit: 8b7098794d33cec06124a37dcdc33249a33a0b5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b7098794d33cec06124a37… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 16 19:29:52 2005 +0100 x11drv: Get the visual for the GLXPixmap from the current pixel format. --- dlls/x11drv/opengl.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index 3a400c1..c119e7c 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -588,13 +588,17 @@ XID create_glxpixmap(X11DRV_PDEVICE *phy XVisualInfo *vis; XVisualInfo template; int num; + GLXFBConfig *cfgs; wine_tsx11_lock(); - template.visualid = XVisualIDFromVisual(visual); + cfgs = pglXGetFBConfigs(gdi_display, DefaultScreen(gdi_display), &num); + pglXGetFBConfigAttrib(gdi_display, cfgs[physDev->current_pf - 1], GLX_VISUAL_ID, (int *)&template.visualid); + vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num); ret = pglXCreateGLXPixmap(gdi_display, vis, physDev->bitmap->pixmap); XFree(vis); + XFree(cfgs); wine_tsx11_unlock(); TRACE("return %lx\n", ret); return ret;

1 0

Alexandre Julliard : ntdll: More compatible exception information for protection faults.
by Alexandre Julliard 17 Dec '05

17 Dec '05

Module: wine Branch: refs/heads/master Commit: 07f84d0458c07ffd455863cdd0c59abfccbdd98d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07f84d0458c07ffd455863c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 16:27:39 2005 +0100 ntdll: More compatible exception information for protection faults. Added a bunch of test cases. --- dlls/ntdll/signal_i386.c | 80 +++++++++++++++ dlls/ntdll/tests/.gitignore | 1 dlls/ntdll/tests/Makefile.in | 1 dlls/ntdll/tests/exception.c | 223 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 302 insertions(+), 3 deletions(-) create mode 100644 dlls/ntdll/tests/exception.c

1 0

Alexandre Julliard : We no longer need to handle EXCEPTION_PRIV_INSTRUCTION on page faults.
by Alexandre Julliard 17 Dec '05

17 Dec '05

Module: wine Branch: refs/heads/master Commit: db7920bb44652245b82aba0c805aaa90eabf66f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db7920bb44652245b82aba0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 16:37:12 2005 +0100 We no longer need to handle EXCEPTION_PRIV_INSTRUCTION on page faults. --- dlls/kernel/heap.c | 3 --- dlls/kernel/ne_module.c | 3 +-- dlls/kernel/resource.c | 3 +-- dlls/ntdll/resource.c | 3 +-- dlls/ole32/rpc.c | 3 +-- dlls/user/lstr.c | 3 +-- 6 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index b30e457..9bb2807 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -72,13 +72,10 @@ static HANDLE systemHeap; /* globally /* filter for page-fault exceptions */ -/* It is possible for a bogus global pointer to cause a */ -/* page zero reference, so I include EXCEPTION_PRIV_INSTRUCTION too. */ static WINE_EXCEPTION_FILTER(page_fault) { switch (GetExceptionCode()) { case (EXCEPTION_ACCESS_VIOLATION): - case (EXCEPTION_PRIV_INSTRUCTION): return EXCEPTION_EXECUTE_HANDLER; default: return EXCEPTION_CONTINUE_SEARCH; diff --git a/dlls/kernel/ne_module.c b/dlls/kernel/ne_module.c index 4770587..c3572ae 100644 --- a/dlls/kernel/ne_module.c +++ b/dlls/kernel/ne_module.c @@ -92,8 +92,7 @@ static HMODULE16 NE_GetModuleByFilename( static WINE_EXCEPTION_FILTER(page_fault) { - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || - GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION) + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_CONTINUE_SEARCH; } diff --git a/dlls/kernel/resource.c b/dlls/kernel/resource.c index 7b91a2a..8964855 100644 --- a/dlls/kernel/resource.c +++ b/dlls/kernel/resource.c @@ -50,8 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource); static WINE_EXCEPTION_FILTER(page_fault) { - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || - GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION) + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_CONTINUE_SEARCH; } diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 8694917..7426128 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -53,8 +53,7 @@ static LANGID user_ui_language, system_u static WINE_EXCEPTION_FILTER(page_fault) { - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || - GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION) + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_CONTINUE_SEARCH; } diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index d87b478..c57bab5 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -112,8 +112,7 @@ struct dispatch_params static WINE_EXCEPTION_FILTER(ole_filter) { - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || - GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION) + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_EXECUTE_HANDLER; } diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c index 9a34738..bc9ad46 100644 --- a/dlls/user/lstr.c +++ b/dlls/user/lstr.c @@ -45,8 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource); /* filter for page-fault exceptions */ static WINE_EXCEPTION_FILTER(page_fault) { - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || - GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION) + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_CONTINUE_SEARCH; }

1 0

Alexandre Julliard : Exception handling: Added a magic __EXCEPT_PAGE_FAULT macro to make it
by Alexandre Julliard 17 Dec '05

17 Dec '05

Module: wine Branch: refs/heads/master Commit: 324d86a3af69598631d2d6a6c27612f41991d8a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=324d86a3af69598631d2d6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 16:58:47 2005 +0100 Exception handling: Added a magic __EXCEPT_PAGE_FAULT macro to make it easier to handle the common case of trapping page faults. --- dlls/ntdll/exception.c | 8 +++++++- include/wine/exception.h | 4 ++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 47ed835..972ba0a 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -546,7 +546,13 @@ DWORD __wine_exception_handler( EXCEPTIO if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) return ExceptionContinueSearch; - if (wine_frame->u.filter) + + if (wine_frame->u.filter == (void *)1) /* special hack for page faults */ + { + if (record->ExceptionCode != EXCEPTION_ACCESS_VIOLATION) + return ExceptionContinueSearch; + } + else if (wine_frame->u.filter) { EXCEPTION_POINTERS ptrs; ptrs.ExceptionRecord = record; diff --git a/include/wine/exception.h b/include/wine/exception.h index cc03fdb..9586503 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -71,6 +71,7 @@ #define __EXCEPT(func) __except((func)(GetExceptionInformation())) #define __FINALLY(func) __finally { (func)(!AbnormalTermination()); } #define __ENDTRY /*nothing*/ +#define __EXCEPT_PAGE_FAULT __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) #else /* USE_COMPILER_EXCEPTIONS */ @@ -122,6 +123,9 @@ typedef DWORD (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); +/* convenience handler for page fault exceptions */ +#define __EXCEPT_PAGE_FAULT __EXCEPT( (__WINE_FILTER)1 ) + #define WINE_EXCEPTION_FILTER(func) DWORD WINAPI func( EXCEPTION_POINTERS *__eptr ) #define WINE_FINALLY_FUNC(func) void WINAPI func( BOOL __normal )

1 0

Oliver Stieber : wined3d: Vertex declaration cleanup.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: a57790f46a2b7c9e19b189016ee17df1cbd312ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a57790f46a2b7c9e19b1890… Author: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Date: Fri Dec 16 12:49:38 2005 +0100 wined3d: Vertex declaration cleanup. Clean up constants and the wine declaration when the vertex declaration is destroyed. --- dlls/wined3d/vertexdeclaration.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 74dce97..0f6cf9b 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -418,9 +418,11 @@ ULONG WINAPI IWineD3DVertexDeclarationIm TRACE("(%p) : Releasing from %ld\n", This, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This->pDeclaration8); - HeapFree(GetProcessHeap(), 0, This->pDeclaration9); - HeapFree(GetProcessHeap(), 0, This); + HeapFree(GetProcessHeap(), 0, This->pDeclaration8); + HeapFree(GetProcessHeap(), 0, This->pDeclaration9); + HeapFree(GetProcessHeap(), 0, This->pDeclarationWine); + HeapFree(GetProcessHeap(), 0, This->constants); + HeapFree(GetProcessHeap(), 0, This); } return ref; }

1 0

Oliver Stieber : wined3d: Allow NULL multi sample quality.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: 8ff9a7eb55d1798c5797c646b6d6d41c8a12261b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ff9a7eb55d1798c5797c64… Author: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Date: Fri Dec 16 12:49:22 2005 +0100 wined3d: Allow NULL multi sample quality. Allow MultiSampleQuality to be passed as NULL, this is a requirement for DirectX 8 and lower. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ba2bb8d..ee51e1b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1377,7 +1377,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create object->presentParms.BackBufferFormat = *(pPresentationParameters->BackBufferFormat); object->presentParms.BackBufferCount = *(pPresentationParameters->BackBufferCount); object->presentParms.MultiSampleType = *(pPresentationParameters->MultiSampleType); - object->presentParms.MultiSampleQuality = *(pPresentationParameters->MultiSampleQuality); + object->presentParms.MultiSampleQuality = NULL == pPresentationParameters->MultiSampleQuality ? 0 : *(pPresentationParameters->MultiSampleQuality); object->presentParms.SwapEffect = *(pPresentationParameters->SwapEffect); object->presentParms.hDeviceWindow = *(pPresentationParameters->hDeviceWindow); object->presentParms.Windowed = *(pPresentationParameters->Windowed);

1 0

Alexandre Julliard : Add -register hint in ntdll, kernel and msvcrt spec files.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: 15430f6edaba9c31c2c799c9f181ea4bc7008a9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15430f6edaba9c31c2c799c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 12:44:58 2005 +0100 Add -register hint in ntdll, kernel and msvcrt spec files. --- dlls/kernel/kernel32.spec | 130 +++++++++++++++++++++++---------------------- dlls/msvcrt/msvcrt.spec | 12 ++-- dlls/ntdll/ntdll.spec | 8 +-- 3 files changed, 75 insertions(+), 75 deletions(-)

1 0

Alexandre Julliard : winebuild: Allow -register flag for Win32 too.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: db4c1561f2d707e68cc43702ab733d0a196f00e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db4c1561f2d707e68cc4370… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 12:44:16 2005 +0100 winebuild: Allow -register flag for Win32 too. This way it can be used as hint for the relay code. --- tools/winebuild/parser.c | 6 ------ tools/winebuild/winebuild.man.in | 2 +- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 00f1f4d..0e24a53 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -518,12 +518,6 @@ static int parse_spec_ordinal( int ordin odp->ordinal = ordinal; } - if (spec->type == SPEC_WIN32 && odp->flags & FLAG_REGISTER) - { - error( "-register flag not supported for Win32 entry points\n" ); - goto error; - } - if (odp->type == TYPE_STDCALL && !(odp->flags & FLAG_PRIVATE)) { if (!strcmp( odp->name, "DllRegisterServer" ) || diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index a682a10..6c9bafc 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -260,7 +260,7 @@ The function returns a 64-bit value (Win The entry point is only available on i386 platforms. .TP .B -register -The function uses CPU register to pass arguments (Win16 only). +The function uses CPU register to pass arguments. .TP .B -private The function cannot be imported from other dlls, it can only be

1 0

Juan Lang : crypt32: Implement CRLDistPoints encoding/decoding.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: 628ede4783a9e474608773fc1598ce20f359724a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=628ede4783a9e474608773f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Dec 16 12:41:28 2005 +0100 crypt32: Implement CRLDistPoints encoding/decoding. - rewrite sequence decoding to support context-specific tags, and eliminate duplicated code - implement encoding and decoding of CRLDistPoints --- dlls/crypt32/encode.c | 788 ++++++++++++++++++++++++++++--------------- dlls/crypt32/tests/encode.c | 228 ++++++++++++ 2 files changed, 732 insertions(+), 284 deletions(-)

1 0