April 2012 - Wine-Commits - list.winehq.org

Piotr Caban : jscript: Added Number.toFixed implementation.
by Alexandre Julliard April 19, 2012

April 19, 2012

1 0

Piotr Caban : jscript: Added Number.toExponential implementation.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: c1228eb45f5e390862b6521324bd8f2b62ff2c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1228eb45f5e390862b652132… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 19 15:28:59 2012 +0200 jscript: Added Number.toExponential implementation. --- dlls/jscript/number.c | 107 ++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 15 ++++++ 2 files changed, 120 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 417e9ce..e1ff50c 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -150,6 +150,70 @@ static inline void number_to_fixed(double val, int prec, BSTR *out) *out = str; } +static inline void number_to_exponential(double val, int prec, BSTR *out) +{ + WCHAR buf[NUMBER_DTOA_SIZE], *pbuf; + int dec_point, size, buf_size, exp_size = 1; + BOOL neg = FALSE; + BSTR str; + + if(val < 0) { + neg = TRUE; + val = -val; + } + + buf_size = prec+2; + if(buf_size<2 || buf_size>NUMBER_DTOA_SIZE) + buf_size = NUMBER_DTOA_SIZE; + dtoa(val, buf, buf_size, &dec_point); + buf_size--; + if(prec == -1) + for(; buf_size>1 && buf[buf_size-1]=='0'; buf_size--) + buf[buf_size-1] = 0; + + size = 10; + while(dec_point>=size || dec_point<=-size) { + size *= 10; + exp_size++; + } + + if(buf_size == 1) + size = buf_size+2+exp_size; /* 2 = strlen(e+) */ + else if(prec == -1) + size = buf_size+3+exp_size; /* 3 = strlen(.e+) */ + else + size = prec+4+exp_size; /* 4 = strlen(0.e+) */ + if(neg) + size++; + str = SysAllocStringLen(NULL, size); + + size = 0; + pbuf = buf; + if(neg) + str[size++] = '-'; + str[size++] = *pbuf++; + if(buf_size != 1) { + str[size++] = '.'; + while(*pbuf) + str[size++] = *pbuf++; + for(; prec>buf_size-1; prec--) + str[size++] = '0'; + } + str[size++] = 'e'; + if(dec_point >= 0) { + str[size++] = '+'; + }else { + str[size++] = '-'; + dec_point = -dec_point; + } + for(str[size]='0', size+=exp_size-1; dec_point>0; dec_point/=10) + str[size--] = '0'+dec_point%10; + size += exp_size+1; + str[size] = 0; + + *out = str; +} + /* ECMA-262 3rd Edition 15.7.4.2 */ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) @@ -330,8 +394,47 @@ static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { - FIXME("\n"); - return E_NOTIMPL; + NumberInstance *number; + DOUBLE val; + INT prec = 0; + BSTR str; + HRESULT hres; + + TRACE("\n"); + + if(!(number = number_this(jsthis))) + return throw_type_error(ctx, ei, JS_E_NUMBER_EXPECTED, NULL); + + if(arg_cnt(dp)) { + hres = to_int32(ctx, get_arg(dp, 0), ei, &prec); + if(FAILED(hres)) + return hres; + + if(prec<0 || prec>20) + return throw_range_error(ctx, ei, JS_E_FRACTION_DIGITS_OUT_OF_RANGE, NULL); + } + + val = number->value; + if(isinf(val) || isnan(val)) { + VARIANT v; + + num_set_val(&v, val); + hres = to_string(ctx, &v, ei, &str); + if(FAILED(hres)) + return hres; + }else { + if(!prec) + prec--; + number_to_exponential(val, prec, &str); + } + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = str; + }else { + SysFreeString(str); + } + return S_OK; } static HRESULT Number_toPrecision(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 70b28ef..a0e23fb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1046,6 +1046,21 @@ ok(tmp === "Infinity", "num(1000000000000000128) = " + tmp); tmp = (new Number(0.12345678901234567890123)).toFixed(20); ok(tmp === "0.12345678901234568000", "num(0.12345678901234567890123) = " + tmp); +tmp = (new Number(2)).toExponential(3); +ok(tmp === "2.000e+0", "num(2).toExponential(3) = " + tmp); +tmp = (new Number(1.17e-32)).toExponential(20); +ok(tmp === "1.17000000000000000000e-32", "num(1.17e-32).toExponential(20) = " + tmp); +tmp = (new Number(0)).toExponential(7); +ok(tmp === "0.0000000e+0", "num(0).toExponential(7) = " + tmp); +tmp = (new Number(0)).toExponential(0); +ok(tmp === "0e+0", "num(0).toExponential() = " + tmp); +tmp = (new Number(-13.7567)).toExponential(); +ok(tmp === "-1.37567e+1", "num(-13.7567).toExponential() = " + tmp); +tmp = (new Number(-32.1)).toExponential(); +ok(tmp === "-3.21e+1", "num(-32.1).toExponential() = " + tmp); +tmp = (new Number(4723.4235)).toExponential(); +ok(tmp === "4.7234235e+3", "num(4723.4235).toExponential() = " + tmp); + ok(Number() === 0, "Number() = " + Number()); ok(Number(false) === 0, "Number(false) = " + Number(false)); ok(Number("43") === 43, "Number('43') = " + Number("43"));

1 0

Carlo Bramini : shlwapi: Add NULL checks to StrCpyW and StrCatW.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: f6524a9f77cfad6b2d6c7745cdc8598e50e4bdf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6524a9f77cfad6b2d6c7745c… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Wed Apr 18 21:51:05 2012 +0200 shlwapi: Add NULL checks to StrCpyW and StrCatW. --- dlls/shlwapi/string.c | 6 ++++-- dlls/shlwapi/tests/string.c | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index c65d576..e2f1cba 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -477,7 +477,8 @@ LPWSTR WINAPI StrCatW(LPWSTR lpszStr, LPCWSTR lpszSrc) { TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSrc)); - strcatW(lpszStr, lpszSrc); + if (lpszStr && lpszSrc) + strcatW(lpszStr, lpszSrc); return lpszStr; } @@ -497,7 +498,8 @@ LPWSTR WINAPI StrCpyW(LPWSTR lpszStr, LPCWSTR lpszSrc) { TRACE("(%p,%s)\n", lpszStr, debugstr_w(lpszSrc)); - strcpyW(lpszStr, lpszSrc); + if (lpszStr && lpszSrc) + strcpyW(lpszStr, lpszSrc); return lpszStr; } diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index c918bcc..aac79f8 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -407,16 +407,28 @@ static void test_StrCpyW(void) WCHAR szSrc[256]; WCHAR szBuff[256]; const StrFormatSizeResult* result = StrFormatSize_results; - + LPWSTR lpRes; while(result->value) { MultiByteToWideChar(0,0,result->byte_size_64,-1,szSrc,sizeof(szSrc)/sizeof(WCHAR)); - StrCpyW(szBuff, szSrc); - ok(!StrCmpW(szSrc, szBuff), "Copied string %s wrong\n", result->byte_size_64); + lpRes = StrCpyW(szBuff, szSrc); + ok(!StrCmpW(szSrc, szBuff) && lpRes == szBuff, "Copied string %s wrong\n", result->byte_size_64); result++; } + + /* this test crashes on win2k SP4 */ + /*lpRes = StrCpyW(szBuff, NULL);*/ + /*ok(lpRes == szBuff, "Wrong return value: got %p expected %p\n", lpRes, szBuff);*/ + + /* this test crashes on win2k SP4 */ + /*lpRes = StrCpyW(NULL, szSrc);*/ + /*ok(lpRes == NULL, "Wrong return value: got %p expected NULL\n", lpRes);*/ + + /* this test crashes on win2k SP4 */ + /*lpRes = StrCpyW(NULL, NULL);*/ + /*ok(lpRes == NULL, "Wrong return value: got %p expected NULL\n", lpRes);*/ } static void test_StrChrNW(void)

