September 2009 - Wine-Commits

Alexandre Julliard : kernel32: Make system. drv into a stand-alone 16-bit module.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 55b5e3a727a6a7d108fbbc3ebefe22ec84d70f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b5e3a727a6a7d108fbbc3eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:56:10 2009 +0200 kernel32: Make system.drv into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 3 +-- dlls/kernel32/Makefile.in | 2 -- dlls/system.drv16/Makefile.in | 13 +++++++++++++ dlls/{kernel32 => system.drv16}/system.c | 8 +++++++- .../system.drv16.spec} | 0 8 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f439b35..45362c3 100644 --- a/.gitignore +++ b/.gitignore @@ -119,7 +119,6 @@ dlls/setupx.dll16 dlls/shdocvw/shdocvw_v1.tlb dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/std_ole_v1.tlb -dlls/system.drv16 dlls/toolhelp.dll16 dlls/user.exe16 dlls/ver.dll16 diff --git a/configure b/configure index 2c8e4e5..b2cbd87 100755 --- a/configure +++ b/configure @@ -16658,6 +16658,14 @@ dlls/sxs/Makefile: dlls/sxs/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/sxs/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/system.drv16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + system.drv16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/system.drv16/Makefile: dlls/system.drv16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/system.drv16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/t2embed/Makefile" test "x$enable_t2embed" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ t2embed" @@ -19045,6 +19053,7 @@ do "dlls/strmiids/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/strmiids/Makefile" ;; "dlls/svrapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/svrapi/Makefile" ;; "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;; + "dlls/system.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/system.drv16/Makefile" ;; "dlls/t2embed/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/t2embed/Makefile" ;; "dlls/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/Makefile" ;; "dlls/traffic/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/traffic/Makefile" ;; diff --git a/configure.ac b/configure.ac index b773573..5fb8e9b 100644 --- a/configure.ac +++ b/configure.ac @@ -2443,6 +2443,7 @@ WINE_CONFIG_MAKEFILE([dlls/stress.dll16/Makefile],[dlls/Makedll.rules],[dlls],[A WINE_CONFIG_MAKEFILE([dlls/strmiids/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/system.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/t2embed/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/traffic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index de007a7..78be337 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -23,7 +23,6 @@ WIN16_FILES = \ krnl386.exe16 \ mmsystem.dll16 \ setupx.dll16 \ - system.drv16 \ toolhelp.dll16 \ user.exe16 \ ver.dll16 \ @@ -45,7 +44,7 @@ commdlg.dll16: gdi.exe16: echo "gdi32.dll" >$@ -krnl386.exe16 system.drv16 toolhelp.dll16: +krnl386.exe16 toolhelp.dll16: echo "kernel32.dll" >$@ setupx.dll16: diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 299f324..a64b699 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -11,7 +11,6 @@ EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 SPEC_SRCS16 = \ krnl386.exe.spec \ - system.drv.spec \ toolhelp.spec C_SRCS = \ @@ -55,7 +54,6 @@ C_SRCS = \ string.c \ sync.c \ syslevel.c \ - system.c \ tape.c \ task.c \ thread.c \ diff --git a/dlls/system.drv16/Makefile.in b/dlls/system.drv16/Makefile.in new file mode 100644 index 0000000..2fa90cf --- /dev/null +++ b/dlls/system.drv16/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = system.drv16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16 + +C_SRCS = system.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/kernel32/system.c b/dlls/system.drv16/system.c similarity index 96% rename from dlls/kernel32/system.c rename to dlls/system.drv16/system.c index 9395d83..46ab04e 100644 --- a/dlls/kernel32/system.c +++ b/dlls/system.drv16/system.c @@ -122,6 +122,7 @@ static void SYSTEM_StopTicks(void) DWORD WINAPI InquireSystem16( WORD code, WORD arg ) { WORD drivetype; + WCHAR root[3]; switch(code) { @@ -129,7 +130,12 @@ DWORD WINAPI InquireSystem16( WORD code, WORD arg ) return SYS_TIMER_RATE; case 1: /* Get drive type */ - drivetype = GetDriveType16( arg ); + root[0] = 'A' + arg; + root[1] = ':'; + root[2] = 0; + drivetype = GetDriveTypeW( root ); + if (drivetype == DRIVE_CDROM) drivetype = DRIVE_REMOTE; + else if (drivetype == DRIVE_NO_ROOT_DIR) drivetype = DRIVE_UNKNOWN; return MAKELONG( drivetype, drivetype ); case 2: /* Enable one-drive logic */ diff --git a/dlls/kernel32/system.drv.spec b/dlls/system.drv16/system.drv16.spec similarity index 100% rename from dlls/kernel32/system.drv.spec rename to dlls/system.drv16/system.drv16.spec

