December 2009 - Wine-commits

Jeremy White : winspool: Remove unvarying unicode parameter from WINSPOOL_OpenDriverReg.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 602d9058fb861691d5b4974903388c3e2027ed85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602d9058fb861691d5b497490… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Nov 30 17:03:58 2009 -0600 winspool: Remove unvarying unicode parameter from WINSPOOL_OpenDriverReg. --- dlls/winspool.drv/info.c | 28 +++++++--------------------- 1 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 6d623d6..f1a956d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2191,29 +2191,15 @@ BOOL WINAPI GetPrintProcessorDirectoryW(LPWSTR server, LPWSTR env, * the opened hkey on success * NULL on error */ -static HKEY WINSPOOL_OpenDriverReg( LPCVOID pEnvironment, BOOL unicode) +static HKEY WINSPOOL_OpenDriverReg( LPCVOID pEnvironment) { HKEY retval = NULL; LPWSTR buffer; const printenv_t * env; - TRACE("(%s, %d)\n", - (unicode) ? debugstr_w(pEnvironment) : debugstr_a(pEnvironment), unicode); + TRACE("(%s)\n", debugstr_w(pEnvironment)); - if (!pEnvironment || unicode) { - /* pEnvironment was NULL or a 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, pEnvironment, -1, NULL, 0); - buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (buffer) MultiByteToWideChar(CP_ACP, 0, pEnvironment, -1, buffer, len); - env = validate_envW(buffer); - HeapFree(GetProcessHeap(), 0, buffer); - } + env = validate_envW(pEnvironment); if (!env) return NULL; buffer = HeapAlloc( GetProcessHeap(), 0, @@ -2275,7 +2261,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) } RegCloseKey(hkeyPrinter); } - hkeyDrivers = WINSPOOL_OpenDriverReg( NULL, TRUE); + hkeyDrivers = WINSPOOL_OpenDriverReg(NULL); if(!hkeyDrivers) { ERR("Can't create Drivers key\n"); RegCloseKey(hkeyPrinters); @@ -4304,7 +4290,7 @@ static BOOL WINSPOOL_GetPrinterDriver(HANDLE hPrinter, LPCWSTR pEnvironment, return FALSE; } - hkeyDrivers = WINSPOOL_OpenDriverReg( pEnvironment, TRUE); + hkeyDrivers = WINSPOOL_OpenDriverReg(pEnvironment); if(!hkeyDrivers) { ERR("Can't create Drivers key\n"); return FALSE; @@ -4669,7 +4655,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, *pcbNeeded = 0; *pcReturned = 0; - hkeyDrivers = WINSPOOL_OpenDriverReg(pEnvironment, TRUE); + hkeyDrivers = WINSPOOL_OpenDriverReg(pEnvironment); if(!hkeyDrivers) { ERR("Can't open Drivers key\n"); return FALSE; @@ -6163,7 +6149,7 @@ BOOL WINAPI DeletePrinterDriverExW( LPWSTR pName, LPWSTR pEnvironment, return FALSE; } - hkey_drivers = WINSPOOL_OpenDriverReg(pEnvironment, TRUE); + hkey_drivers = WINSPOOL_OpenDriverReg(pEnvironment); if(!hkey_drivers) {

1 0

Jeremy White : winspool: Remove unvarying unicode parameter from WINSPOOL_EnumPrinters.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 4c136a5df3c25d4404fa69227fdfe9bcf595b6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c136a5df3c25d4404fa69227… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Nov 30 17:04:09 2009 -0600 winspool: Remove unvarying unicode parameter from WINSPOOL_EnumPrinters. --- dlls/winspool.drv/info.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f1a956d..37a2bf7 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3720,14 +3720,14 @@ BOOL WINAPI GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, } /***************************************************************************** - * WINSPOOL_EnumPrinters + * WINSPOOL_EnumPrintersW * - * Implementation of EnumPrintersA|W + * Implementation of EnumPrintersW */ -static BOOL WINSPOOL_EnumPrinters(DWORD dwType, LPWSTR lpszName, +static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName, DWORD dwLevel, LPBYTE lpbPrinters, DWORD cbBuf, LPDWORD lpdwNeeded, - LPDWORD lpdwReturned, BOOL unicode) + LPDWORD lpdwReturned) { HKEY hkeyPrinters, hkeyPrinter; @@ -3824,25 +3824,25 @@ static BOOL WINSPOOL_EnumPrinters(DWORD dwType, LPWSTR lpszName, switch(dwLevel) { case 1: WINSPOOL_GetPrinter_1(hkeyPrinter, (PRINTER_INFO_1W *)pi, buf, - left, &needed, unicode); + left, &needed, TRUE); used += needed; if(pi) pi += sizeof(PRINTER_INFO_1W); break; case 2: WINSPOOL_GetPrinter_2(hkeyPrinter, (PRINTER_INFO_2W *)pi, buf, - left, &needed, unicode); + left, &needed, TRUE); used += needed; if(pi) pi += sizeof(PRINTER_INFO_2W); break; case 4: WINSPOOL_GetPrinter_4(hkeyPrinter, (PRINTER_INFO_4W *)pi, buf, - left, &needed, unicode); + left, &needed, TRUE); used += needed; if(pi) pi += sizeof(PRINTER_INFO_4W); break; case 5: WINSPOOL_GetPrinter_5(hkeyPrinter, (PRINTER_INFO_5W *)pi, buf, - left, &needed, unicode); + left, &needed, TRUE); used += needed; if(pi) pi += sizeof(PRINTER_INFO_5W); break; @@ -3932,8 +3932,8 @@ BOOL WINAPI EnumPrintersW( LPDWORD lpdwReturned /* [out] number of entries returned */ ) { - return WINSPOOL_EnumPrinters(dwType, lpszName, dwLevel, lpbPrinters, cbBuf, - lpdwNeeded, lpdwReturned, TRUE); + return WINSPOOL_EnumPrintersW(dwType, lpszName, dwLevel, lpbPrinters, cbBuf, + lpdwNeeded, lpdwReturned); } /******************************************************************

1 0

Jeremy White : winspool: Add modest tests for GetPrinter.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 91678ff9e9c15a9eee29571decb2e729009c5b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91678ff9e9c15a9eee29571de… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Nov 30 17:04:19 2009 -0600 winspool: Add modest tests for GetPrinter. --- dlls/winspool.drv/tests/info.c | 80 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 0e12b07..bbf4642 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -71,6 +71,7 @@ static BOOL (WINAPI * pSetDefaultPrinterA)(LPCSTR); static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); static BOOL (WINAPI * pAddPortExA)(LPSTR, DWORD, LPBYTE, LPSTR); static BOOL (WINAPI * pGetPrinterDriverW)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD); +static BOOL (WINAPI * pGetPrinterW)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD); /* ################################ */ @@ -2212,6 +2213,83 @@ static void test_XcvDataW_PortIsValid(void) /* ########################### */ +static void test_GetPrinter(void) +{ + HANDLE hprn; + BOOL ret; + BYTE *buf; + INT level; + DWORD needed, filled; + + if (!default_printer) + { + skip("There is no default printer installed\n"); + return; + } + + hprn = 0; + ret = OpenPrinter(default_printer, &hprn, NULL); + if (!ret) + { + skip("Unable to open the default printer (%s)\n", default_printer); + return; + } + ok(hprn != 0, "wrong hprn %p\n", hprn); + + for (level = 1; level <= 9; level++) + { + SetLastError(0xdeadbeef); + needed = (DWORD)-1; + ret = GetPrinter(hprn, level, NULL, 0, &needed); + ok(!ret, "level %d: GetPrinter should fail\n", level); + /* Not all levels are supported on all Windows-Versions */ + if(GetLastError() == ERROR_INVALID_LEVEL) continue; + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %d\n", GetLastError()); + ok(needed > 0,"not expected needed buffer size %d\n", needed); + + /* GetPrinterA returns the same number of bytes as GetPrinterW */ + if (! ret && pGetPrinterW && level != 6 && level != 7) + { + DWORD double_needed; + ret = pGetPrinterW(hprn, level, NULL, 0, &double_needed); + todo_wine + ok(double_needed == needed, "level %d: GetPrinterA returned different size %d than GetPrinterW (%d)\n", level, needed, double_needed); + } + + buf = HeapAlloc(GetProcessHeap(), 0, needed); + + SetLastError(0xdeadbeef); + filled = -1; + ret = GetPrinter(hprn, level, buf, needed, &filled); + if (level == 7 && needed == sizeof(PRINTER_INFO_7A)) + { + todo_wine + ok(ret, "level %d: GetPrinter error %d\n", level, GetLastError()); + } + else + ok(needed == filled, "needed %d != filled %d\n", needed, filled); + + if (level == 2) + { + PRINTER_INFO_2 *pi_2 = (PRINTER_INFO_2 *)buf; + + ok(pi_2->pPrinterName!= NULL, "not expected NULL ptr\n"); + ok(pi_2->pDriverName!= NULL, "not expected NULL ptr\n"); + + trace("pPrinterName %s\n", pi_2->pPrinterName); + trace("pDriverName %s\n", pi_2->pDriverName); + } + + HeapFree(GetProcessHeap(), 0, buf); + } + + SetLastError(0xdeadbeef); + ret = ClosePrinter(hprn); + ok(ret, "ClosePrinter error %d\n", GetLastError()); +} + +/* ########################### */ + static void test_GetPrinterDriver(void) { HANDLE hprn; @@ -2547,6 +2625,7 @@ START_TEST(info) pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA"); pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); pGetPrinterDriverW = (void *) GetProcAddress(hwinspool, "GetPrinterDriverW"); + pGetPrinterW = (void *) GetProcAddress(hwinspool, "GetPrinterW"); pXcvDataW = (void *) GetProcAddress(hwinspool, "XcvDataW"); pAddPortExA = (void *) GetProcAddress(hwinspool, "AddPortExA"); @@ -2573,6 +2652,7 @@ START_TEST(info) test_GetPrinterDriverDirectory(); test_GetPrintProcessorDirectory(); test_OpenPrinter(); + test_GetPrinter(); test_GetPrinterDriver(); test_SetDefaultPrinter(); test_XcvDataW_MonitorUI();

1 0

Jeremy White : winspool: Implement GetPrinterA via GetPrinterW, largely to support the eccentricity that GetPrinterA allocates buffers as large as those required by GetPrinterW .
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: eae3c3cacc121d408e33257c5152cc57bafa8780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae3c3cacc121d408e33257c5… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Nov 30 17:04:35 2009 -0600 winspool: Implement GetPrinterA via GetPrinterW, largely to support the eccentricity that GetPrinterA allocates buffers as large as those required by GetPrinterW. --- dlls/winspool.drv/info.c | 89 +++++++++++++++++++++++++++++----------- dlls/winspool.drv/tests/info.c | 1 - 2 files changed, 65 insertions(+), 25 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 37a2bf7..cbd8f27 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1356,6 +1356,51 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW, break; } + case 6: /* 6A and 6W are the same structure */ + break; + + case 7: + { + PRINTER_INFO_7W * piW = (PRINTER_INFO_7W *) pPrintersW; + PRINTER_INFO_7A * piA = (PRINTER_INFO_7A *) out; + + TRACE("(%u) #%u\n", level, id); + if (piW->pszObjectGUID) { + piA->pszObjectGUID = ptr; + len = WideCharToMultiByte(CP_ACP, 0, piW->pszObjectGUID, -1, + ptr, outlen, NULL, NULL); + ptr += len; + outlen -= len; + } + break; + } + + case 9: + { + PRINTER_INFO_9W * piW = (PRINTER_INFO_9W *) pPrintersW; + PRINTER_INFO_9A * piA = (PRINTER_INFO_9A *) out; + LPDEVMODEA dmA; + + TRACE("(%u) #%u\n", level, id); + dmA = DEVMODEdupWtoA(piW->pDevMode); + if (dmA) { + /* align DEVMODEA to a DWORD boundary */ + len = (4 - ( (DWORD_PTR) ptr & 3)) & 3; + ptr += len; + outlen -= len; + + piA->pDevMode = (LPDEVMODEA) ptr; + len = dmA->dmSize + dmA->dmDriverExtra; + memcpy(ptr, dmA, len); + HeapFree(GetProcessHeap(), 0, dmA); + + ptr += len; + outlen -= len; + } + + break; + } + default: FIXME("for level %u\n", level); } @@ -3528,14 +3573,10 @@ static BOOL WINSPOOL_GetPrinter_9(HKEY hkeyPrinter, PRINTER_INFO_9W *pi9, LPBYTE } /***************************************************************************** - * WINSPOOL_GetPrinter - * - * Implementation of GetPrinterA|W. Relies on PRINTER_INFO_*W being - * essentially the same as PRINTER_INFO_*A. i.e. the structure itself is - * just a collection of pointers to strings. + * GetPrinterW [WINSPOOL.@] */ -static BOOL WINSPOOL_GetPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, - DWORD cbBuf, LPDWORD pcbNeeded, BOOL unicode) +BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, + DWORD cbBuf, LPDWORD pcbNeeded) { LPCWSTR name; DWORD size, needed = 0; @@ -3578,7 +3619,7 @@ static BOOL WINSPOOL_GetPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, cbBuf = 0; } ret = WINSPOOL_GetPrinter_2(hkeyPrinter, pi2, ptr, cbBuf, &needed, - unicode); + TRUE); needed += size; break; } @@ -3597,7 +3638,7 @@ static BOOL WINSPOOL_GetPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, cbBuf = 0; } ret = WINSPOOL_GetPrinter_4(hkeyPrinter, pi4, ptr, cbBuf, &needed, - unicode); + TRUE); needed += size; break; } @@ -3618,7 +3659,7 @@ static BOOL WINSPOOL_GetPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, } ret = WINSPOOL_GetPrinter_5(hkeyPrinter, pi5, ptr, cbBuf, &needed, - unicode); + TRUE); needed += size; break; } @@ -3655,7 +3696,7 @@ static BOOL WINSPOOL_GetPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, cbBuf = 0; } - ret = WINSPOOL_GetPrinter_7(hkeyPrinter, pi7, ptr, cbBuf, &needed, unicode); + ret = WINSPOOL_GetPrinter_7(hkeyPrinter, pi7, ptr, cbBuf, &needed, TRUE); needed += size; break; } @@ -3675,7 +3716,7 @@ static BOOL WINSPOOL_GetPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, cbBuf = 0; } - ret = WINSPOOL_GetPrinter_9(hkeyPrinter, pi9, ptr, cbBuf, &needed, unicode); + ret = WINSPOOL_GetPrinter_9(hkeyPrinter, pi9, ptr, cbBuf, &needed, TRUE); needed += size; break; } @@ -3700,23 +3741,23 @@ static BOOL WINSPOOL_GetPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, } /***************************************************************************** - * GetPrinterW [WINSPOOL.@] - */ -BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, - DWORD cbBuf, LPDWORD pcbNeeded) -{ - return WINSPOOL_GetPrinter(hPrinter, Level, pPrinter, cbBuf, pcbNeeded, - TRUE); -} - -/***************************************************************************** * GetPrinterA [WINSPOOL.@] */ BOOL WINAPI GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) { - return WINSPOOL_GetPrinter(hPrinter, Level, pPrinter, cbBuf, pcbNeeded, - FALSE); + BOOL ret; + LPBYTE buf = NULL; + + if (cbBuf) + buf = HeapAlloc(GetProcessHeap(), 0, cbBuf); + + ret = GetPrinterW(hPrinter, Level, buf, cbBuf, pcbNeeded); + if (ret) + convert_printerinfo_W_to_A(pPrinter, buf, Level, cbBuf, 1); + HeapFree(GetProcessHeap(), 0, buf); + + return ret; } /***************************************************************************** diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index bbf4642..42a0fa7 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2252,7 +2252,6 @@ static void test_GetPrinter(void) { DWORD double_needed; ret = pGetPrinterW(hprn, level, NULL, 0, &double_needed); - todo_wine ok(double_needed == needed, "level %d: GetPrinterA returned different size %d than GetPrinterW (%d)\n", level, needed, double_needed); }

1 0

Jeremy White : winspool: When retrieving PRINTER_INFO_7, the lack of a directory service print queue object is represented with a NULL pointer and a successful return , not an error return.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: c5a0f9316d7c1be8b049919811530d5c580450ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a0f9316d7c1be8b04991981… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Nov 30 17:04:50 2009 -0600 winspool: When retrieving PRINTER_INFO_7, the lack of a directory service print queue object is represented with a NULL pointer and a successful return, not an error return. --- dlls/winspool.drv/info.c | 18 ++++++++++-------- dlls/winspool.drv/tests/info.c | 8 +------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index cbd8f27..9ea6443 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3514,16 +3514,18 @@ static BOOL WINSPOOL_GetPrinter_7(HKEY hkeyPrinter, PRINTER_INFO_7W *pi7, LPBYTE *pcbNeeded = 0; - if (WINSPOOL_GetStringFromReg(hkeyPrinter, ObjectGUIDW, ptr, left, &size, unicode)) + if (! WINSPOOL_GetStringFromReg(hkeyPrinter, ObjectGUIDW, ptr, left, &size, unicode)) { - if (space && size <= left) { - pi7->pszObjectGUID = (LPWSTR)ptr; - ptr += size; - left -= size; - } else - space = FALSE; - *pcbNeeded += size; + ptr = NULL; + size = sizeof(pi7->pszObjectGUID); } + if (space && size <= left) { + pi7->pszObjectGUID = (LPWSTR)ptr; + ptr += size; + left -= size; + } else + space = FALSE; + *pcbNeeded += size; if (pi7) { /* We do not have a Directory Service */ pi7->dwAction = DSPRINT_UNPUBLISH; diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 42a0fa7..a39e935 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2260,13 +2260,7 @@ static void test_GetPrinter(void) SetLastError(0xdeadbeef); filled = -1; ret = GetPrinter(hprn, level, buf, needed, &filled); - if (level == 7 && needed == sizeof(PRINTER_INFO_7A)) - { - todo_wine - ok(ret, "level %d: GetPrinter error %d\n", level, GetLastError()); - } - else - ok(needed == filled, "needed %d != filled %d\n", needed, filled); + ok(needed == filled, "needed %d != filled %d\n", needed, filled); if (level == 2) {

1 0

Jeremy White : winspool: Add a test to show size required for EnumPrinterDriversA is the same as W.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: c445761b56467ffb3d7a36a212f9fa817d8aca0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c445761b56467ffb3d7a36a21… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Nov 30 17:05:01 2009 -0600 winspool: Add a test to show size required for EnumPrinterDriversA is the same as W. --- dlls/winspool.drv/tests/info.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index a39e935..1e9f567 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -72,6 +72,7 @@ static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, P static BOOL (WINAPI * pAddPortExA)(LPSTR, DWORD, LPBYTE, LPSTR); static BOOL (WINAPI * pGetPrinterDriverW)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD); static BOOL (WINAPI * pGetPrinterW)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD); +static BOOL (WINAPI * pEnumPrinterDriversW)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); /* ################################ */ @@ -1154,6 +1155,16 @@ static void test_EnumPrinterDrivers(void) continue; } + /* EnumPrinterDriversA returns the same number of bytes as EnumPrinterDriversW */ + if (pEnumPrinterDriversW) + { + DWORD double_needed; + DWORD double_returned; + pEnumPrinterDriversW(NULL, NULL, level, NULL, 0, &double_needed, &double_returned); + todo_wine + ok(double_needed == cbBuf, "level %d: EnumPrinterDriversA returned different size %d than EnumPrinterDriversW (%d)\n", level, cbBuf, double_needed); + } + buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf + 4); if (buffer == NULL) continue; @@ -2618,6 +2629,7 @@ START_TEST(info) pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA"); pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); pGetPrinterDriverW = (void *) GetProcAddress(hwinspool, "GetPrinterDriverW"); + pEnumPrinterDriversW = (void *) GetProcAddress(hwinspool, "EnumPrinterDriversW"); pGetPrinterW = (void *) GetProcAddress(hwinspool, "GetPrinterW"); pXcvDataW = (void *) GetProcAddress(hwinspool, "XcvDataW"); pAddPortExA = (void *) GetProcAddress(hwinspool, "AddPortExA");

