wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Alexandre Julliard : gdiplus/tests: Don't free GDI objects with GlobalFree.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: f6f2f9346eb2dc1b5ce076572664f008559e31a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f2f9346eb2dc1b5ce076572… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 6 16:45:05 2009 +0200 gdiplus/tests: Don't free GDI objects with GlobalFree. --- dlls/gdiplus/tests/image.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 4c836cd..4443f88 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -480,7 +480,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) expectf(HEIGHT1, height); if (stat == Ok) GdipDisposeImage((GpImage*)gpbm); - GlobalFree(hbm); + DeleteObject(hbm); hbm = CreateBitmap(WIDTH2, HEIGHT2, 1, 1, &buff); stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); @@ -493,7 +493,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) expectf(HEIGHT2, height); if (stat == Ok) GdipDisposeImage((GpImage*)gpbm); - GlobalFree(hbm); + DeleteObject(hbm); hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -530,8 +530,8 @@ static void test_GdipCreateBitmapFromHBITMAP(void) if (stat == Ok) GdipDisposeImage((GpImage*)gpbm); - GlobalFree(hpal); - GlobalFree(hbm); + DeleteObject(hpal); + DeleteObject(hbm); } static void test_GdipGetImageFlags(void)

1 0

Austin English : wbemprox: Add stub dll.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: e10f24e8391c978055cefb1b5c04eec274819d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10f24e8391c978055cefb1b5… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 6 07:51:21 2009 -0500 wbemprox: Add stub dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/wbemprox/Makefile.in | 13 +++++++++++++ dlls/wbemprox/main.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox.spec | 4 ++++ 5 files changed, 69 insertions(+), 0 deletions(-) diff --git a/configure b/configure index e6459d6..98593e3 100755 --- a/configure +++ b/configure @@ -27318,6 +27318,14 @@ dlls/w32sys.dll16/Makefile: dlls/w32sys.dll16/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/w32sys.dll16/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/wbemprox/Makefile" +test "x$enable_wbemprox" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wbemprox" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/wbemprox/Makefile: dlls/wbemprox/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/wbemprox/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/win32s16.dll16/Makefile" test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ win32s16.dll16" @@ -29326,6 +29334,7 @@ do "dlls/vwin32.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vwin32.vxd/Makefile" ;; "dlls/w32skrnl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/w32skrnl/Makefile" ;; "dlls/w32sys.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/w32sys.dll16/Makefile" ;; + "dlls/wbemprox/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wbemprox/Makefile" ;; "dlls/win32s16.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win32s16.dll16/Makefile" ;; "dlls/win87em.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win87em.dll16/Makefile" ;; "dlls/winaspi.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winaspi.dll16/Makefile" ;; diff --git a/configure.ac b/configure.ac index 7ab7077..4ab3f6a 100644 --- a/configure.ac +++ b/configure.ac @@ -2260,6 +2260,7 @@ WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/w32sys.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) +WINE_CONFIG_MAKEFILE([dlls/wbemprox/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/win32s16.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/win87em.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/winaspi.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in new file mode 100644 index 0000000..58aad37 --- /dev/null +++ b/dlls/wbemprox/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wbemprox.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c new file mode 100644 index 0000000..89812b2 --- /dev/null +++ b/dlls/wbemprox/main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2009 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/wbemprox/wbemprox.spec b/dlls/wbemprox/wbemprox.spec new file mode 100644 index 0000000..c5fc87a --- /dev/null +++ b/dlls/wbemprox/wbemprox.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Hans Leidekker : wininet: Don't send any data after being redirected.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 6bb143af3343bf4ab8f1a0d68664c65307bb9b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb143af3343bf4ab8f1a0d68… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 6 15:57:56 2009 +0200 wininet: Don't send any data after being redirected. --- dlls/wininet/http.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d3918a3..9c75862 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3271,7 +3271,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, DWORD dwContentLength, BOOL bEndRequest) { INT cnt; - BOOL bSuccess = FALSE; + BOOL bSuccess = FALSE, redirected = FALSE; LPWSTR requestString = NULL; INT responseLen; BOOL loop_next; @@ -3373,7 +3373,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, goto lend; /* send the request as ASCII, tack on the optional data */ - if( !lpOptional ) + if (!lpOptional || redirected) dwOptionalLength = 0; len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, NULL, 0, NULL, NULL ); @@ -3467,6 +3467,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, } HeapFree( GetProcessHeap(), 0, new_url ); } + redirected = TRUE; } } if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTH) && bSuccess)

