May 2006 - Wine-commits - list.winehq.org

Michael Kaufmann : gdi: Fix GetObject for bitmaps.
by Alexandre Julliard 17 May '06

17 May '06

Module: wine Branch: refs/heads/master Commit: f6097f5b5199e15544be7d2861d6461e6081ac18 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f6097f5b5199e15544be7d2… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Tue May 9 15:51:12 2006 +0200 gdi: Fix GetObject for bitmaps. - GetObject(): Set the bmBits member of the BITMAP structure to NULL for device-dependent bitmaps. - New test case. --- dlls/gdi/bitmap.c | 4 +++- dlls/gdi/gdi_private.h | 2 +- dlls/gdi/tests/bitmap.c | 20 ++++++++++++++++++++ dlls/x11drv/bitmap.c | 6 +++--- dlls/x11drv/winex11.drv.spec | 2 +- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c index 3186443..4d5cd71 100644 --- a/dlls/gdi/bitmap.c +++ b/dlls/gdi/bitmap.c @@ -528,7 +528,8 @@ BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, ret = TRUE; if (!bitmap->funcs) /* not owned by a DC yet */ { - if (dc->funcs->pCreateBitmap) ret = dc->funcs->pCreateBitmap( dc->physDev, hbitmap ); + if (dc->funcs->pCreateBitmap) ret = dc->funcs->pCreateBitmap( dc->physDev, hbitmap, + bitmap->bitmap.bmBits ); if (ret) bitmap->funcs = dc->funcs; } else if (bitmap->funcs != dc->funcs) @@ -705,6 +706,7 @@ static INT BITMAP_GetObject( HGDIOBJ han else { memcpy( buffer, &bmp->bitmap, sizeof(BITMAP) ); + ((BITMAP *) buffer)->bmBits = NULL; return sizeof(BITMAP); } } diff --git a/dlls/gdi/gdi_private.h b/dlls/gdi/gdi_private.h index dfdb008..fd06263 100644 --- a/dlls/gdi/gdi_private.h +++ b/dlls/gdi/gdi_private.h @@ -72,7 +72,7 @@ typedef struct tagDC_FUNCS INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *); BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (*pCloseFigure)(PHYSDEV); - BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP); + BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP,LPVOID); BOOL (*pCreateDC)(HDC,PHYSDEV *,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); HBITMAP (*pCreateDIBSection)(PHYSDEV,HBITMAP,const BITMAPINFO *,UINT); BOOL (*pDeleteBitmap)(HBITMAP); diff --git a/dlls/gdi/tests/bitmap.c b/dlls/gdi/tests/bitmap.c index ff16f8d..af7a0d2 100644 --- a/dlls/gdi/tests/bitmap.c +++ b/dlls/gdi/tests/bitmap.c @@ -1001,6 +1001,25 @@ static void test_bitmap(void) DeleteDC(hdc); } +static void test_bmBits(void) +{ + BYTE bits[4]; + HBITMAP hbmp; + BITMAP bmp; + + memset(bits, 0, sizeof(bits)); + hbmp = CreateBitmap(2, 2, 1, 4, bits); + ok(hbmp != NULL, "CreateBitmap failed\n"); + + memset(&bmp, 0xFF, sizeof(bmp)); + ok(GetObject(hbmp, sizeof(bmp), &bmp) == sizeof(bmp), + "GetObject failed or returned a wrong structure size\n"); + ok(!bmp.bmBits, "bmBits must be NULL for device-dependent bitmaps\n"); + + DeleteObject(hbmp); +} + + START_TEST(bitmap) { is_win9x = GetWindowLongPtrW(GetDesktopWindow(), GWLP_WNDPROC) == 0; @@ -1009,4 +1028,5 @@ START_TEST(bitmap) test_dibsections(); test_mono_dibsection(); test_bitmap(); + test_bmBits(); } diff --git a/dlls/x11drv/bitmap.c b/dlls/x11drv/bitmap.c index 060102f..0f958d7 100644 --- a/dlls/x11drv/bitmap.c +++ b/dlls/x11drv/bitmap.c @@ -106,7 +106,7 @@ HBITMAP X11DRV_SelectBitmap( X11DRV_PDEV * * Returns TRUE on success else FALSE */ -BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) +BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBits ) { X_PHYSBITMAP *physBitmap; BITMAP bitmap; @@ -145,9 +145,9 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE return FALSE; } - if (bitmap.bmBits) /* Set bitmap bits */ + if (bmBits) /* Set bitmap bits */ { - X11DRV_SetBitmapBits( hbitmap, bitmap.bmBits, bitmap.bmHeight * bitmap.bmWidthBytes ); + X11DRV_SetBitmapBits( hbitmap, bmBits, bitmap.bmHeight * bitmap.bmWidthBytes ); } else /* else clear the bitmap */ { diff --git a/dlls/x11drv/winex11.drv.spec b/dlls/x11drv/winex11.drv.spec index 1a835a9..9c33ce4 100644 --- a/dlls/x11drv/winex11.drv.spec +++ b/dlls/x11drv/winex11.drv.spec @@ -5,7 +5,7 @@ # GDI driver @ cdecl BitBlt(ptr long long long long ptr long long long) X11DRV_BitBlt @ cdecl ChoosePixelFormat(ptr ptr) X11DRV_ChoosePixelFormat @ cdecl Chord(ptr long long long long long long long long) X11DRV_Chord -@ cdecl CreateBitmap(ptr long) X11DRV_CreateBitmap +@ cdecl CreateBitmap(ptr long ptr) X11DRV_CreateBitmap @ cdecl CreateDC(long ptr wstr wstr wstr ptr) X11DRV_CreateDC @ cdecl CreateDIBSection(ptr long ptr long) X11DRV_CreateDIBSection @ cdecl DeleteBitmap(long) X11DRV_DeleteBitmap

1 0

Detlef Riekenberg : winspool: Fix OpenDriverReg on top of validate_envW.
by Alexandre Julliard 17 May '06

17 May '06

Module: wine Branch: refs/heads/master Commit: 6c233ef205b351e8a2e314de776c55ddfca5d61f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c233ef205b351e8a2e314d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 11 23:59:17 2006 +0200 winspool: Fix OpenDriverReg on top of validate_envW. --- dlls/winspool/info.c | 91 +++++++++++++++++++++----------------------------- 1 files changed, 39 insertions(+), 52 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index b67613e..1f91202 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -100,6 +100,9 @@ typedef struct { typedef struct { LPCWSTR envname; LPCWSTR subdir; + DWORD driverversion; + LPCWSTR versionregpath; + LPCWSTR versionsubdir; } printenv_t; /* ############################### */ @@ -124,7 +127,7 @@ static const WCHAR DriversW[] = { 'S','y 'c','o','n','t','r','o','l','\\', 'P','r','i','n','t','\\', 'E','n','v','i','r','o','n','m','e','n','t','s','\\', - '%','s','\\','D','r','i','v','e','r','s','\\',0 }; + '%','s','\\','D','r','i','v','e','r','s','%','s',0 }; static const WCHAR MonitorsW[] = { 'S','y','s','t','e','m','\\', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -157,6 +160,8 @@ static const WCHAR envname_win40W[] = {' static const WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; static const WCHAR subdir_win40W[] = {'w','i','n','4','0',0}; static const WCHAR subdir_x86W[] = {'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 spooldriversW[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\',0}; @@ -226,8 +231,10 @@ static DWORD WINSPOOL_SHDeleteKeyW(HKEY static const printenv_t * validate_envW(LPCWSTR env) { - static const printenv_t env_x86 = {envname_x86W, subdir_x86W}; - static const printenv_t env_win40 = {envname_win40W, subdir_win40W}; + static const printenv_t env_x86 = {envname_x86W, subdir_x86W, + 3, Version3_RegPathW, Version3_SubdirW}; + static const printenv_t env_win40 = {envname_win40W, subdir_win40W, + 0, emptyStringW, emptyStringW}; static const printenv_t * const all_printenv[]={&env_x86, &env_win40}; const printenv_t *result = NULL; @@ -1854,57 +1861,37 @@ BOOL WINAPI GetPrintProcessorDirectoryW( */ static HKEY WINSPOOL_OpenDriverReg( LPVOID pEnvironment, BOOL unicode) { - static const WCHAR WinNTW[] = { 'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0 }; - static const WCHAR Win40W[] = { 'W','i','n','d','o','w','s',' ','4','.','0',0 }; - HKEY retval; - LPWSTR lpKey, buffer = NULL; - LPCWSTR pEnvW; - - TRACE("%s\n", - (unicode) ? debugstr_w(pEnvironment) : debugstr_a(pEnvironment)); - - if(pEnvironment) { - if (unicode) { - pEnvW = pEnvironment; - } else { - INT len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pEnvironment, -1, NULL, 0); - buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (buffer) MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pEnvironment, -1, buffer, len); - pEnvW = buffer; - } - } else { - OSVERSIONINFOW ver; - ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); - - if(!GetVersionExW( &ver)) - return 0; - - switch (ver.dwPlatformId) { - case VER_PLATFORM_WIN32s: - ERR("win32 style printing used with 16 bits app, try specifying 'win95' Windows version\n"); - return 0; - case VER_PLATFORM_WIN32_NT: - pEnvW = WinNTW; - break; - default: - pEnvW = Win40W; - break; - } - TRACE("set environment to %s\n", debugstr_w(pEnvW)); - } - - lpKey = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - (strlenW(pEnvW) + strlenW(DriversW) + 1) * sizeof(WCHAR)); - wsprintfW( lpKey, DriversW, pEnvW); - - TRACE("%s\n", debugstr_w(lpKey)); - - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, lpKey, &retval) != ERROR_SUCCESS) - retval = 0; + HKEY retval = NULL; + LPWSTR buffer; + const printenv_t * env; - HeapFree( GetProcessHeap(), 0, buffer); - HeapFree( GetProcessHeap(), 0, lpKey); + TRACE("(%s, %d)\n", + (unicode) ? debugstr_w(pEnvironment) : debugstr_a(pEnvironment), unicode); + if (!pEnvironment || unicode) { + /* pEnvironment was NULL or an Unicode-String: use it direct */ + env = validate_envW(pEnvironment); + } + else + { + /* pEnvironment was an ANSI-String: convert to unicode first */ + LPWSTR buffer; + INT len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pEnvironment, -1, NULL, 0); + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (buffer) MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pEnvironment, -1, buffer, len); + env = validate_envW(buffer); + HeapFree(GetProcessHeap(), 0, buffer); + } + if (!env) return NULL; + + buffer = HeapAlloc( GetProcessHeap(), 0, + (strlenW(DriversW) + strlenW(env->envname) + + strlenW(env->versionregpath) + 1) * sizeof(WCHAR)); + if(buffer) { + wsprintfW(buffer, DriversW, env->envname, env->versionregpath); + RegCreateKeyW(HKEY_LOCAL_MACHINE, buffer, &retval); + HeapFree(GetProcessHeap(), 0, buffer); + } return retval; }