1 0

Jeremy White : winspool: Implement GetPrinterDriverA with GetPrinterDriverW , notably using the larger sizes, which fixes a bug in printing with Acrobat Reader 9.2.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 6994b721de670525864ef0b3b8b7ea91d45ae128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6994b721de670525864ef0b3b… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Nov 30 17:05:15 2009 -0600 winspool: Implement GetPrinterDriverA with GetPrinterDriverW, notably using the larger sizes, which fixes a bug in printing with Acrobat Reader 9.2. --- dlls/winspool.drv/info.c | 216 ++++++++++++++++++++++++++++++++++++---- dlls/winspool.drv/tests/info.c | 1 - 2 files changed, 198 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6994b721de670525864ef…

1 0

Jeremy White : winspool: Add a test which shows the flaws in the current all enumeration.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 0506d3cdc0ec6e6af4a7f864cca92b9cc8f94c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0506d3cdc0ec6e6af4a7f864c… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Nov 30 17:05:23 2009 -0600 winspool: Add a test which shows the flaws in the current all enumeration. --- dlls/winspool.drv/tests/info.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index fedfb7e..7d2631f 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1245,6 +1245,15 @@ static void test_EnumPrinterDrivers(void) buffer = HeapAlloc(GetProcessHeap(), 0, pcbNeeded); res = EnumPrinterDriversA(NULL, env_all, 1, buffer, pcbNeeded, &pcbNeeded, &pcReturned); ok(res, "EnumPrinterDriversA failed %u\n", GetLastError()); + if (res && pcReturned > 0) + { + DRIVER_INFO_1 *di_1 = (DRIVER_INFO_1 *)buffer; + todo_wine + ok((LPBYTE) di_1->pName == NULL || (LPBYTE) di_1->pName < buffer || + (LPBYTE) di_1->pName >= (LPBYTE)(di_1 + pcReturned), + "Driver Information not in sequence; pName %p, top of data %p\n", + di_1->pName, di_1 + pcReturned); + } HeapFree(GetProcessHeap(), 0, buffer); }