1 0

Hans Leidekker : msi: Reject NULL or empty patch package parameter in MsiApplyPatch.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 0d8a826ef54f831fcbacd9204587d2e50a37732b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8a826ef54f831fcbacd9204… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 6 15:57:22 2009 +0200 msi: Reject NULL or empty patch package parameter in MsiApplyPatch. --- dlls/msi/msi.c | 3 +++ dlls/msi/tests/package.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 58a1856..ed8b4ab 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -315,6 +315,9 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS static const WCHAR patcheq[] = {'P','A','T','C','H','=',0}; static WCHAR empty[] = {0}; + if (!szPatchPackage || !szPatchPackage[0]) + return ERROR_INVALID_PARAMETER; + if (!szProductCode) { r = MsiOpenDatabaseW(szPatchPackage, MSIDBOPEN_READONLY, &patch); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a7e5261..308a9cc 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -11604,6 +11604,17 @@ static void test_MsiApplyMultiplePatches(void) todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); } +static void test_MsiApplyPatch(void) +{ + UINT r; + + r = MsiApplyPatch(NULL, NULL, INSTALLTYPE_DEFAULT, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); + + r = MsiApplyPatch("", NULL, INSTALLTYPE_DEFAULT, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); +} + START_TEST(package) { HMODULE hmsi = GetModuleHandleA("msi.dll"); @@ -11642,4 +11653,5 @@ START_TEST(package) test_MsiGetProductProperty(); test_MsiSetProperty(); test_MsiApplyMultiplePatches(); + test_MsiApplyPatch(); }

1 0