1 0

Huw Davies : winspool: Add a helper to open a printer's registry key.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: b9bc9a0cf2badb7ec4cd41dd0eb7fdd8c49f32d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9bc9a0cf2badb7ec4cd41dd0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 19 13:43:24 2012 +0100 winspool: Add a helper to open a printer's registry key. --- dlls/winspool.drv/info.c | 79 +++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 49 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9b3c335..1e5aabc 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -995,6 +995,21 @@ static LPCWSTR get_opened_printer_name(HANDLE hprn) return printer->name; } +static DWORD open_printer_reg_key( const WCHAR *name, HKEY *key ) +{ + HKEY printers; + DWORD err; + + *key = NULL; + err = RegCreateKeyW( HKEY_LOCAL_MACHINE, PrintersW, &printers ); + if (err) return err; + + err = RegOpenKeyW( printers, name, key ); + if (err) err = ERROR_INVALID_PRINTER_NAME; + RegCloseKey( printers ); + return err; +} + /****************************************************************** * WINSPOOL_GetOpenedPrinterRegKey * @@ -1002,24 +1017,9 @@ static LPCWSTR get_opened_printer_name(HANDLE hprn) static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) { LPCWSTR name = get_opened_printer_name(hPrinter); - DWORD ret; - HKEY hkeyPrinters; if(!name) return ERROR_INVALID_HANDLE; - - if((ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters)) != - ERROR_SUCCESS) - return ret; - - if(RegOpenKeyW(hkeyPrinters, name, phkey) != ERROR_SUCCESS) - { - ERR("Can't find opened printer %s in registry\n", - debugstr_w(name)); - RegCloseKey(hkeyPrinters); - return ERROR_INVALID_PRINTER_NAME; /* ? */ - } - RegCloseKey(hkeyPrinters); - return ERROR_SUCCESS; + return open_printer_reg_key( name, phkey ); } void WINSPOOL_LoadSystemPrinters(void) @@ -3872,30 +3872,18 @@ static BOOL WINSPOOL_GetPrinter_9(HKEY hkeyPrinter, PRINTER_INFO_9W *pi9, LPBYTE BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) { - LPCWSTR name; - DWORD size, needed = 0; + DWORD size, needed = 0, err; LPBYTE ptr = NULL; - HKEY hkeyPrinter, hkeyPrinters; + HKEY hkeyPrinter; BOOL ret; TRACE("(%p,%d,%p,%d,%p)\n",hPrinter,Level,pPrinter,cbBuf, pcbNeeded); - if (!(name = get_opened_printer_name(hPrinter))) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != - ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - return FALSE; - } - if(RegOpenKeyW(hkeyPrinters, name, &hkeyPrinter) != ERROR_SUCCESS) + err = WINSPOOL_GetOpenedPrinterRegKey( hPrinter, &hkeyPrinter ); + if (err) { - ERR("Can't find opened printer %s in registry\n", debugstr_w(name)); - RegCloseKey(hkeyPrinters); - SetLastError(ERROR_INVALID_PRINTER_NAME); /* ? */ - return FALSE; + SetLastError( err ); + return FALSE; } switch(Level) { @@ -4016,13 +4004,11 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, default: FIXME("Unimplemented level %d\n", Level); SetLastError(ERROR_INVALID_LEVEL); - RegCloseKey(hkeyPrinters); RegCloseKey(hkeyPrinter); return FALSE; } RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); TRACE("returning %d needed = %d\n", ret, needed); if(pcbNeeded) *pcbNeeded = needed; @@ -4559,7 +4545,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, WCHAR DriverName[100]; DWORD ret, type, size, needed = 0; LPBYTE ptr = NULL; - HKEY hkeyPrinter, hkeyPrinters, hkeyDrivers; + HKEY hkeyPrinter, hkeyDrivers; const printenv_t * env; TRACE("(%p,%s,%d,%p,%d,%p)\n",hPrinter,debugstr_w(pEnvironment), @@ -4581,24 +4567,19 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, env = validate_envW(pEnvironment); if (!env) return FALSE; /* SetLastError() is in validate_envW */ - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != - ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - return FALSE; - } - if(RegOpenKeyW(hkeyPrinters, name, &hkeyPrinter) - != ERROR_SUCCESS) { - ERR("Can't find opened printer %s in registry\n", debugstr_w(name)); - RegCloseKey(hkeyPrinters); - SetLastError(ERROR_INVALID_PRINTER_NAME); /* ? */ - return FALSE; + ret = open_printer_reg_key( name, &hkeyPrinter ); + if (ret) + { + ERR( "Can't find opened printer %s in registry\n", debugstr_w(name) ); + SetLastError( ret ); + return FALSE; } + size = sizeof(DriverName); DriverName[0] = 0; ret = RegQueryValueExW(hkeyPrinter, Printer_DriverW, 0, &type, (LPBYTE)DriverName, &size); RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); if(ret != ERROR_SUCCESS) { ERR("Can't get DriverName for printer %s\n", debugstr_w(name)); return FALSE;

1 0

Piotr Caban : wininet: Use the same hashing function as native does.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 9d68333f783b5a99a4c0d3bebd1011375919c2b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d68333f783b5a99a4c0d3beb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 19 13:26:33 2012 +0200 wininet: Use the same hashing function as native does. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 81b9fda..e958d00 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -77,7 +77,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define HASHTABLE_LOCK 2 #define HASHTABLE_FREE 3 #define HASHTABLE_REDR 5 -#define HASHTABLE_FLAG_BITS 4 +#define HASHTABLE_FLAG_BITS 5 #define DWORD_SIG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24)) #define URL_SIGNATURE DWORD_SIG('U','R','L',' ') @@ -1228,7 +1228,7 @@ static DWORD URLCache_HashKey(LPCSTR lpszKey) DWORD i; for (i = 0; i < sizeof(key) / sizeof(key[0]); i++) - key[i] = lookupTable[i]; + key[i] = lookupTable[(*lpszKey + i) & 0xFF]; for (lpszKey++; *lpszKey && ((lpszKey[0] != '/') || (lpszKey[1] != 0)); lpszKey++) {

1 0

Huw Davies : winspool: Simplify the code that checks for deleted printers and have it not call OpenPrinter unless it finds a printer that needs deletion .
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: bd3a941b2059364b0e495f427c37dba1ced4e626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3a941b2059364b0e495f427… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 19 13:43:25 2012 +0100 winspool: Simplify the code that checks for deleted printers and have it not call OpenPrinter unless it finds a printer that needs deletion. --- dlls/winspool.drv/info.c | 105 ++++++++++++++++++++++------------------------ 1 files changed, 50 insertions(+), 55 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 1e5aabc..a2e3f8b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1022,10 +1022,56 @@ static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) return open_printer_reg_key( name, phkey ); } +static void old_printer_check( BOOL delete_phase ) +{ + PRINTER_INFO_5W* pi; + DWORD needed, type, num, delete, i, size; + const DWORD one = 1; + HKEY key; + HANDLE hprn; + + EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return; + + pi = HeapAlloc( GetProcessHeap(), 0, needed ); + EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num ); + for (i = 0; i < num; i++) + { + if (strncmpW( pi[i].pPortName, CUPS_Port, strlenW(CUPS_Port) ) && + strncmpW( pi[i].pPortName, LPR_Port, strlenW(LPR_Port) )) + continue; + + if (open_printer_reg_key( pi[i].pPrinterName, &key )) continue; + + if (!delete_phase) + { + RegSetValueExW( key, May_Delete_Value, 0, REG_DWORD, (LPBYTE)&one, sizeof(one) ); + RegCloseKey( key ); + } + else + { + delete = 0; + size = sizeof( delete ); + RegQueryValueExW( key, May_Delete_Value, NULL, &type, (LPBYTE)&delete, &size ); + RegCloseKey( key ); + if (delete) + { + TRACE( "Deleting old printer %s\n", debugstr_w(pi[i].pPrinterName) ); + if (OpenPrinterW( pi[i].pPrinterName, &hprn, NULL )) + { + DeletePrinter( hprn ); + ClosePrinter( hprn ); + } + DeletePrinterDriverExW( NULL, NULL, pi[i].pPrinterName, 0, 0 ); + } + } + } + HeapFree(GetProcessHeap(), 0, pi); +} + void WINSPOOL_LoadSystemPrinters(void) { HKEY hkey, hkeyPrinters; - HANDLE hprn; DWORD needed, num, i; WCHAR PrinterName[256]; BOOL done = FALSE; @@ -1034,7 +1080,7 @@ void WINSPOOL_LoadSystemPrinters(void) problems later if they don't. If one is found to be missed we create one and set it equal to the name of the key */ if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) == ERROR_SUCCESS) { - if(RegQueryInfoKeyA(hkeyPrinters, NULL, NULL, NULL, &num, NULL, NULL, + if(RegQueryInfoKeyW(hkeyPrinters, NULL, NULL, NULL, &num, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { for(i = 0; i < num; i++) { if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)/sizeof(PrinterName[0])) == ERROR_SUCCESS) { @@ -1050,31 +1096,7 @@ void WINSPOOL_LoadSystemPrinters(void) RegCloseKey(hkeyPrinters); } - /* We want to avoid calling AddPrinter on printers as much as - possible, because on cups printers this will (eventually) lead - to a call to cupsGetPPD which takes forever, even with non-cups - printers AddPrinter takes a while. So we'll tag all printers that - were automatically added last time around, if they still exist - we'll leave them be otherwise we'll delete them. */ - if (EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num) && needed) { - PRINTER_INFO_5A* pi = HeapAlloc(GetProcessHeap(), 0, needed); - if(EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num)) { - for(i = 0; i < num; i++) { - if(pi[i].pPortName == NULL || !strncmp(pi[i].pPortName,"CUPS:", 5) || !strncmp(pi[i].pPortName, "LPR:", 4)) { - if(OpenPrinterA(pi[i].pPrinterName, &hprn, NULL)) { - if(WINSPOOL_GetOpenedPrinterRegKey(hprn, &hkey) == ERROR_SUCCESS) { - DWORD dw = 1; - RegSetValueExW(hkey, May_Delete_Value, 0, REG_DWORD, (LPBYTE)&dw, sizeof(dw)); - RegCloseKey(hkey); - } - ClosePrinter(hprn); - } - } - } - } - HeapFree(GetProcessHeap(), 0, pi); - } - + old_printer_check( FALSE ); #ifdef SONAME_LIBCUPS done = CUPS_LoadPrinters(); @@ -1083,36 +1105,9 @@ void WINSPOOL_LoadSystemPrinters(void) if(!done) /* If we have any CUPS based printers, skip looking for printcap printers */ PRINTCAP_LoadPrinters(); - /* Now enumerate the list again and delete any printers that are still tagged */ - EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num); - if(needed) { - PRINTER_INFO_5A* pi = HeapAlloc(GetProcessHeap(), 0, needed); - if(EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num)) { - for(i = 0; i < num; i++) { - if(pi[i].pPortName == NULL || !strncmp(pi[i].pPortName,"CUPS:", 5) || !strncmp(pi[i].pPortName, "LPR:", 4)) { - if(OpenPrinterA(pi[i].pPrinterName, &hprn, NULL)) { - BOOL delete_driver = FALSE; - if(WINSPOOL_GetOpenedPrinterRegKey(hprn, &hkey) == ERROR_SUCCESS) { - DWORD dw, type, size = sizeof(dw); - if(RegQueryValueExW(hkey, May_Delete_Value, NULL, &type, (LPBYTE)&dw, &size) == ERROR_SUCCESS) { - TRACE("Deleting old printer %s\n", pi[i].pPrinterName); - DeletePrinter(hprn); - delete_driver = TRUE; - } - RegCloseKey(hkey); - } - ClosePrinter(hprn); - if(delete_driver) - DeletePrinterDriverExA(NULL, NULL, pi[i].pPrinterName, 0, 0); - } - } - } - } - HeapFree(GetProcessHeap(), 0, pi); - } + old_printer_check( TRUE ); return; - } /******************************************************************