1 0

Nikolay Sivov : comctl32/treeview: Clean up winproc a bit, move parameter check to handlers.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 277c5139d2f5cf070e6ce5044ce6c0c45dfcd619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277c5139d2f5cf070e6ce5044… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Nov 30 22:03:34 2009 +0300 comctl32/treeview: Clean up winproc a bit, move parameter check to handlers. --- dlls/comctl32/treeview.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index a456e21..a7d71e4 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4879,11 +4879,14 @@ scroll: } static LRESULT -TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam) +TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { short gcWheelDelta; UINT pulScrollLines = 3; + if (wParam & (MK_SHIFT | MK_CONTROL)) + return DefWindowProcW(infoPtr->hwnd, WM_MOUSEWHEEL, wParam, lParam); + if (infoPtr->firstVisible == NULL) return TRUE; @@ -5275,6 +5278,8 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) TRACKMOUSEEVENT trackinfo; TREEVIEW_ITEM * item; + if (!(infoPtr->dwStyle & TVS_TRACKSELECT)) return 0; + /* fill in the TRACKMOUSEEVENT struct */ trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); trackinfo.dwFlags = TME_QUERY; @@ -5314,7 +5319,7 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) } /* Draw themed border */ -static BOOL nc_paint (const TREEVIEW_INFO *infoPtr, HRGN region) +static BOOL TREEVIEW_NCPaint (const TREEVIEW_INFO *infoPtr, HRGN region, LPARAM lParam) { HTHEME theme = GetWindowTheme (infoPtr->hwnd); HDC dc; @@ -5323,7 +5328,8 @@ static BOOL nc_paint (const TREEVIEW_INFO *infoPtr, HRGN region) int cxEdge = GetSystemMetrics (SM_CXEDGE), cyEdge = GetSystemMetrics (SM_CYEDGE); - if (!theme) return FALSE; + if (!theme) + return DefWindowProcW (infoPtr->hwnd, WM_NCPAINT, (WPARAM)region, lParam); GetWindowRect(infoPtr->hwnd, &r); @@ -5506,7 +5512,7 @@ TREEVIEW_KillFocus(const TREEVIEW_INFO *infoPtr) } /* update theme after a WM_THEMECHANGED message */ -static LRESULT theme_changed(const TREEVIEW_INFO *infoPtr) +static LRESULT TREEVIEW_ThemeChanged(const TREEVIEW_INFO *infoPtr) { HTHEME theme = GetWindowTheme (infoPtr->hwnd); CloseThemeData (theme); @@ -5706,10 +5712,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_MouseLeave(infoPtr); case WM_MOUSEMOVE: - if (infoPtr->dwStyle & TVS_TRACKSELECT) - return TREEVIEW_MouseMove(infoPtr, lParam); - else - return 0; + return TREEVIEW_MouseMove(infoPtr, lParam); case WM_NCLBUTTONDOWN: if (infoPtr->hwndEdit) @@ -5717,9 +5720,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) goto def; case WM_NCPAINT: - if (nc_paint (infoPtr, (HRGN)wParam)) - return 0; - goto def; + return TREEVIEW_NCPaint (infoPtr, (HRGN)wParam, lParam); case WM_NOTIFY: return TREEVIEW_Notify(infoPtr, wParam, lParam); @@ -5764,7 +5765,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_HandleTimer(infoPtr, wParam); case WM_THEMECHANGED: - return theme_changed (infoPtr); + return TREEVIEW_ThemeChanged (infoPtr); case WM_VSCROLL: return TREEVIEW_VScroll(infoPtr, wParam); @@ -5772,9 +5773,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* WM_WININICHANGE */ case WM_MOUSEWHEEL: - if (wParam & (MK_SHIFT | MK_CONTROL)) - goto def; - return TREEVIEW_MouseWheel(infoPtr, wParam); + return TREEVIEW_MouseWheel(infoPtr, wParam, lParam); case WM_DRAWITEM: TRACE("drawItem\n");