1 0

Detlef Riekenberg : winspool/tests: More tests for OpenPrinter.
by Alexandre Julliard 17 May '06

17 May '06

Module: wine Branch: refs/heads/master Commit: 461b2a758322cdb34e6ee43688e0c3c9326eda88 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=461b2a758322cdb34e6ee43… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 11 19:57:48 2006 +0200 winspool/tests: More tests for OpenPrinter. --- dlls/winspool/tests/info.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index 3fa9fe2..4483e65 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -792,9 +792,11 @@ static void test_OpenPrinter(void) hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = OpenPrinter(NULL, &hprinter, &defaults); + todo_wine { ok(!res && GetLastError() == ERROR_ACCESS_DENIED, "returned %ld with %ld (expected '0' with ERROR_ACCESS_DENIED)\n", res, GetLastError()); + } if (res) ClosePrinter(hprinter); } @@ -828,6 +830,17 @@ static void test_OpenPrinter(void) "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); + hprinter = (HANDLE) MAGIC_DEAD; + SetLastError(MAGIC_DEAD); + res = OpenPrinter("", &hprinter, NULL); + /* NT: ERROR_INVALID_PRINTER_NAME, 9x: ERROR_INVALID_PARAMETER */ + ok( !res && + ((GetLastError() == ERROR_INVALID_PRINTER_NAME) || + (GetLastError() == ERROR_INVALID_PARAMETER) ), + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PRINTER_NAME" \ + " or ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + if(res) ClosePrinter(hprinter); + /* Get Handle for the default Printer */ if ((default_printer = find_default_printer())) @@ -837,12 +850,19 @@ static void test_OpenPrinter(void) res = OpenPrinter(default_printer, &hprinter, NULL); if((!res) && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { - trace("The Service 'Spooler' is required for '%s'\n", default_printer); + trace("The Service 'Spooler' is required for '%s'\n", default_printer); return; } ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); if(res) ClosePrinter(hprinter); + SetLastError(MAGIC_DEAD); + res = OpenPrinter(default_printer, NULL, NULL); + /* NT: FALSE with ERROR_INVALID_PARAMETER, 9x: TRUE */ + ok(res || (GetLastError() == ERROR_INVALID_PARAMETER), + "returned %ld with %ld (expected '!=0' or '0' with " \ + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + defaults.pDatatype=NULL; defaults.pDevMode=NULL; defaults.DesiredAccess=0;

1 0

Detlef Riekenberg : winspool: Do not fail in OpenPrinter on pDefault / local print server.
by Alexandre Julliard 17 May '06

17 May '06

Module: wine Branch: refs/heads/master Commit: 351106f5ae3b787f246504203ddd8d31c0944cc2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=351106f5ae3b787f2465042… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 12 16:14:59 2006 +0200 winspool: Do not fail in OpenPrinter on pDefault / local print server. --- dlls/winspool/info.c | 114 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 68 insertions(+), 46 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 51f1fa1..b67613e 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -132,6 +132,12 @@ static const WCHAR MonitorsW[] = { 'S', 'P','r','i','n','t','\\', 'M','o','n','i','t','o','r','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 LocalPortW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; static const WCHAR user_default_reg_key[] = { 'S','o','f','t','w','a','r','e','\\', @@ -776,12 +782,15 @@ static DWORD get_local_monitors(DWORD le /****************************************************************** * get_opened_printer_entry * Get the first place empty in the opened printer table + * + * ToDo: + * - pDefault is ignored */ -static HANDLE get_opened_printer_entry( LPCWSTR name ) +static HANDLE get_opened_printer_entry(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) { UINT_PTR handle = nb_printer_handles, i; jobqueue_t *queue = NULL; - opened_printer_t *printer; + opened_printer_t *printer = NULL; EnterCriticalSection(&printer_handles_cs); @@ -792,8 +801,11 @@ static HANDLE get_opened_printer_entry( if(handle == nb_printer_handles) handle = i; } - else if(!queue && !strcmpW(name, printer_handles[i]->name)) - queue = printer_handles[i]->queue; + else + { + if(!queue && (name) && !lstrcmpW(name, printer_handles[i]->name)) + queue = printer_handles[i]->queue; + } } if (handle >= nb_printer_handles) @@ -815,29 +827,45 @@ static HANDLE get_opened_printer_entry( nb_printer_handles += 16; } - if (!(printer = HeapAlloc(GetProcessHeap(), 0, sizeof(*printer)))) + if (!(printer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*printer)))) { handle = 0; goto end; } - printer->name = HeapAlloc(GetProcessHeap(), 0, (strlenW(name) + 1) * sizeof(WCHAR)); - strcpyW(printer->name, name); + if(name) { + printer->name = HeapAlloc(GetProcessHeap(), 0, (strlenW(name) + 1) * sizeof(WCHAR)); + if (!printer->name) { + handle = 0; + goto end; + } + strcpyW(printer->name, name); + } + if(queue) printer->queue = queue; else { printer->queue = HeapAlloc(GetProcessHeap(), 0, sizeof(*queue)); + if (!printer->queue) { + handle = 0; + goto end; + } list_init(&printer->queue->jobs); printer->queue->ref = 0; } InterlockedIncrement(&printer->queue->ref); - printer->doc = NULL; printer_handles[handle] = printer; handle++; end: LeaveCriticalSection(&printer_handles_cs); + if (!handle && printer) { + /* Something Failed: Free the Buffers */ + HeapFree(GetProcessHeap(), 0, printer->name); + if (!queue) HeapFree(GetProcessHeap(), 0, printer->queue); + HeapFree(GetProcessHeap(), 0, printer); + } return (HANDLE)handle; } @@ -1258,57 +1286,51 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinter *| XcvPort: "Servername,XcvPort PortName" * * BUGS - *| Printserver not supported *| Printer-Object not supported *| XcvMonitor not supported *| XcvPort not supported - *| pDefaults not supported + *| pDefaults is ignored * */ -BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, - LPPRINTER_DEFAULTSW pDefault) +BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault) { - HKEY hkeyPrinters, hkeyPrinter; + HKEY hkeyPrinters = NULL; + HKEY hkeyPrinter = NULL; - if (!lpPrinterName) { - FIXME("(printerName: NULL, pDefault %p Ret: False\n", pDefault); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + TRACE("(%s, %p, %p)\n", debugstr_w(lpPrinterName), phPrinter, pDefault); + if (pDefault) { + FIXME("PRINTER_DEFAULTS ignored => %s,%p,0x%08lx\n", + debugstr_w(pDefault->pDatatype), pDefault->pDevMode, pDefault->DesiredAccess); } - TRACE("(printerName: %s, pDefault %p)\n", debugstr_w(lpPrinterName), - pDefault); + if(lpPrinterName != NULL) + { + /* Check any Printer exists */ + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { + ERR("Can't create Printers key\n"); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + if((lpPrinterName[0] == '\0') || /* explicitly exclude "" */ + (RegOpenKeyW(hkeyPrinters, lpPrinterName, &hkeyPrinter) != ERROR_SUCCESS)) { - /* Check Printer exists */ - if(RegCreateKeyA(HKEY_LOCAL_MACHINE, Printers, &hkeyPrinters) != - ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - SetLastError(ERROR_FILE_NOT_FOUND); /* ?? */ - return FALSE; + WARN("Printer not found in Registry: '%s'\n", debugstr_w(lpPrinterName)); + RegCloseKey(hkeyPrinters); + SetLastError(ERROR_INVALID_PRINTER_NAME); + return FALSE; + } + RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); } - - if(lpPrinterName[0] == '\0' || /* explicitly exclude "" */ - RegOpenKeyW(hkeyPrinters, lpPrinterName, &hkeyPrinter) - != ERROR_SUCCESS) { - TRACE("Can't find printer %s in registry\n", - debugstr_w(lpPrinterName)); - RegCloseKey(hkeyPrinters); - SetLastError(ERROR_INVALID_PRINTER_NAME); - return FALSE; + if(!phPrinter) { + /* NT: FALSE with ERROR_INVALID_PARAMETER, 9x: TRUE */ + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } - RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); - if(!phPrinter) /* This seems to be what win95 does anyway */ - return TRUE; - - /* Get the unique handle of the printer*/ - *phPrinter = get_opened_printer_entry( lpPrinterName ); - - if (pDefault != NULL) - FIXME("Not handling pDefault\n"); - - return TRUE; + /* Get the unique handle of the printer or Printserver */ + *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); + return (*phPrinter != 0); } /******************************************************************

1 0

Detlef Riekenberg : winspool: Show SetPrinter parameters in the FIXME.
by Alexandre Julliard 17 May '06

17 May '06

Module: wine Branch: refs/heads/master Commit: b7a62e56d964263a09f5de7db24100cfd2ad424b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7a62e56d964263a09f5de7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 12 14:53:17 2006 +0200 winspool: Show SetPrinter parameters in the FIXME. --- dlls/winspool/info.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index df22eae..51f1fa1 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -1645,14 +1645,9 @@ DeletePortW (LPWSTR pName, HWND hWnd, LP /****************************************************************************** * SetPrinterW [WINSPOOL.@] */ -BOOL WINAPI -SetPrinterW( - HANDLE hPrinter, - DWORD Level, - LPBYTE pPrinter, - DWORD Command) { - - FIXME("():stub\n"); +BOOL WINAPI SetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD Command) +{ + FIXME("(%p, %ld, %p, %ld): stub\n", hPrinter, Level, pPrinter, Command); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }

1 0

Detlef Riekenberg : winspool/tests: A truncated dmDeviceName is 0-terminated.
by Alexandre Julliard 17 May '06

17 May '06

Module: wine Branch: refs/heads/master Commit: 78a6d53b6e3042e5ca2f5f075f82953204c9b48a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78a6d53b6e3042e5ca2f5f0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 12 15:03:20 2006 +0200 winspool/tests: A truncated dmDeviceName is 0-terminated. --- dlls/winspool/tests/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index aaeba2a..3fa9fe2 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -1100,8 +1100,8 @@ static void test_DEVMODE(const DEVMODE * (dmDeviceName, dmSpecVersion, dmDriverVersion and dmDriverExtra) We skip the Tests on this Platform */ if (dm->dmSpecVersion || dm->dmDriverVersion || dm->dmDriverExtra) { - /* The Printername can be larger (MAX_PATH) than CCHDEVICENAME */ - ok(!strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME), + /* The 0-terminated Printername can be larger (MAX_PATH) than CCHDEVICENAME */ + ok(!strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME -1), "expected '%s', got '%s'\n", exp_prn_name, dm->dmDeviceName); ok(dm->dmSize + dm->dmDriverExtra == dmSize, "%u != %ld\n", dm->dmSize + dm->dmDriverExtra, dmSize);

1 0

Ivan Gyurdiev : wined3d: Use COLOROUT/DEPTHOUT for pixel shaders 2.0+.
by Alexandre Julliard 17 May '06

17 May '06

Module: wine Branch: refs/heads/master Commit: c65a86828c82ce305b6891ea01688c664724df42 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c65a86828c82ce305b6891e… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 02:09:25 2006 -0400 wined3d: Use COLOROUT/DEPTHOUT for pixel shaders 2.0+. As previously mentioned, RASTOUT is invalid on pixel shaders. On shaders 1.x, r0 is treated as the color output register: http://www.gamedev.net/columns/hardcore/dxshader3/page2.asp That's what we currently do in all cases, change it not to do so for shaders >= 2.0. Support COLOROUT/DEPTHOUT instead. --- dlls/wined3d/pixelshader.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index b9e06e5..d391a8c 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -745,7 +745,6 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI }; inline static void get_register_name(const DWORD param, char* regstr, char constants[WINED3D_PSHADER_MAX_CONSTANTS]) { - static const char* rastout_reg_names[] = { "oC0", "oC1", "oC2", "oC3", "oDepth" }; DWORD reg = param & D3DSP_REGNUM_MASK; DWORD regtype = shader_get_regtype(param); @@ -770,8 +769,17 @@ inline static void get_register_name(con case D3DSPR_TEXTURE: /* case D3DSPR_ADDR: */ sprintf(regstr,"T%lu", reg); break; - case D3DSPR_RASTOUT: - sprintf(regstr, "%s", rastout_reg_names[reg]); + case D3DSPR_COLOROUT: + if (reg == 0) + sprintf(regstr, "result.color"); + else { + /* TODO: See GL_ARB_draw_buffers */ + FIXME("Unsupported write to render target %lu\n", reg); + sprintf(regstr, "unsupported_register"); + } + break; + case D3DSPR_DEPTHOUT: + sprintf(regstr, "result.depth"); break; case D3DSPR_ATTROUT: sprintf(regstr, "oD[%lu]", reg); @@ -1341,8 +1349,8 @@ #endif of the pixel shader string for us */ generate_base_shader( (IWineD3DBaseShader*) This, &buffer, pFunction); - /*FIXME: This next line isn't valid for certain pixel shader versions */ - shader_addline(&buffer, "MOV result.color, R0;\n"); + if (This->baseShader.hex_version < D3DPS_VERSION(2,0)) + shader_addline(&buffer, "MOV result.color, R0;\n"); shader_addline(&buffer, "END\n\0"); /* TODO: change to resource.glObjectHandle or something like that */

1 0

Ivan Gyurdiev : wined3d: LRP is not a valid ARBvp code.
by Alexandre Julliard 17 May '06

17 May '06

Module: wine Branch: refs/heads/master Commit: 174734e4a29d8f11b8dc75e7fc9835921c8ccb48 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=174734e4a29d8f11b8dc75e… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 02:08:32 2006 -0400 wined3d: LRP is not a valid ARBvp code. --- dlls/wined3d/vertexshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index cf09e5f..4321693 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -510,7 +510,7 @@ CONST SHADER_OPCODE IWineD3DVertexShader {D3DSIO_LOGP, "logp", "LOG", 2, vshader_logp, vshader_hw_map2gl, NULL, 0, 0}, {D3DSIO_LIT, "lit", "LIT", 2, vshader_lit, vshader_hw_map2gl, NULL, 0, 0}, {D3DSIO_DST, "dst", "DST", 3, vshader_dst, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_LRP, "lrp", "LRP", 4, vshader_lrp, vshader_hw_map2gl, NULL, 0, 0}, + {D3DSIO_LRP, "lrp", "LRP", 4, vshader_lrp, NULL, NULL, 0, 0}, {D3DSIO_FRC, "frc", "FRC", 2, vshader_frc, vshader_hw_map2gl, NULL, 0, 0}, {D3DSIO_POW, "pow", "POW", 3, vshader_pow, NULL, NULL, 0, 0}, {D3DSIO_CRS, "crs", "XPS", 3, vshader_crs, NULL, NULL, 0, 0},

1 0

Ivan Gyurdiev : wined3d: Remove detailed traces from map2gl/ input_modifiers functions.
by Alexandre Julliard 17 May '06

17 May '06

Module: wine Branch: refs/heads/master Commit: 8470e54bdf348de66a123840e83e410fb6d01953 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8470e54bdf348de66a12384… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 02:07:37 2006 -0400 wined3d: Remove detailed traces from map2gl/input_modifiers functions. --- dlls/wined3d/pixelshader.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 0b42fe1..b9e06e5 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -860,7 +860,6 @@ inline static int gen_input_modifier_lin /* Get register name */ get_register_name(instr, regstr, constants); - TRACE(" Register name %s\n", regstr); switch (instr & D3DSP_SRCMOD_MASK) { case D3DSPSM_NONE: strcpy(outregstr, regstr); @@ -992,7 +991,6 @@ void pshader_hw_map2gl(SHADER_OPCODE_ARG BOOL partialprecision = FALSE; DWORD shift; - TRACE("Appending glname %s to tmpLine\n", curOpcode->glname); strcpy(tmpLine, curOpcode->glname); /* Process modifiers */ @@ -1021,7 +1019,6 @@ void pshader_hw_map2gl(SHADER_OPCODE_ARG /* Generate lines that handle input modifier computation */ for (i = 1; i < curOpcode->num_params; ++i) { - TRACE("(%p) : Param %u token %lx\n", This, i, src[i - 1]); if (gen_input_modifier_line(src[i - 1], i - 1, regs[i - 1], tmpOp, This->constants)) shader_addline(buffer, tmpOp); } @@ -1035,7 +1032,6 @@ void pshader_hw_map2gl(SHADER_OPCODE_ARG /* This function works because of side effects from gen_input_modifier_line */ /* Handle input registers */ for (i = 1; i < curOpcode->num_params; ++i) { - TRACE("(%p) : Regs = %s\n", This, regs[i - 1]); strcpy(operands[i], regs[i - 1]); get_input_register_swizzle(src[i - 1], swzstring); strcat(operands[i], swzstring);

1 0

Ivan Gyurdiev : wined3d: Write "unrecognized_register" in fallback case for get_register_name().
by Alexandre Julliard 17 May '06

17 May '06

Module: wine Branch: refs/heads/master Commit: c05bc5d9c17bb892a5bcf3eb26b5e000694d71b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c05bc5d9c17bb892a5bcf3e… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 02:06:43 2006 -0400 wined3d: Write "unrecognized_register" in fallback case for get_register_name(). --- dlls/wined3d/pixelshader.c | 1 + dlls/wined3d/vertexshader.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 6ff64b3..0b42fe1 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -781,6 +781,7 @@ inline static void get_register_name(con break; default: FIXME("Unhandled register name Type(%ld)\n", regtype); + sprintf(regstr, "unrecognized_register"); break; } } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index b3d17b5..cf09e5f 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -698,6 +698,7 @@ inline static void vshader_program_add_p break; default: FIXME("Unknown reg type %ld %ld\n", regtype, reg); + strcat(hwLine, "unrecognized_register"); break; }

1 0