Austin English : winex11.drv: Remove an outdated comment.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 2b03dd373d8e8bcd20989a9c9bac271d44b7bd1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b03dd373d8e8bcd20989a9c9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 6 07:12:46 2009 -0500 winex11.drv: Remove an outdated comment. --- dlls/winex11.drv/xrender.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index f4b68ff..f8f3ba9 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -639,8 +639,7 @@ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) /*********************************************************************** * X11DRV_XRender_UpdateDrawable * - * This gets called from X11DRV_SetDrawable and X11DRV_SelectBitmap. - * It deletes the pict and tile when the drawable changes. + * Deletes the pict and tile when the drawable changes. */ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) {

1 0

Alexandre Julliard : winapi: Handle types should be treated as pointers.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: b46be0be7df81dbeca54a29ca267c0b2a9cc8c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46be0be7df81dbeca54a29ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 6 13:44:54 2009 +0200 winapi: Handle types should be treated as pointers. --- dlls/ntdll/tests/generated.c | 2 -- tools/winapi/winapi_test | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index 89b2e05..b7bfa6d 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -2856,7 +2856,6 @@ static void test_pack_HCURSOR(void) /* HCURSOR */ TEST_TYPE_SIZE (HCURSOR, 4) TEST_TYPE_ALIGN (HCURSOR, 4) - TEST_TYPE_UNSIGNED(HCURSOR) } static void test_pack_HFILE(void) @@ -2893,7 +2892,6 @@ static void test_pack_HMODULE(void) /* HMODULE */ TEST_TYPE_SIZE (HMODULE, 4) TEST_TYPE_ALIGN (HMODULE, 4) - TEST_TYPE_UNSIGNED(HMODULE) } static void test_pack_INT(void) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 7288a2e..99a7276 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -220,9 +220,9 @@ sub _find_align_kind_size($) { $align = 4; $kind = "float"; $size = 12; - } elsif (/^H(?:DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|RESULT|WND)$/) { + } elsif (/^H(?:DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|WND)$/) { $align = 4; - $kind = "unsigned"; + $kind = "pointer"; $size = 4; } elsif (/^LP(?:BYTE|CSTR|CWSTR|DWORD|STR|VOID|WSTR)$/) { $align = 4;

1 0

Detlef Riekenberg : localspl: Support XcvMonitor/XcvPort in OpenPrinter.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: b0b8a2fb8b25bb2398c7740ad2096989b3029f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0b8a2fb8b25bb2398c7740ad… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 5 05:36:42 2009 +0200 localspl: Support XcvMonitor/XcvPort in OpenPrinter. --- dlls/localspl/provider.c | 159 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 153 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 70c7f8c..4e3289d 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -83,6 +83,8 @@ typedef struct { typedef struct { LPWSTR name; LPWSTR printername; + monitor_t * pm; + HANDLE hXcv; } printer_t; /* ############################### */ @@ -93,6 +95,7 @@ static monitor_t * pm_localport; static const PRINTPROVIDOR * pprovider = NULL; static const WCHAR backslashW[] = {'\\',0}; +static const WCHAR bs_ports_bsW[] = {'\\','P','o','r','t','s','\\',0}; static const WCHAR configuration_fileW[] = {'C','o','n','f','i','g','u','r','a','t','i','o','n',' ','F','i','l','e',0}; static const WCHAR datatypeW[] = {'D','a','t','a','t','y','p','e',0}; static const WCHAR data_fileW[] = {'D','a','t','a',' ','F','i','l','e',0}; @@ -123,20 +126,30 @@ static const WCHAR oem_urlW[] = {'O','E','M',' ','U','r','l',0}; static const WCHAR parametersW[] = {'P','a','r','a','m','e','t','e','r','s',0}; static const WCHAR portW[] = {'P','o','r','t',0}; static const WCHAR previous_namesW[] = {'P','r','e','v','i','o','u','s',' ','N','a','m','e','s',0}; +static const WCHAR printersW[] = {'S','y','s','t','e','m','\\', + 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'P','r','i','n','t','\\', + 'P','r','i','n','t','e','r','s',0}; static const WCHAR spooldriversW[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\',0}; +static const WCHAR version0_regpathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; +static const WCHAR version0_subdirW[] = {'\\','0',0}; +static const WCHAR version3_regpathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; +static const WCHAR version3_subdirW[] = {'\\','3',0}; static const WCHAR versionW[] = {'V','e','r','s','i','o','n',0}; - static const WCHAR win40_envnameW[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR win40_subdirW[] = {'w','i','n','4','0',0}; -static const WCHAR version0_regpathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; -static const WCHAR version0_subdirW[] = {'\\','0',0}; - +static const WCHAR winnt_cv_portsW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'P','o','r','t','s',0}; static const WCHAR x64_envnameW[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; static const WCHAR x64_subdirW[] = {'x','6','4',0}; static const WCHAR x86_envnameW[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; static const WCHAR x86_subdirW[] = {'w','3','2','x','8','6',0}; -static const WCHAR version3_regpathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; -static const WCHAR version3_subdirW[] = {'\\','3',0}; +static const WCHAR XcvMonitorW[] = {',','X','c','v','M','o','n','i','t','o','r',' ',0}; +static const WCHAR XcvPortW[] = {',','X','c','v','P','o','r','t',' ',0}; static const printenv_t env_x86 = {x86_envnameW, x86_subdirW, 3, @@ -544,6 +557,65 @@ static DWORD monitor_loadall(void) } /****************************************************************** + * 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 = heap_alloc(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); + } + heap_free(buffer); + return pm; +} + +/****************************************************************** * Return the number of bytes for an multi_sz string. * The result includes all \0s * (specifically the extra \0, that is needed as multi_sz terminator). @@ -944,6 +1016,10 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) */ static VOID printer_free(printer_t * printer) { + if (printer->hXcv) + printer->pm->monitor->pfnXcvClosePort(printer->hXcv); + + monitor_unload(printer->pm); heap_free(printer->printername); heap_free(printer->name); @@ -960,6 +1036,9 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) WCHAR servername[MAX_COMPUTERNAME_LENGTH + 1]; printer_t *printer = NULL; LPCWSTR printername; + HKEY hkeyPrinters; + HKEY hkeyPrinter; + DWORD len; if (copy_servername_from_name(name, servername)) { FIXME("server %s not supported\n", debugstr_w(servername)); @@ -988,6 +1067,74 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) printer_free(printer); printer = NULL; } + if (printername) { + len = sizeof(XcvMonitorW)/sizeof(WCHAR) - 1; + if (strncmpW(printername, XcvMonitorW, len) == 0) { + /* OpenPrinter(",XcvMonitor ", ...) detected */ + TRACE(",XcvMonitor: %s\n", debugstr_w(&printername[len])); + printer->pm = monitor_load(&printername[len], NULL); + if (printer->pm == NULL) { + printer_free(printer); + SetLastError(ERROR_UNKNOWN_PORT); + printer = NULL; + goto end; + } + } + else + { + len = sizeof(XcvPortW)/sizeof(WCHAR) - 1; + if (strncmpW( printername, XcvPortW, len) == 0) { + /* OpenPrinter(",XcvPort ", ...) detected */ + TRACE(",XcvPort: %s\n", debugstr_w(&printername[len])); + printer->pm = monitor_load_by_port(&printername[len]); + if (printer->pm == NULL) { + printer_free(printer); + SetLastError(ERROR_UNKNOWN_PORT); + printer = NULL; + goto end; + } + } + } + + if (printer->pm) { + if ((printer->pm->monitor) && (printer->pm->monitor->pfnXcvOpenPort)) { + printer->pm->monitor->pfnXcvOpenPort(&printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); + } + if (printer->hXcv == NULL) { + printer_free(printer); + SetLastError(ERROR_INVALID_PARAMETER); + printer = NULL; + goto end; + } + } + else + { + /* Does the Printer exist? */ + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, printersW, &hkeyPrinters) != ERROR_SUCCESS) { + ERR("Can't create Printers key\n"); + printer_free(printer); + SetLastError(ERROR_INVALID_PRINTER_NAME); + printer = NULL; + goto end; + } + if (RegOpenKeyW(hkeyPrinters, printername, &hkeyPrinter) != ERROR_SUCCESS) { + WARN("Printer not found in Registry: %s\n", debugstr_w(printername)); + RegCloseKey(hkeyPrinters); + printer_free(printer); + SetLastError(ERROR_INVALID_PRINTER_NAME); + printer = NULL; + goto end; + } + RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); + } + } + else + { + TRACE("using the local printserver\n"); + } end:

1 0

Detlef Riekenberg : localspl: Start implementation of OpenPrinter/ ClosePrinter.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: b4120c7f27bdd2dbc90f751d0adba96e5c34cf5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4120c7f27bdd2dbc90f751d0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 5 05:24:34 2009 +0200 localspl: Start implementation of OpenPrinter/ClosePrinter. --- dlls/localspl/localspl_private.h | 5 + dlls/localspl/provider.c | 156 +++++++++++++++++++++++++++++++++++++- dlls/winspool.drv/info.c | 14 +++- 3 files changed, 172 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 0ac6369..5174a1a 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -62,6 +62,11 @@ static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); } +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero( void * mem, size_t len ) +{ + return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); +} + static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem ); diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index f308e36..70c7f8c 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -80,6 +80,11 @@ typedef struct { LPCWSTR versionsubdir; } printenv_t; +typedef struct { + LPWSTR name; + LPWSTR printername; +} printer_t; + /* ############################### */ static struct list monitor_handles = LIST_INIT( monitor_handles ); @@ -274,6 +279,32 @@ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) } /****************************************************************** + * get_basename_from_name (internal) + * + * skip over the serverpart from the full name + * + */ +static LPCWSTR get_basename_from_name(LPCWSTR name) +{ + if (name == NULL) return NULL; + if ((name[0] == '\\') && (name[1] == '\\')) { + /* skip over the servername and search for the following '\' */ + name = strchrW(&name[2], '\\'); + if ((name) && (name[1])) { + /* found a separator ('\') followed by a name: + skip over the separator and return the rest */ + name++; + } + else + { + /* no basename present (we found only a servername) */ + return NULL; + } + } + return name; +} + +/****************************************************************** * monitor_unload [internal] * * release a printmonitor and unload it from memory, when needed @@ -907,6 +938,64 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) return hui; } +/****************************************************************** + * printer_free + * free the data pointer of an opened printer + */ +static VOID printer_free(printer_t * printer) +{ + + heap_free(printer->printername); + heap_free(printer->name); + heap_free(printer); +} + +/****************************************************************** + * printer_alloc_handle + * alloc a printer handle and remember the data pointer in the printer handle table + * + */ +static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) +{ + WCHAR servername[MAX_COMPUTERNAME_LENGTH + 1]; + printer_t *printer = NULL; + LPCWSTR printername; + + if (copy_servername_from_name(name, servername)) { + FIXME("server %s not supported\n", debugstr_w(servername)); + SetLastError(ERROR_INVALID_PRINTER_NAME); + return NULL; + } + + printername = get_basename_from_name(name); + if (name != printername) TRACE("converted %s to %s\n", debugstr_w(name), debugstr_w(printername)); + + /* an empty printername is invalid */ + if (printername && (!printername[0])) { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + printer = heap_alloc_zero(sizeof(printer_t)); + if (!printer) goto end; + + /* clone the base name. This is NULL for the printserver */ + printer->printername = strdupW(printername); + + /* clone the full name */ + printer->name = strdupW(name); + if (name && (!printer->name)) { + printer_free(printer); + printer = NULL; + } + +end: + + TRACE("==> %p\n", printer); + return (HANDLE)printer; +} + + /****************************************************************************** * myAddPrinterDriverEx [internal] * @@ -1213,6 +1302,34 @@ static BOOL WINAPI fpAddPrinterDriverEx(LPWSTR pName, DWORD level, LPBYTE pDrive return myAddPrinterDriverEx(level, pDriverInfo, dwFileCopyFlags, TRUE); } + +/****************************************************************************** + * fpClosePrinter [exported through PRINTPROVIDOR] + * + * Close a printer handle and free associated resources + * + * PARAMS + * hPrinter [I] Printerhandle to close + * + * RESULTS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI fpClosePrinter(HANDLE hPrinter) +{ + printer_t *printer = (printer_t *) hPrinter; + + TRACE("(%p)\n", hPrinter); + + if (printer) { + printer_free(printer); + return TRUE; + } + return FALSE; +} + + /****************************************************************** * fpDeleteMonitor [exported through PRINTPROVIDOR] * @@ -1425,13 +1542,48 @@ emP_cleanup: return (res); } +/****************************************************************************** + * fpOpenPrinter [exported through PRINTPROVIDOR] + * + * Open a Printer / Printserver or a Printer-Object + * + * PARAMS + * lpPrinterName [I] Name of Printserver, Printer, or Printer-Object + * pPrinter [O] The resulting Handle is stored here + * pDefaults [I] PTR to Default Printer Settings or NULL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * lpPrinterName is one of: + *| Printserver (NT only): "Servername" or NULL for the local Printserver + *| Printer: "PrinterName" + *| Printer-Object: "PrinterName,Job xxx" + *| XcvMonitor: "Servername,XcvMonitor MonitorName" + *| XcvPort: "Servername,XcvPort PortName" + * + * + */ +static BOOL WINAPI fpOpenPrinter(LPWSTR lpPrinterName, HANDLE *pPrinter, + LPPRINTER_DEFAULTSW pDefaults) +{ + + TRACE("(%s, %p, %p)\n", debugstr_w(lpPrinterName), pPrinter, pDefaults); + + *pPrinter = printer_alloc_handle(lpPrinterName, pDefaults); + + return (*pPrinter != 0); +} + /***************************************************** * setup_provider [internal] */ void setup_provider(void) { static const PRINTPROVIDOR backend = { - NULL, /* fpOpenPrinter */ + fpOpenPrinter, NULL, /* fpSetJob */ NULL, /* fpGetJob */ NULL, /* fpEnumJobs */ @@ -1462,7 +1614,7 @@ void setup_provider(void) NULL, /* fpGetPrinterData */ NULL, /* fpSetPrinterData */ NULL, /* fpWaitForPrinterChange */ - NULL, /* fpClosePrinter */ + fpClosePrinter, NULL, /* fpAddForm */ NULL, /* fpDeleteForm */ NULL, /* fpGetForm */ diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8160957..d2a40d0 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -111,6 +111,7 @@ typedef struct { LPWSTR printername; monitor_t *pm; HANDLE hXcv; + HANDLE backend_printer; jobqueue_t *queue; started_doc_t *doc; } opened_printer_t; @@ -1119,7 +1120,7 @@ static LPCWSTR get_basename_from_name(LPCWSTR name) * ToDo: * - pDefault is ignored */ -static HANDLE get_opened_printer_entry(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) +static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault) { UINT_PTR handle = nb_printer_handles, i; jobqueue_t *queue = NULL; @@ -1130,6 +1131,8 @@ static HANDLE get_opened_printer_entry(LPCWSTR name, LPPRINTER_DEFAULTSW pDefaul HKEY hkeyPrinter; DWORD len; + if ((backend == NULL) && !load_backend()) return NULL; + servername = get_servername_from_name(name); if (servername) { FIXME("server %s not supported\n", debugstr_w(servername)); @@ -1188,6 +1191,11 @@ static HANDLE get_opened_printer_entry(LPCWSTR name, LPPRINTER_DEFAULTSW pDefaul goto end; } + /* get a printer handle from the backend */ + if (! backend->fpOpenPrinter(name, &printer->backend_printer, pDefault)) { + handle = 0; + goto end; + } /* clone the base name. This is NULL for the printserver */ printer->printername = strdupW(printername); @@ -2893,6 +2901,10 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) debugstr_w(printer->pm ? printer->pm->dllname : NULL), printer->hXcv, debugstr_w(printer->name), printer->doc ); + if (printer->backend_printer) { + backend->fpClosePrinter(printer->backend_printer); + } + if(printer->doc) EndDocPrinter(hPrinter);

1 0

Ricardo Filipe : commdlg: Implemented notifications are only sent with OFN_EXPLORER flag set.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: abadf9a37a7d08fed3e670a521ec14f79e1fb3bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=abadf9a37a7d08fed3e670a52… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Tue May 5 11:38:34 2009 +0100 commdlg: Implemented notifications are only sent with OFN_EXPLORER flag set. --- dlls/comdlg32/filedlg.c | 32 +++++++++++++++++++++----------- dlls/comdlg32/filedlgbrowser.c | 6 ++++-- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index b423942..10fccc2 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1160,9 +1160,12 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); } - SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); - SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); - SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + { + SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); + SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); + SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); + } return 0; } case WM_SIZE: @@ -1749,11 +1752,12 @@ static BOOL FILEDLG95_SendFileOK( HWND hwnd, FileOpenDlgInfos *fodInfos ) /* ask the hook if we can close */ if(IsHooked(fodInfos)) { - LRESULT retval; + LRESULT retval = 0; TRACE("---\n"); /* First send CDN_FILEOK as MSDN doc says */ - retval = SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + retval = SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK); if (GetWindowLongPtrW(fodInfos->DlgInfos.hwndCustomDlg, DWLP_MSGRESULT)) { TRACE("canceled\n"); @@ -2148,7 +2152,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) IPersistFolder2_Release(ppf2); if( ! COMDLG32_PIDL_ILIsEqual(pidlCurrent, fodInfos->ShellInfos.pidlAbsCurrent)) { - if (SUCCEEDED(IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE))) + if (SUCCEEDED(IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE)) + && fodInfos->ofnInfos->Flags & OFN_EXPLORER) { SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); } @@ -2451,7 +2456,8 @@ static BOOL FILEDLG95_SHELL_UpFolder(HWND hwnd) NULL, SBSP_PARENT))) { - SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); return TRUE; } return FALSE; @@ -2473,7 +2479,8 @@ static BOOL FILEDLG95_SHELL_BrowseToDesktop(HWND hwnd) SHGetSpecialFolderLocation(0,CSIDL_DESKTOP,&pidl); hres = IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidl, SBSP_ABSOLUTE); - SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); COMDLG32_SHFree(pidl); return SUCCEEDED(hres); } @@ -2651,7 +2658,8 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode) len = lstrlenW(lpstrFilter)+1; fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) ); lstrcpyW(fodInfos->ShellInfos.lpstrCurrentFilter,lpstrFilter); - SendCustomDlgNotificationMessage(hwnd,CDN_TYPECHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd,CDN_TYPECHANGE); } /* Refresh the actual view to display the included items*/ @@ -2955,7 +2963,8 @@ static BOOL FILEDLG95_LOOKIN_OnCommand(HWND hwnd, WORD wNotifyCode) tmpFolder->pidlItem, SBSP_ABSOLUTE))) { - SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); return TRUE; } break; @@ -3629,7 +3638,8 @@ static BOOL BrowseSelectedFolder(HWND hwnd) MessageBoxW( hwnd, notexist, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); } bBrowseSelFolder = TRUE; - SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); } COMDLG32_SHFree( pidlSelection ); } diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index f630f14..078001e 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -785,7 +785,8 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDl if (ulAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER) ) { hRes = IShellBrowser_BrowseObject((IShellBrowser *)This,pidl,SBSP_RELATIVE); - SendCustomDlgNotificationMessage(This->hwndOwner, CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(This->hwndOwner, CDN_FOLDERCHANGE); } else { @@ -960,7 +961,8 @@ static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *if FILEDLG95_FILENAME_FillFromSelection(This->hwndOwner); - SendCustomDlgNotificationMessage(This->hwndOwner, CDN_SELCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(This->hwndOwner, CDN_SELCHANGE); return S_OK; }

1 0

Stefan Dösinger : wined3d: Pack hardcoded local constants in ARB.
by Alexandre Julliard 06 May '09

06 May '09

Module: wine Branch: master Commit: 4c29105cb2726ab1aead2b51ef1e70321848073c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c29105cb2726ab1aead2b51e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 5 20:45:32 2009 +0200 wined3d: Pack hardcoded local constants in ARB. This makes the location of used program.local parameters more predictable and eases sharing this space with other private constants. --- dlls/wined3d/arb_program_shader.c | 45 ++++++++++++++++++++++++++++-------- 1 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1fcae76..67422b4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -270,9 +270,29 @@ static void shader_arb_update_float_pixel_constants(IWineD3DDevice *iface, UINT This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start + count + 1); } +static DWORD *local_const_mapping(IWineD3DBaseShaderImpl *This) +{ + DWORD *ret; + DWORD idx = 0; + const local_constant *lconst; + + if(This->baseShader.load_local_constsF || list_empty(&This->baseShader.constantsF)) return NULL; + + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->baseShader.limits.temporary); + if(!ret) { + ERR("Out of memory\n"); + return NULL; + } + + LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { + ret[lconst->idx] = idx++; + } + return ret; +} + /* Generate the variable & register declarations for the ARB_vertex_program output target */ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const shader_reg_maps *reg_maps, - SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info) + SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info, DWORD *lconst_map) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; @@ -353,10 +373,10 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh /* Load local constants using the program-local space, * this avoids reloading them each time the shader is used */ - if(!This->baseShader.load_local_constsF) { + if(lconst_map) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { shader_addline(buffer, "PARAM C%u = program.local[%u];\n", lconst->idx, - lconst->idx); + lconst_map[lconst->idx]); } } @@ -366,7 +386,7 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh * local constants do not declare the loaded constants as an array because ARB compilers usually * do not optimize unused constants away */ - if(This->baseShader.load_local_constsF || list_empty(&This->baseShader.constantsF)) { + if(!lconst_map || list_empty(&This->baseShader.constantsF)) { /* Need to PARAM the environment parameters (constants) so we can use relative addressing */ shader_addline(buffer, "PARAM C[%d] = { program.env[0..%d] };\n", max_constantsF, max_constantsF - 1); @@ -1980,6 +2000,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, const local_constant *lconst; GLuint retval; const char *fragcolor; + DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBfp1.0\n"); @@ -2017,7 +2038,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, } /* Base Declarations */ - shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION); + shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); /* Base Shader Body */ shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); @@ -2048,12 +2069,13 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, } /* Load immediate constants */ - if(!This->baseShader.load_local_constsF) { + if(lconst_map) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { const float *value = (const float *)lconst->value; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, lconst->idx, value)); + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, lconst_map[lconst->idx], value)); checkGLcall("glProgramLocalParameter4fvARB"); } + HeapFree(GetProcessHeap(), 0, lconst_map); } return retval; @@ -2069,6 +2091,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, const WineD3D_GL_Info *gl_info = &device->adapter->gl_info; const local_constant *lconst; GLuint ret; + DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); @@ -2082,7 +2105,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, shader_addline(buffer, "TEMP TMP;\n"); /* Base Declarations */ - shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION); + shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); /* We need a constant to fixup the final position */ shader_addline(buffer, "PARAM posFixup = program.env[%d];\n", ARB_SHADER_PRIVCONST_POS); @@ -2165,13 +2188,15 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, ret = -1; } else { /* Load immediate constants */ - if(!This->baseShader.load_local_constsF) { + if(lconst_map) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { const float *value = (const float *)lconst->value; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, lconst->idx, value)); + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, lconst_map[lconst->idx], value)); } } } + HeapFree(GetProcessHeap(), 0, lconst_map); + return ret; }

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
80
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 May 2009