1 0

Jacek Caban : winhttp: Fixed netconn_recv when read uses both SSL_recv and buffered data.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 9a82f6a812ab4c781a77b6627523e8af6b77fccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a82f6a812ab4c781a77b6627… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 19 13:35:47 2012 +0200 winhttp: Fixed netconn_recv when read uses both SSL_recv and buffered data. --- dlls/winhttp/net.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index c5d3e94..7e8c211 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -809,7 +809,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd } else memcpy( conn->peek_msg, buf, ret ); } - *recvd = ret; + *recvd += ret; return TRUE; #else return FALSE;

1 0

Dmitry Timoshkov : gdiplus: Use StretchBlt instead of GdiAlphaBlend if device doesn' t support alpha blending.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 600cbb78743fceb2f8abf29ebf23aa0ea97254a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=600cbb78743fceb2f8abf29eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 13 14:03:49 2012 +0900 gdiplus: Use StretchBlt instead of GdiAlphaBlend if device doesn't support alpha blending. --- dlls/gdiplus/graphics.c | 63 ++++++++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 31 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2c6c4b2..0845579 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -340,6 +340,30 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, } } +static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_width, INT dst_height, + HDC hdc, INT src_x, INT src_y, INT src_width, INT src_height) +{ + if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + { + TRACE("alpha blending not supported by device, fallback to StretchBlt\n"); + + StretchBlt(graphics->hdc, dst_x, dst_y, dst_width, dst_height, + hdc, src_x, src_y, src_width, src_height, SRCCOPY); + } + else + { + BLENDFUNCTION bf; + + bf.BlendOp = AC_SRC_OVER; + bf.BlendFlags = 0; + bf.SourceConstantAlpha = 255; + bf.AlphaFormat = AC_SRC_ALPHA; + + GdiAlphaBlend(graphics->hdc, dst_x, dst_y, dst_width, dst_height, + hdc, src_x, src_y, src_width, src_height, bf); + } +} + /* Draw non-premultiplied ARGB data to the given graphics object */ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, const BYTE *src, INT src_width, INT src_height, INT src_stride) @@ -370,10 +394,9 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, else { HDC hdc; - HBITMAP hbitmap, old_hbm=NULL; + HBITMAP hbitmap; BITMAPINFOHEADER bih; BYTE *temp_bits; - BLENDFUNCTION bf; hdc = CreateCompatibleDC(0); @@ -395,17 +418,9 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, 4 * src_width, src, src_stride); - old_hbm = SelectObject(hdc, hbitmap); - - bf.BlendOp = AC_SRC_OVER; - bf.BlendFlags = 0; - bf.SourceConstantAlpha = 255; - bf.AlphaFormat = AC_SRC_ALPHA; - - GdiAlphaBlend(graphics->hdc, dst_x, dst_y, src_width, src_height, - hdc, 0, 0, src_width, src_height, bf); - - SelectObject(hdc, old_hbm); + SelectObject(hdc, hbitmap); + gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height, + hdc, 0, 0, src_width, src_height); DeleteDC(hdc); DeleteObject(hbitmap); @@ -918,19 +933,12 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) if (GetClipBox(graphics->hdc, &rc) != NULLREGION) { HDC hdc = CreateCompatibleDC(NULL); - BLENDFUNCTION bf; if (!hdc) break; SelectObject(hdc, bmp); - - bf.BlendOp = AC_SRC_OVER; - bf.BlendFlags = 0; - bf.SourceConstantAlpha = 255; - bf.AlphaFormat = AC_SRC_ALPHA; - - GdiAlphaBlend(graphics->hdc, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, hdc, 0, 0, 1, 1, bf); - + gdi_alpha_blend(graphics, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, + hdc, 0, 0, 1, 1); DeleteDC(hdc); } @@ -3288,15 +3296,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (bitmap->format & (PixelFormatAlpha|PixelFormatPAlpha)) { - BLENDFUNCTION bf; - - bf.BlendOp = AC_SRC_OVER; - bf.BlendFlags = 0; - bf.SourceConstantAlpha = 255; - bf.AlphaFormat = AC_SRC_ALPHA; - - GdiAlphaBlend(graphics->hdc, pti[0].x, pti[0].y, pti[1].x-pti[0].x, pti[2].y-pti[0].y, - hdc, srcx, srcy, srcwidth, srcheight, bf); + gdi_alpha_blend(graphics, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, + hdc, srcx, srcy, srcwidth, srcheight); } else {

1 0

Jacek Caban : winhttp: Use SSL_pending in netconn_query_data_available.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 8b64a2f13cc5cb0d0289039a41de84d5bf21128e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b64a2f13cc5cb0d0289039a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 19 13:36:02 2012 +0200 winhttp: Use SSL_pending in netconn_query_data_available. --- dlls/winhttp/net.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 7e8c211..5ec4e1a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -116,6 +116,7 @@ MAKE_FUNCPTR( SSL_connect ); MAKE_FUNCPTR( SSL_shutdown ); MAKE_FUNCPTR( SSL_write ); MAKE_FUNCPTR( SSL_read ); +MAKE_FUNCPTR( SSL_pending ); MAKE_FUNCPTR( SSL_get_error ); MAKE_FUNCPTR( SSL_get_ex_new_index ); MAKE_FUNCPTR( SSL_get_ex_data ); @@ -459,6 +460,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_shutdown ); LOAD_FUNCPTR( SSL_write ); LOAD_FUNCPTR( SSL_read ); + LOAD_FUNCPTR( SSL_pending ); LOAD_FUNCPTR( SSL_get_error ); LOAD_FUNCPTR( SSL_get_ex_new_index ); LOAD_FUNCPTR( SSL_get_ex_data ); @@ -834,7 +836,7 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) if (conn->secure) { #ifdef SONAME_LIBSSL - if (conn->peek_msg) *available = conn->peek_len; + *available = pSSL_pending( conn->ssl_conn ) + conn->peek_len; #endif return TRUE; }

1 0

Daniel Lehman : oleaut32: Treat years 0 to 29 as 2000 to 2029 in VARIANT_RollUdate.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: cc37abb6589a1aa9862624c77a45b32c9a36dca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc37abb6589a1aa9862624c77… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Apr 18 13:01:56 2012 -0700 oleaut32: Treat years 0 to 29 as 2000 to 2029 in VARIANT_RollUdate. --- dlls/oleaut32/tests/vartest.c | 5 ++++- dlls/oleaut32/variant.c | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index a79481a..770ea5f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1742,7 +1742,10 @@ static void test_SystemTimeToVariantTime(void) ST2DT(2,1,1980,0,0,0,0,TRUE,29222.0); ST2DT(0,1,1980,0,0,0,0,TRUE,29220.0); /* Rolls back to 31 Dec 1899 */ ST2DT(1,13,1980,0,0,0,0,FALSE,29587.0); /* Fails on invalid month */ - ST2DT(31,12,90,0,0,0,0,TRUE,33238.0); /* year < 100 is 1900+year! */ + ST2DT(31,12,90,0,0,0,0,TRUE,33238.0); /* 30 <= year < 100 is 1900+year */ + ST2DT(1,1,30,0,0,0,0,TRUE,10959.0); /* 30 <= year < 100 is 1900+year */ + ST2DT(1,1,29,0,0,0,0,TRUE,47119.0); /* 0 <= year < 30 is 2000+year */ + ST2DT(1,1,0,0,0,0,0,TRUE,36526.0); /* 0 <= year < 30 is 2000+year */ } static void test_dt2st(int line, double dt, INT r, WORD d, WORD m, WORD y, diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 0d1f2cc..2d6e2ce 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1143,8 +1143,11 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) if (iYear > 9999 || iYear < -9999) return E_INVALIDARG; /* Invalid value */ - /* Years < 100 are treated as 1900 + year */ - if (iYear > 0 && iYear < 100) + /* Year 0 to 29 are treated as 2000 + year */ + if (iYear >= 0 && iYear < 30) + iYear += 2000; + /* Remaining years < 100 are treated as 1900 + year */ + else if (iYear >= 30 && iYear < 100) iYear += 1900; iMinute += iSecond / 60;

1 0