December 2009 - Wine-commits

Henri Verbeet : d3d10core: Allow a NULL vertex buffer to be set in IASetVertexBuffers().
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: 03f61decc987a0a5c55da43a42cb843040b9c916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f61decc987a0a5c55da43a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 2 10:41:22 2009 +0100 d3d10core: Allow a NULL vertex buffer to be set in IASetVertexBuffers(). --- dlls/d3d10core/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 6f96218..cfc7dec 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -202,7 +202,8 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *ifac for (i = 0; i < buffer_count; ++i) { IWineD3DDevice_SetStreamSource(This->wined3d_device, start_slot, - ((struct d3d10_buffer *)buffers[i])->wined3d_buffer, offsets[i], strides[i]); + buffers[i] ? ((struct d3d10_buffer *)buffers[i])->wined3d_buffer : NULL, + offsets[i], strides[i]); } }

1 0

Hans Leidekker : wininet: Implement InternetQueryOption( INTERNET_OPTION_DATAFILE_NAME) for ftp file objects.
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: be86c2976bcb42edaf51de5943af6fa51313e75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be86c2976bcb42edaf51de594… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 1 17:01:35 2009 +0100 wininet: Implement InternetQueryOption(INTERNET_OPTION_DATAFILE_NAME) for ftp file objects. --- dlls/wininet/ftp.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ea5b355..48a7a95 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1133,8 +1133,39 @@ static DWORD FTPFILE_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(DWORD); *(DWORD*)buffer = INTERNET_HANDLE_TYPE_FTP_FILE; return ERROR_SUCCESS; - } + case INTERNET_OPTION_DATAFILE_NAME: + { + DWORD required; + ftp_file_t *file = (ftp_file_t *)hdr; + + TRACE("INTERNET_OPTION_DATAFILE_NAME\n"); + + if (!file->cache_file) + { + *size = 0; + return ERROR_INTERNET_ITEM_NOT_FOUND; + } + if (unicode) + { + required = (lstrlenW(file->cache_file) + 1) * sizeof(WCHAR); + if (*size < required) + return ERROR_INSUFFICIENT_BUFFER; + *size = required; + memcpy(buffer, file->cache_file, *size); + return ERROR_SUCCESS; + } + else + { + required = WideCharToMultiByte(CP_ACP, 0, file->cache_file, -1, NULL, 0, NULL, NULL); + if (required > *size) + return ERROR_INSUFFICIENT_BUFFER; + + *size = WideCharToMultiByte(CP_ACP, 0, file->cache_file, -1, buffer, *size, NULL, NULL); + return ERROR_SUCCESS; + } + } + } return INET_QueryOption(option, buffer, size, unicode); }

1 0

Juan Lang : crypt32: Further fix test failures.
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: 9c56314e3d49da01162b49e09557963786e29c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c56314e3d49da01162b49e09… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 1 08:09:30 2009 -0800 crypt32: Further fix test failures. --- dlls/crypt32/tests/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index e4b70eb..4192e11 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3407,7 +3407,7 @@ static ChainCheck chainCheckEmbeddedNullBroken = { { sizeof(chain27) / sizeof(chain27[0]), chain27 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, - CERT_TRUST_HAS_PREFERRED_ISSUER }, + CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS | CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, 1, simpleStatus27Broken },

1 0

Jeremy White : winspool: Revise EnumPrinterDriversW to fix the incorrect handling of 'all'. EnumPrinterDriversA is similarly fixed by using EnumPrinterDriversW.
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: 10e70fbd180f4c2ed6e52d6b1e9b46b51d9f918c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e70fbd180f4c2ed6e52d6b1… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Dec 1 10:46:07 2009 -0600 winspool: Revise EnumPrinterDriversW to fix the incorrect handling of 'all'. EnumPrinterDriversA is similarly fixed by using EnumPrinterDriversW. --- dlls/winspool.drv/info.c | 169 +++++++++++++++++++++++----------------- dlls/winspool.drv/tests/info.c | 2 - 2 files changed, 96 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10e70fbd180f4c2ed6e52…

1 0

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

02 Dec '09

Module: wine Branch: master Commit: 108230c19e400c6f43a5d040fbccd0e917214f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108230c19e400c6f43a5d040f… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Dec 1 10:46:13 2009 -0600 winspool: Remove unvarying unicode parameter from WINSPOOL_GetDriverInfoFromReg. --- dlls/winspool.drv/info.c | 128 ++++++++++++++++------------------------------ 1 files changed, 45 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=108230c19e400c6f43a5d…

1 0

