September 2009 - Wine-commits

Alexandre Julliard : kernel32: Moved ToolHelpHook16 to kernel16.c, it' s not a toolhelp function.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 2c491feb4b7a766a5317048cd328505e71cddf00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c491feb4b7a766a5317048cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:57:56 2009 +0200 kernel32: Moved ToolHelpHook16 to kernel16.c, it's not a toolhelp function. --- dlls/kernel32/kernel16.c | 11 +++++++++++ dlls/kernel32/toolhelp16.c | 18 ------------------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index 094156d..c004a3d 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -106,6 +106,17 @@ LONG WINAPI KERNEL_nop(void) return 0; } +/*********************************************************************** + * ToolHelpHook (KERNEL.341) + * see "Undocumented Windows" + */ +FARPROC16 WINAPI ToolHelpHook16(FARPROC16 func) +{ + static FARPROC16 hook; + + FIXME("(%p), stub.\n", func); + return InterlockedExchangePointer( (void **)&hook, func ); +} /* thunk for 16-bit CreateThread */ struct thread_args diff --git a/dlls/kernel32/toolhelp16.c b/dlls/kernel32/toolhelp16.c index a98971a..4d67b73 100644 --- a/dlls/kernel32/toolhelp16.c +++ b/dlls/kernel32/toolhelp16.c @@ -52,8 +52,6 @@ static struct notify static int nrofnotifys = 0; -static FARPROC16 HookNotify = NULL; - /*********************************************************************** * TaskFindHandle (TOOLHELP.65) @@ -226,19 +224,3 @@ BOOL16 WINAPI SystemHeapInfo16( SYSHEAPINFO *pHeapInfo ) FreeLibrary16( gdi ); return TRUE; } - - -/*********************************************************************** - * ToolHelpHook (KERNEL.341) - * see "Undocumented Windows" - */ -FARPROC16 WINAPI ToolHelpHook16(FARPROC16 lpfnNotifyHandler) -{ - FARPROC16 tmp; - - FIXME("(%p), stub.\n", lpfnNotifyHandler); - tmp = HookNotify; - HookNotify = lpfnNotifyHandler; - /* just return previously installed notification function */ - return tmp; -}

1 0

Alexandre Julliard : kernel32: Moved GetThreadSelectorEntry to thread.c.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: b088cc578146d393423f24193e8ac2545f47cb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b088cc578146d393423f24193… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:58:45 2009 +0200 kernel32: Moved GetThreadSelectorEntry to thread.c. --- dlls/kernel32/selector.c | 28 ++-------------------------- dlls/kernel32/thread.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c index 4a642c0..d505982 100644 --- a/dlls/kernel32/selector.c +++ b/dlls/kernel32/selector.c @@ -559,38 +559,14 @@ LPVOID WINAPI MapSLFix( SEGPTR sptr ) return MapSL(sptr); } +#ifdef __i386__ + /*********************************************************************** * UnMapSLFixArray (KERNEL32.@) * * Must not change EAX, hence defined as asm function. */ -#ifdef __i386__ __ASM_STDCALL_FUNC( UnMapSLFixArray, 8, "ret $8" ) -#endif - - -/*********************************************************************** - * GetThreadSelectorEntry (KERNEL32.@) - */ -BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldtent ) -{ - THREAD_DESCRIPTOR_INFORMATION tdi; - NTSTATUS status; - - tdi.Selector = sel; - status = NtQueryInformationThread( hthread, ThreadDescriptorTableEntry, - &tdi, sizeof(tdi), NULL); - if (status) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - *ldtent = tdi.Entry; - return TRUE; -} - - -#ifdef __i386__ /*********************************************************************** * SMapLS (KERNEL32.@) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 0029e11..3115a60 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -422,6 +422,26 @@ DWORD WINAPI SetThreadIdealProcessor( } +/*********************************************************************** + * GetThreadSelectorEntry (KERNEL32.@) + */ +BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldtent ) +{ + THREAD_DESCRIPTOR_INFORMATION tdi; + NTSTATUS status; + + tdi.Selector = sel; + status = NtQueryInformationThread( hthread, ThreadDescriptorTableEntry, &tdi, sizeof(tdi), NULL); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + *ldtent = tdi.Entry; + return TRUE; +} + + /* callback for QueueUserAPC */ static void CALLBACK call_user_apc( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3 ) {