1 0

Alexandre Julliard : kernel32: Allocate the global arena array only once and store a pointer to it in THHOOK .
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 2e1b87d547797fec6e0b9371e60cb43f272370aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1b87d547797fec6e0b9371e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:56:44 2009 +0200 kernel32: Allocate the global arena array only once and store a pointer to it in THHOOK. --- dlls/kernel32/global16.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/global16.c b/dlls/kernel32/global16.c index 6d70767..42d4816 100644 --- a/dlls/kernel32/global16.c +++ b/dlls/kernel32/global16.c @@ -71,6 +71,7 @@ static GLOBALARENA *pGlobalArena; static int globalArenaSize; #define GLOBAL_MAX_ALLOC_SIZE 0x00ff0000 /* Largest allocation is 16M - 64K */ +#define GLOBAL_MAX_COUNT 8192 /* Max number of allocated blocks */ #define VALID_HANDLE(handle) (((handle)>>__AHSHIFT)<globalArenaSize) #define GET_ARENA_PTR(handle) (pGlobalArena + ((handle) >> __AHSHIFT)) @@ -113,15 +114,16 @@ static GLOBALARENA *GLOBAL_GetArena( WORD sel, WORD selcount ) if (((sel >> __AHSHIFT) + selcount) > globalArenaSize) { int newsize = ((sel >> __AHSHIFT) + selcount + 0xff) & ~0xff; - GLOBALARENA *pNewArena; - if (pGlobalArena) - pNewArena = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - pGlobalArena, newsize * sizeof(GLOBALARENA) ); - else - pNewArena = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, newsize * sizeof(GLOBALARENA) ); - if (!pNewArena) return 0; - pGlobalArena = pNewArena; + if (!pGlobalArena) + { + pGlobalArena = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + GLOBAL_MAX_COUNT * sizeof(GLOBALARENA) ); + if (!pGlobalArena) return 0; + /* Hack: store a pointer to it in THHOOK instead of a handle */ + *(GLOBALARENA **)&pThhook->hGlobalHeap = pGlobalArena; + } + if (newsize > GLOBAL_MAX_COUNT) return 0; globalArenaSize = newsize; } return pGlobalArena + (sel >> __AHSHIFT);

1 0