Jeremy White : winspool: Remove unvarying unicode parameter from WINSPOOL_GetPrinter_[1-9].
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: b378e0a3d488b7da62c93b204b503ae7a703cb25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b378e0a3d488b7da62c93b204… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Dec 1 10:46:20 2009 -0600 winspool: Remove unvarying unicode parameter from WINSPOOL_GetPrinter_[1-9]. --- dlls/winspool.drv/info.c | 88 ++++++++++++++++++++------------------------- 1 files changed, 39 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b378e0a3d488b7da62c93…

1 0

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

02 Dec '09

Module: wine Branch: master Commit: c0238d96b413e97133f284a644981e1e31fa8133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0238d96b413e97133f284a64… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Dec 1 10:46:27 2009 -0600 winspool: Remove unvarying unicode parameter from WINSPOOL_GetStringFromReg. --- dlls/winspool.drv/info.c | 96 +++++++++++++++++---------------------------- 1 files changed, 36 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0238d96b413e97133f28…

1 0

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

02 Dec '09

Module: wine Branch: master Commit: 9d549a9c1326637f2a91e5b91ba8a1b8fa7fdd30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d549a9c1326637f2a91e5b91… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Dec 1 10:46:33 2009 -0600 winspool: Remove unvarying unicode parameter from WINSPOOL_GetDefaultDevMode. --- dlls/winspool.drv/info.c | 33 ++++++++++----------------------- 1 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f6d7eb2..694699f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3257,18 +3257,17 @@ static BOOL WINSPOOL_GetStringFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr, static void WINSPOOL_GetDefaultDevMode( LPBYTE ptr, - DWORD buflen, DWORD *needed, - BOOL unicode) + DWORD buflen, DWORD *needed) { - DEVMODEA dm; - static const char szwps[] = "wineps.drv"; + DEVMODEW dm; + static const WCHAR szWwps[] = {'w', 'i', 'n', 'e', 'p', 's', '.', 'd', 'r', 'v', 0 }; /* fill default DEVMODE - should be read from ppd... */ ZeroMemory( &dm, sizeof(dm) ); - memcpy(dm.dmDeviceName,szwps,sizeof szwps); + memcpy(dm.dmDeviceName,szWwps,sizeof szWwps); dm.dmSpecVersion = DM_SPECVERSION; dm.dmDriverVersion = 1; - dm.dmSize = sizeof(DEVMODEA); + dm.dmSize = sizeof(DEVMODEW); dm.dmDriverExtra = 0; dm.dmFields = DM_ORIENTATION | DM_PAPERSIZE | @@ -3308,21 +3307,9 @@ static void WINSPOOL_GetDefaultDevMode( /* dm.dmPanningWidth */ /* dm.dmPanningHeight */ - if(unicode) { - if(buflen >= sizeof(DEVMODEW)) { - DEVMODEW *pdmW = GdiConvertToDevmodeW(&dm); - memcpy(ptr, pdmW, sizeof(DEVMODEW)); - HeapFree(GetProcessHeap(),0,pdmW); - } - *needed = sizeof(DEVMODEW); - } - else - { - if(buflen >= sizeof(DEVMODEA)) { - memcpy(ptr, &dm, sizeof(DEVMODEA)); - } - *needed = sizeof(DEVMODEA); - } + if(buflen >= sizeof(DEVMODEW)) + memcpy(ptr, &dm, sizeof(DEVMODEW)); + *needed = sizeof(DEVMODEW); } /***************************************************************************** @@ -3494,7 +3481,7 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, } else { - WINSPOOL_GetDefaultDevMode(ptr, left, &size, TRUE); + WINSPOOL_GetDefaultDevMode(ptr, left, &size); if(space && size <= left) { pi2->pDevMode = (LPDEVMODEW)ptr; ptr += size; @@ -3692,7 +3679,7 @@ static BOOL WINSPOOL_GetPrinter_9(HKEY hkeyPrinter, PRINTER_INFO_9W *pi9, LPBYTE } else { - WINSPOOL_GetDefaultDevMode(buf, cbBuf, &size, TRUE); + WINSPOOL_GetDefaultDevMode(buf, cbBuf, &size); if(space && size <= cbBuf) { pi9->pDevMode = (LPDEVMODEW)buf; } else

1 0

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

02 Dec '09

Module: wine Branch: master Commit: fa63234b52d32948b4a0aefa9bfd2cb45b2c8d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa63234b52d32948b4a0aefa9… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Dec 1 10:46:41 2009 -0600 winspool: Remove unvarying unicode parameter from WINSPOOL_GetDevModeFromReg. --- dlls/winspool.drv/info.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 694699f..ad99988 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3320,8 +3320,7 @@ static void WINSPOOL_GetDefaultDevMode( */ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr, - DWORD buflen, DWORD *needed, - BOOL unicode) + DWORD buflen, DWORD *needed) { DWORD sz = buflen, type; LONG ret; @@ -3337,13 +3336,11 @@ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, /* ensures that dmSize is not erratically bogus if registry is invalid */ if (ptr && ((DEVMODEA*)ptr)->dmSize < sizeof(DEVMODEA)) ((DEVMODEA*)ptr)->dmSize = sizeof(DEVMODEA); - if(unicode) { - sz += (CCHDEVICENAME + CCHFORMNAME); - if(buflen >= sz) { - DEVMODEW *dmW = GdiConvertToDevmodeW((DEVMODEA*)ptr); - memcpy(ptr, dmW, sz); - HeapFree(GetProcessHeap(),0,dmW); - } + sz += (CCHDEVICENAME + CCHFORMNAME); + if(buflen >= sz) { + DEVMODEW *dmW = GdiConvertToDevmodeW((DEVMODEA*)ptr); + memcpy(ptr, dmW, sz); + HeapFree(GetProcessHeap(),0,dmW); } *needed = sz; return TRUE; @@ -3469,8 +3466,7 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetDevModeFromReg(hkeyPrinter, Default_DevModeW, ptr, left, - &size, TRUE)) { + if(WINSPOOL_GetDevModeFromReg(hkeyPrinter, Default_DevModeW, ptr, left, &size)) { if(space && size <= left) { pi2->pDevMode = (LPDEVMODEW)ptr; ptr += size; @@ -3670,7 +3666,7 @@ static BOOL WINSPOOL_GetPrinter_9(HKEY hkeyPrinter, PRINTER_INFO_9W *pi9, LPBYTE *pcbNeeded = 0; - if(WINSPOOL_GetDevModeFromReg(hkeyPrinter, Default_DevModeW, buf, cbBuf, &size, TRUE)) { + if(WINSPOOL_GetDevModeFromReg(hkeyPrinter, Default_DevModeW, buf, cbBuf, &size)) { if(space && size <= cbBuf) { pi9->pDevMode = (LPDEVMODEW)buf; } else

1 0

Luke Benstead : user32: Implement PrintWindow.
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: 7fc8aed47f09849df0f6524eb9fbdcded8abfb9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc8aed47f09849df0f6524eb… Author: Luke Benstead <kazade(a)gmail.com> Date: Tue Dec 1 17:06:56 2009 +0000 user32: Implement PrintWindow. --- dlls/user32/painting.c | 15 +++++++++++++++ dlls/user32/user32.spec | 2 +- include/winuser.h | 3 +++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 4af522d..883b0c1 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1549,3 +1549,18 @@ BOOL WINAPI ScrollDC( HDC hdc, INT dx, INT dy, const RECT *lprcScroll, { return USER_Driver->pScrollDC( hdc, dx, dy, lprcScroll, lprcClip, hrgnUpdate, lprcUpdate ); } + +/************************************************************************ + * PrintWindow (USER32.@) + * + */ +BOOL WINAPI PrintWindow(HWND hwnd, HDC hdcBlt, UINT nFlags) +{ + UINT flags = PRF_CHILDREN | PRF_ERASEBKGND | PRF_OWNED | PRF_CLIENT; + if(!(nFlags & PW_CLIENTONLY)) + { + flags |= PRF_NONCLIENT; + } + SendMessageW(hwnd, WM_PRINT, (WPARAM)hdcBlt, flags); + return TRUE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 326aedb..8cdc24c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -533,7 +533,7 @@ @ stdcall PostQuitMessage(long) @ stdcall PostThreadMessageA(long long long long) @ stdcall PostThreadMessageW(long long long long) -# @ stub PrintWindow +@ stdcall PrintWindow(long long long) @ stdcall PrivateExtractIconExA(str long ptr ptr long) @ stdcall PrivateExtractIconExW(wstr long ptr ptr long) @ stdcall PrivateExtractIconsA (str long long long ptr ptr long long) diff --git a/include/winuser.h b/include/winuser.h index e6b4741..91fca34 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1493,6 +1493,9 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define ENUM_CURRENT_SETTINGS ((DWORD) -1) #define ENUM_REGISTRY_SETTINGS ((DWORD) -2) +/* Used for PrintWindow */ +#define PW_CLIENTONLY 0x00000001 + /****** Window classes ******/ typedef struct tagCREATESTRUCTA

1 0