1 0

Nikolay Sivov : comctl32/treeview: Simplify WM_CHAR handler.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 1804941797c7c895d70a330dab88d345818051f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1804941797c7c895d70a330da… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Nov 30 22:18:59 2009 +0300 comctl32/treeview: Simplify WM_CHAR handler. --- dlls/comctl32/treeview.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index a7d71e4..d762a79 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4451,13 +4451,8 @@ TREEVIEW_SelectItem(TREEVIEW_INFO *infoPtr, INT wParam, HTREEITEM item) * * TREEVIEW_ProcessLetterKeys */ -static INT TREEVIEW_ProcessLetterKeys( - HWND hwnd, /* handle to the window */ - WPARAM charCode, /* the character code, the actual character */ - LPARAM keyData /* key data */ - ) +static INT TREEVIEW_ProcessLetterKeys(TREEVIEW_INFO *infoPtr, WPARAM charCode, LPARAM keyData) { - TREEVIEW_INFO *infoPtr; HTREEITEM nItem; HTREEITEM endidx,idx; TVITEMEXW item; @@ -4465,12 +4460,7 @@ static INT TREEVIEW_ProcessLetterKeys( DWORD timestamp,elapsed; /* simple parameter checking */ - if (!hwnd || !charCode || !keyData) - return 0; - - infoPtr=(TREEVIEW_INFO*)GetWindowLongPtrW(hwnd, 0); - if (!infoPtr) - return 0; + if (!charCode || !keyData) return 0; /* only allow the valid WM_CHARs through */ if (!isalnum(charCode) && @@ -5672,7 +5662,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_SortChildrenCB(infoPtr, (LPTVSORTCB)lParam); case WM_CHAR: - return TREEVIEW_ProcessLetterKeys( hwnd, wParam, lParam ); + return TREEVIEW_ProcessLetterKeys(infoPtr, wParam, lParam); case WM_COMMAND: return TREEVIEW_Command(infoPtr, wParam, lParam);

1 0