1 0

Alexandre Julliard : kernel32: Moved private function prototypes out of toolhelp.h.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 72b0389bc66b6bd467179a9e9365a3ff7f7676a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b0389bc66b6bd467179a9e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:59:09 2009 +0200 kernel32: Moved private function prototypes out of toolhelp.h. --- dlls/kernel32/dosmem.c | 2 +- dlls/kernel32/kernel16.c | 1 - dlls/kernel32/kernel16_private.h | 7 +++++++ dlls/kernel32/kernel_main.c | 1 - dlls/kernel32/ne_segment.c | 1 - dlls/kernel32/snoop16.c | 1 - dlls/kernel32/toolhelp.h | 7 ------- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/dosmem.c b/dlls/kernel32/dosmem.c index d8ea03b..178ed07 100644 --- a/dlls/kernel32/dosmem.c +++ b/dlls/kernel32/dosmem.c @@ -38,7 +38,7 @@ #include "wine/winbase16.h" #include "kernel_private.h" -#include "toolhelp.h" +#include "kernel16_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dosmem); diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index c004a3d..c5683db 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -26,7 +26,6 @@ #include "winternl.h" #include "wownt32.h" -#include "toolhelp.h" #include "kernel_private.h" #include "kernel16_private.h" #include "wine/debug.h" diff --git a/dlls/kernel32/kernel16_private.h b/dlls/kernel32/kernel16_private.h index 0c59bbd..aada5b2 100644 --- a/dlls/kernel32/kernel16_private.h +++ b/dlls/kernel32/kernel16_private.h @@ -188,6 +188,13 @@ static inline void stack16_pop( int size ) NtCurrentTeb()->WOW32Reserved = (char *)NtCurrentTeb()->WOW32Reserved + size; } +/* global16.c */ +extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, void *ptr, DWORD size, + HGLOBAL16 hOwner, unsigned char selflags ); +extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ); +extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size ); +extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags ); + /* ne_module.c */ extern NE_MODULE *NE_GetPtr( HMODULE16 hModule ); extern WORD NE_GetOrdinal( HMODULE16 hModule, const char *name ); diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 2365e7a..d4f0724 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -35,7 +35,6 @@ #include "wine/winbase16.h" #include "wine/library.h" -#include "toolhelp.h" #include "kernel_private.h" #include "kernel16_private.h" #include "console_private.h" diff --git a/dlls/kernel32/ne_segment.c b/dlls/kernel32/ne_segment.c index 0ade4b0..4bc6603 100644 --- a/dlls/kernel32/ne_segment.c +++ b/dlls/kernel32/ne_segment.c @@ -39,7 +39,6 @@ #include "wine/library.h" #include "kernel_private.h" #include "kernel16_private.h" -#include "toolhelp.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(fixup); diff --git a/dlls/kernel32/snoop16.c b/dlls/kernel32/snoop16.c index 8c79269..efa20cd 100644 --- a/dlls/kernel32/snoop16.c +++ b/dlls/kernel32/snoop16.c @@ -33,7 +33,6 @@ #include "wine/library.h" #include "kernel_private.h" #include "kernel16_private.h" -#include "toolhelp.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(snoop); diff --git a/dlls/kernel32/toolhelp.h b/dlls/kernel32/toolhelp.h index 6506aae..da41a88 100644 --- a/dlls/kernel32/toolhelp.h +++ b/dlls/kernel32/toolhelp.h @@ -102,13 +102,6 @@ BOOL16 WINAPI GlobalEntryHandle16( GLOBALENTRY *pGlobal, HGLOBAL16 hItem ); BOOL16 WINAPI GlobalEntryModule16( GLOBALENTRY *pGlobal, HMODULE16 hModule, WORD wSeg ); -/* FIXME: Wine internal functions */ -extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, void *ptr, DWORD size, - HGLOBAL16 hOwner, unsigned char selflags ); -extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ); -extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size ); -extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags ); - /* Local heap */ typedef struct

1 0