Alexandre Julliard : kernel32: Moved MemManInfo16 to toolhelp16.c.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 9bf4de22f466fd2c672365de2b42b371145af252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf4de22f466fd2c672365de2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:57:28 2009 +0200 kernel32: Moved MemManInfo16 to toolhelp16.c. --- dlls/kernel32/global16.c | 32 +++----------------------------- dlls/kernel32/toolhelp16.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/global16.c b/dlls/kernel32/global16.c index 42d4816..e572c3d 100644 --- a/dlls/kernel32/global16.c +++ b/dlls/kernel32/global16.c @@ -1063,39 +1063,13 @@ BOOL16 WINAPI GlobalEntryModule16( GLOBALENTRY *pGlobal, HMODULE16 hModule, /*********************************************************************** - * MemManInfo (TOOLHELP.72) - */ -BOOL16 WINAPI MemManInfo16( MEMMANINFO *info ) -{ - MEMORYSTATUS status; - - /* - * Not unsurprisingly although the documentation says you - * _must_ provide the size in the dwSize field, this function - * (under Windows) always fills the structure and returns true. - */ - GlobalMemoryStatus( &status ); - info->wPageSize = getpagesize(); - info->dwLargestFreeBlock = status.dwAvailVirtual; - info->dwMaxPagesAvailable = info->dwLargestFreeBlock / info->wPageSize; - info->dwMaxPagesLockable = info->dwMaxPagesAvailable; - info->dwTotalLinearSpace = status.dwTotalVirtual / info->wPageSize; - info->dwTotalUnlockedPages = info->dwTotalLinearSpace; - info->dwFreePages = info->dwMaxPagesAvailable; - info->dwTotalPages = info->dwTotalLinearSpace; - info->dwFreeLinearSpace = info->dwMaxPagesAvailable; - info->dwSwapFilePages = status.dwTotalPageFile / info->wPageSize; - return TRUE; -} - -/*********************************************************************** * GetFreeMemInfo (KERNEL.316) */ DWORD WINAPI GetFreeMemInfo16(void) { - MEMMANINFO info; - MemManInfo16( &info ); - return MAKELONG( info.dwTotalLinearSpace, info.dwMaxPagesAvailable ); + MEMORYSTATUS status; + GlobalMemoryStatus( &status ); + return MAKELONG( status.dwTotalVirtual/getpagesize(), status.dwAvailVirtual/getpagesize() ); } /*********************************************************************** diff --git a/dlls/kernel32/toolhelp16.c b/dlls/kernel32/toolhelp16.c index c6931d2..a98971a 100644 --- a/dlls/kernel32/toolhelp16.c +++ b/dlls/kernel32/toolhelp16.c @@ -64,6 +64,31 @@ BOOL16 WINAPI TaskFindHandle16( TASKENTRY *lpte, HTASK16 hTask ) return TaskNext16( lpte ); } +/*********************************************************************** + * MemManInfo (TOOLHELP.72) + */ +BOOL16 WINAPI MemManInfo16( MEMMANINFO *info ) +{ + MEMORYSTATUS status; + + /* + * Not unsurprisingly although the documentation says you + * _must_ provide the size in the dwSize field, this function + * (under Windows) always fills the structure and returns true. + */ + GlobalMemoryStatus( &status ); + info->wPageSize = getpagesize(); + info->dwLargestFreeBlock = status.dwAvailVirtual; + info->dwMaxPagesAvailable = info->dwLargestFreeBlock / info->wPageSize; + info->dwMaxPagesLockable = info->dwMaxPagesAvailable; + info->dwTotalLinearSpace = status.dwTotalVirtual / info->wPageSize; + info->dwTotalUnlockedPages = info->dwTotalLinearSpace; + info->dwFreePages = info->dwMaxPagesAvailable; + info->dwTotalPages = info->dwTotalLinearSpace; + info->dwFreeLinearSpace = info->dwMaxPagesAvailable; + info->dwSwapFilePages = status.dwTotalPageFile / info->wPageSize; + return TRUE; +} /*********************************************************************** * NotifyRegister (TOOLHELP.73)

1 0

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

Sept. 29, 2009

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

Detlef Riekenberg : winspool: Use the backend for ConfigurePortW.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

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

Stefan Dösinger : wined3d: Don' t use GL_NV_texture_shader on OSX.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

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

Detlef Riekenberg : winspool: Use the backend for DeletePortW.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

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

Detlef Riekenberg : localspl: Implement fpDeletePort.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

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

Stefan Dösinger : wined3d: Test if result.clip[] works correctly.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

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

Ge van Geldorp : shell32/tests: Fix shellpath test on Win7.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: f4878f08598a519a8d01371c593506aa48a5789e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4878f08598a519a8d01371c5… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 28 12:41:50 2009 +0200 shell32/tests: Fix shellpath test on Win7. --- dlls/shell32/tests/shellpath.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index b5b1967..f9f59e1 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -43,6 +43,9 @@ #endif /* from pidl.h, not included here: */ +#ifndef PT_CPL /* Guess, Win7 uses this for CSIDL_CONTROLS */ +#define PT_CPL 0x01 /* no path */ +#endif #ifndef PT_GUID #define PT_GUID 0x1f /* no path */ #endif @@ -93,7 +96,7 @@ static UINT (WINAPI *pGetSystemWow64DirectoryA)(LPSTR,UINT); static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; static const BYTE guidType[] = { PT_GUID }; -static const BYTE controlPanelType[] = { PT_SHELLEXT, PT_GUID }; +static const BYTE controlPanelType[] = { PT_SHELLEXT, PT_GUID, PT_CPL }; static const BYTE folderType[] = { PT_FOLDER, PT_FOLDERW }; static const BYTE favoritesType[] = { PT_FOLDER, PT_FOLDERW, 0, PT_IESPECIAL2 /* Win98 */ }; static const BYTE folderOrSpecialType[] = { PT_FOLDER, PT_IESPECIAL2 };

1 0