Alexandre Julliard : kernel32: Make toolhelp. dll into a stand-alone 16-bit module.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: c1dbeade529f45653f146a5849d9777c602dbda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1dbeade529f45653f146a584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 20:00:15 2009 +0200 kernel32: Make toolhelp.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 + configure.ac | 1 + dlls/Makefile.in | 3 +- dlls/kernel32/Makefile.in | 7 +- dlls/kernel32/global16.c | 97 +--- dlls/kernel32/local16.c | 90 +-- dlls/kernel32/ne_module.c | 53 -- dlls/kernel32/selector.c | 36 - dlls/kernel32/task.c | 83 --- dlls/kernel32/toolhelp16.c | 226 ------ dlls/toolhelp.dll16/Makefile.in | 13 + dlls/toolhelp.dll16/toolhelp.c | 737 ++++++++++++++++++++ .../toolhelp.dll16.spec} | 0 dlls/{kernel32 => toolhelp.dll16}/toolhelp.h | 0 15 files changed, 789 insertions(+), 567 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1dbeade529f45653f146…

1 0

Detlef Riekenberg : winspool: Use the backend for ConfigurePortW.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 6a246a71ebff2525ca387fd35a1f1f68b81fe39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a246a71ebff2525ca387fd35… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Sep 28 12:48:12 2009 +0200 winspool: Use the backend for ConfigurePortW. --- dlls/winspool.drv/info.c | 44 ++------------------------------------------ 1 files changed, 2 insertions(+), 42 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 95908b3..68a1eaf 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6555,57 +6555,17 @@ BOOL WINAPI ConfigurePortA(LPSTR pName, HWND hWnd, LPSTR pPortName) */ BOOL WINAPI ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName) { - monitor_t * pm; - monitor_t * pui; - DWORD res; TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); - if (pName && pName[0]) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if ((backend == NULL) && !load_backend()) return FALSE; if (!pPortName) { SetLastError(RPC_X_NULL_REF_POINTER); return FALSE; } - /* an empty Portname is Invalid, but can popup a Dialog */ - if (!pPortName[0]) { - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; - } - - pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor && pm->monitor->pfnConfigurePort) { - TRACE("Using %s for %s (%p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); - res = pm->monitor->pfnConfigurePort(pName, hWnd, pPortName); - TRACE("got %d with %u\n", res, GetLastError()); - } - else - { - pui = monitor_loadui(pm); - if (pui && pui->monitorUI && pui->monitorUI->pfnConfigurePortUI) { - TRACE("Use %s for %s (%p: %s)\n", debugstr_w(pui->name), debugstr_w(pPortName), pui, debugstr_w(pui->dllname)); - res = pui->monitorUI->pfnConfigurePortUI(pName, hWnd, pPortName); - TRACE("got %d with %u\n", res, GetLastError()); - } - else - { - FIXME("not implemented for %s (%p: %s => %p: %s)\n", debugstr_w(pPortName), - pm, debugstr_w(pm ? pm->dllname : NULL), pui, debugstr_w(pui ? pui->dllname : NULL)); - - /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ - SetLastError(ERROR_NOT_SUPPORTED); - res = FALSE; - } - monitor_unload(pui); - } - monitor_unload(pm); - - TRACE("returning %d with %u\n", res, GetLastError()); - return res; + return backend->fpConfigurePort(pName, hWnd, pPortName); } /******************************************************************************

1 0

Detlef Riekenberg : localspl: Implement fpDeletePort.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: a9c5145972d747a5734f6180f5fe0e8b494891b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c5145972d747a5734f6180f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Sep 28 13:31:18 2009 +0200 localspl: Implement fpDeletePort. --- dlls/localspl/provider.c | 72 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index f3ddb86..51bf2f9 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1648,6 +1648,76 @@ static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMo } /***************************************************************************** + * fpDeletePort [exported through PRINTPROVIDOR] + * + * Delete a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pPortName [I] Name of the Port, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI fpDeletePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) +{ + monitor_t * pm; + monitor_t * pui; + LONG lres; + DWORD res; + + TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); + + lres = copy_servername_from_name(pName, NULL); + if (lres) { + FIXME("server %s not supported\n", debugstr_w(pName)); + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + + /* an empty Portname is Invalid */ + if (!pPortName[0]) { + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; + } + + pm = monitor_load_by_port(pPortName); + if (pm && pm->monitor && pm->monitor->pfnDeletePort) { + TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), + debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); + res = pm->monitor->pfnDeletePort(pName, hWnd, pPortName); + TRACE("got %d with %u\n", res, GetLastError()); + } + else + { + pui = monitor_loadui(pm); + if (pui && pui->monitorUI && pui->monitorUI->pfnDeletePortUI) { + TRACE("use %s for %s (monitorui %p: %s)\n", debugstr_w(pui->name), + debugstr_w(pPortName), pui, debugstr_w(pui->dllname)); + res = pui->monitorUI->pfnDeletePortUI(pName, hWnd, pPortName); + TRACE("got %d with %u\n", res, GetLastError()); + } + else + { + FIXME("not implemented for %s (monitor %p: %s / monitorui %p: %s)\n", + debugstr_w(pPortName), pm, debugstr_w(pm ? pm->dllname : NULL), + pui, debugstr_w(pui ? pui->dllname : NULL)); + + SetLastError(ERROR_NOT_SUPPORTED); + res = FALSE; + } + monitor_unload(pui); + } + monitor_unload(pm); + + TRACE("returning %d with %u\n", res, GetLastError()); + return res; +} + +/***************************************************************************** * fpEnumMonitors [exported through PRINTPROVIDOR] * * Enumerate available Port-Monitors @@ -1948,7 +2018,7 @@ void setup_provider(void) fpEnumPorts, NULL, /* fpAddPort */ fpConfigurePort, - NULL, /* fpDeletePort */ + fpDeletePort, NULL, /* fpCreatePrinterIC */ NULL, /* fpPlayGdiScriptOnPrinterIC */ NULL, /* fpDeletePrinterIC */

1 0

Detlef Riekenberg : winspool: Use the backend for DeletePortW.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 6452e4d2bb7e45b6eb6dc4e36f0d82608aacc655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6452e4d2bb7e45b6eb6dc4e36… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Sep 28 13:32:07 2009 +0200 winspool: Use the backend for DeletePortW. --- dlls/winspool.drv/info.c | 105 +--------------------------------------------- 1 files changed, 2 insertions(+), 103 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 68a1eaf..de7df36 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -987,66 +987,6 @@ static monitor_t * monitor_loadui(monitor_t * pm) return pui; } - -/****************************************************************** - * monitor_load_by_port [internal] - * - * load a printmonitor for a given port - * - * On failure, NULL is returned - */ - -static monitor_t * monitor_load_by_port(LPCWSTR portname) -{ - HKEY hroot; - HKEY hport; - LPWSTR buffer; - monitor_t * pm = NULL; - DWORD registered = 0; - DWORD id = 0; - DWORD len; - - TRACE("(%s)\n", debugstr_w(portname)); - - /* Try the Local Monitor first */ - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_PortsW, &hroot) == ERROR_SUCCESS) { - if (RegQueryValueExW(hroot, portname, NULL, NULL, NULL, &len) == ERROR_SUCCESS) { - /* found the portname */ - RegCloseKey(hroot); - return monitor_load(LocalPortW, NULL); - } - RegCloseKey(hroot); - } - - len = MAX_PATH + lstrlenW(bs_Ports_bsW) + lstrlenW(portname) + 1; - buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (buffer == NULL) return NULL; - - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, MonitorsW, &hroot) == ERROR_SUCCESS) { - EnterCriticalSection(&monitor_handles_cs); - RegQueryInfoKeyW(hroot, NULL, NULL, NULL, &registered, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - - while ((pm == NULL) && (id < registered)) { - buffer[0] = '\0'; - RegEnumKeyW(hroot, id, buffer, MAX_PATH); - TRACE("testing %s\n", debugstr_w(buffer)); - len = lstrlenW(buffer); - lstrcatW(buffer, bs_Ports_bsW); - lstrcatW(buffer, portname); - if (RegOpenKeyW(hroot, buffer, &hport) == ERROR_SUCCESS) { - RegCloseKey(hport); - buffer[len] = '\0'; /* use only the Monitor-Name */ - pm = monitor_load(buffer, NULL); - } - id++; - } - LeaveCriticalSection(&monitor_handles_cs); - RegCloseKey(hroot); - } - HeapFree(GetProcessHeap(), 0, buffer); - return pm; -} - /****************************************************************** * get_servername_from_name (internal) * @@ -2229,57 +2169,16 @@ BOOL WINAPI DeletePortA (LPSTR pName, HWND hWnd, LPSTR pPortName) */ BOOL WINAPI DeletePortW (LPWSTR pName, HWND hWnd, LPWSTR pPortName) { - monitor_t * pm; - monitor_t * pui; - DWORD res; - TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); - if (pName && pName[0]) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if ((backend == NULL) && !load_backend()) return FALSE; if (!pPortName) { SetLastError(RPC_X_NULL_REF_POINTER); return FALSE; } - /* an empty Portname is Invalid */ - if (!pPortName[0]) { - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; - } - - pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor && pm->monitor->pfnDeletePort) { - TRACE("Using %s for %s (%p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); - res = pm->monitor->pfnDeletePort(pName, hWnd, pPortName); - TRACE("got %d with %u\n", res, GetLastError()); - } - else - { - pui = monitor_loadui(pm); - if (pui && pui->monitorUI && pui->monitorUI->pfnDeletePortUI) { - TRACE("use %s for %s (%p: %s)\n", debugstr_w(pui->name), debugstr_w(pPortName), pui, debugstr_w(pui->dllname)); - res = pui->monitorUI->pfnDeletePortUI(pName, hWnd, pPortName); - TRACE("got %d with %u\n", res, GetLastError()); - } - else - { - FIXME("not implemented for %s (%p: %s => %p: %s)\n", debugstr_w(pPortName), - pm, debugstr_w(pm ? pm->dllname : NULL), pui, debugstr_w(pui ? pui->dllname : NULL)); - - /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ - SetLastError(ERROR_NOT_SUPPORTED); - res = FALSE; - } - monitor_unload(pui); - } - monitor_unload(pm); - - TRACE("returning %d with %u\n", res, GetLastError()); - return res; + return backend->fpDeletePort(pName, hWnd, pPortName); } /******************************************************************************

1 0

Stefan Dösinger : wined3d: Don' t use GL_NV_texture_shader on OSX.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 77a83aee793b7441c6842347a5451765c79334be URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a83aee793b7441c6842347a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 28 12:24:00 2009 +0200 wined3d: Don't use GL_NV_texture_shader on OSX. --- dlls/wined3d/directx.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index de9b6fb..eeb28e6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -666,6 +666,12 @@ static BOOL match_allows_spec_alpha(const struct wined3d_gl_info *gl_info, const } } +static BOOL match_apple_nvts(const struct wined3d_gl_info *gl_info, const char *gl_renderer) +{ + if(!match_apple(gl_info, gl_renderer)) return FALSE; + return GL_SUPPORT(NV_TEXTURE_SHADER); +} + static void quirk_arb_constants(struct wined3d_gl_info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->vs_arb_constantsF); @@ -783,6 +789,13 @@ static void quirk_allows_specular_alpha(struct wined3d_gl_info *gl_info) gl_info->quirks |= WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA; } +static void quirk_apple_nvts(struct wined3d_gl_info *gl_info) +{ + gl_info->supported[NV_TEXTURE_SHADER] = FALSE; + gl_info->supported[NV_TEXTURE_SHADER2] = FALSE; + gl_info->supported[NV_TEXTURE_SHADER3] = FALSE; +} + struct driver_quirk { BOOL (*match)(const struct wined3d_gl_info *gl_info, const char *gl_renderer); @@ -847,7 +860,15 @@ static const struct driver_quirk quirk_table[] = match_allows_spec_alpha, quirk_allows_specular_alpha, "Allow specular alpha quirk" - } + }, + { + /* The pixel formats provided by GL_NV_texture_shader are broken on OSX + * (rdar://5682521). + */ + match_apple_nvts, + quirk_apple_nvts, + "Apple NV_texture_shader disable" + }, }; /* Certain applications (Steam) complain if we report an outdated driver version. In general,

1 0

Stefan Dösinger : wined3d: Test if result.clip[] works correctly.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 404aecb8daa1306479559b0cf2882de2268ddc44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404aecb8daa1306479559b0cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 28 12:30:48 2009 +0200 wined3d: Test if result.clip[] works correctly. The Mac Nvidia driver doesn't implement the result.clip part of GL_NV_vertex_program2_option correctly. It complains about a syntax error if "result.clip[0]" is used. "result.clip" compiles correctly, but supports only one clipplane, and running the shader results in severe rendering bugs. --- dlls/wined3d/arb_program_shader.c | 3 +- dlls/wined3d/directx.c | 56 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b541a6a..3fefec9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -52,7 +52,8 @@ static BOOL need_mova_const(IWineD3DBaseShader *shader, const struct wined3d_gl_ /* Returns TRUE if result.clip from GL_NV_vertex_program2 should be used and FALSE otherwise */ static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) { - return GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION); + return GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION) && + !(GLINFO_LOCATION.quirks & WINED3D_QUIRK_NV_CLIP_BROKEN); } static BOOL need_helper_const(const struct wined3d_gl_info *gl_info) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eeb28e6..8eac47c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -672,6 +672,52 @@ static BOOL match_apple_nvts(const struct wined3d_gl_info *gl_info, const char * return GL_SUPPORT(NV_TEXTURE_SHADER); } +/* A GL context is provided by the caller */ +static BOOL match_broken_nv_clip(const struct wined3d_gl_info *gl_info, const char *gl_renderer) +{ + GLuint prog; + BOOL ret = FALSE; + GLint pos; + const char *testcode = + "!!ARBvp1.0\n" + "OPTION NV_vertex_program2;\n" + "MOV result.clip[0], 0.0;\n" + "MOV result.position, 0.0;\n" + "END\n"; + + if(!GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) return FALSE; + + ENTER_GL(); + while(glGetError()); + + GL_EXTCALL(glGenProgramsARB(1, &prog)); + if(!prog) + { + ERR("Failed to create an ARB offset limit test program\n"); + LEAVE_GL(); + return FALSE; + } + GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, prog)); + GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, + strlen(testcode), testcode)); + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + if(pos != -1) + { + WARN("GL_NV_vertex_program2_option result.clip[] test failed\n"); + TRACE("error: %s\n", debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + ret = TRUE; + while(glGetError()); + } + else TRACE("GL_NV_vertex_program2_option result.clip[] test passed\n"); + + GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, 0)); + GL_EXTCALL(glDeleteProgramsARB(1, &prog)); + checkGLcall("GL_NV_vertex_program2_option result.clip[] test cleanup"); + + LEAVE_GL(); + return ret; +} + static void quirk_arb_constants(struct wined3d_gl_info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->vs_arb_constantsF); @@ -796,6 +842,11 @@ static void quirk_apple_nvts(struct wined3d_gl_info *gl_info) gl_info->supported[NV_TEXTURE_SHADER3] = FALSE; } +static void quirk_disable_nvvp_clip(struct wined3d_gl_info *gl_info) +{ + gl_info->quirks |= WINED3D_QUIRK_NV_CLIP_BROKEN; +} + struct driver_quirk { BOOL (*match)(const struct wined3d_gl_info *gl_info, const char *gl_renderer); @@ -869,6 +920,11 @@ static const struct driver_quirk quirk_table[] = quirk_apple_nvts, "Apple NV_texture_shader disable" }, + { + match_broken_nv_clip, + quirk_disable_nvvp_clip, + "Apple NV_vertex_program clip bug quirk" + }, }; /* Certain applications (Steam) complain if we report an outdated driver version. In general, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 24066c9..b431a1b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -48,6 +48,7 @@ #define WINED3D_QUIRK_SET_TEXCOORD_W 0x00000002 #define WINED3D_QUIRK_GLSL_CLIP_VARYING 0x00000004 #define WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA 0x00000008 +#define WINED3D_QUIRK_NV_CLIP_BROKEN 0x00000010 /* Texture format fixups */

1 0

André Hentschel : widl: Add ARM support.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 1d0365da957e0521292319351f919828c9a0b4f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0365da957e0521292319351… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 25 16:10:50 2009 +0200 widl: Add ARM support. --- tools/widl/widl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 60322d3..c1c3832 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -252,7 +252,8 @@ static void set_target( const char *target ) { "x86_64", SYS_WIN64 }, { "sparc", SYS_WIN32 }, { "alpha", SYS_WIN32 }, - { "powerpc", SYS_WIN32 } + { "powerpc", SYS_WIN32 }, + { "arm", SYS_WIN32 } }; unsigned int i;

1 0