October 2009 - Wine-commits

Owen Rudge : comctl32: Only execute hit test in MouseMove if necessary.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 685fe55f975e9664e04cdf99c752e4f824dbe990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=685fe55f975e9664e04cdf99c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Oct 16 10:20:52 2009 -0500 comctl32: Only execute hit test in MouseMove if necessary. --- dlls/comctl32/listview.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6e73b55..4de9149 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3620,12 +3620,6 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN if (y > infoPtr->rcList.bottom) y = infoPtr->rcList.bottom; - tmp.x = x; - tmp.y = y; - - lvHitTestInfo.pt = tmp; - LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); - if (infoPtr->bMarqueeSelect) { LVITEMW item; @@ -3708,6 +3702,12 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN rect.top = infoPtr->ptClickPos.y - wDragHeight; rect.bottom = infoPtr->ptClickPos.y + wDragHeight; + tmp.x = x; + tmp.y = y; + + lvHitTestInfo.pt = tmp; + LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); + /* reset item marker */ if (infoPtr->nLButtonDownItem != lvHitTestInfo.iItem) infoPtr->nLButtonDownItem = -1;

1 0

Juan Lang : crypt32: Simplify CRYPT_AsnDecodeIntInternal.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 4e300b6defe488feecb36a5cab223c6c78998c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e300b6defe488feecb36a5ca… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 15 15:12:40 2009 -0700 crypt32: Simplify CRYPT_AsnDecodeIntInternal. --- dlls/crypt32/decode.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 9da367b..ede5af2 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3915,38 +3915,40 @@ static BOOL CRYPT_AsnDecodeIntInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { BOOL ret; - BYTE buf[sizeof(CRYPT_INTEGER_BLOB) + sizeof(int)]; - CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)buf; - DWORD size = sizeof(buf); + DWORD dataLen; - blob->pbData = buf + sizeof(CRYPT_INTEGER_BLOB); - ret = CRYPT_AsnDecodeIntegerInternal(pbEncoded, cbEncoded, 0, buf, - &size, pcbDecoded); - if (ret) + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { - if (!pvStructInfo) + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; + if (dataLen > sizeof(int)) + { + SetLastError(CRYPT_E_ASN1_LARGE); + ret = FALSE; + } + else if (!pvStructInfo) *pcbStructInfo = sizeof(int); else if ((ret = CRYPT_DecodeCheckSpace(pcbStructInfo, sizeof(int)))) { int val, i; - if (blob->pbData[blob->cbData - 1] & 0x80) + if (dataLen && pbEncoded[1 + lenBytes] & 0x80) { /* initialize to a negative value to sign-extend */ val = -1; } else val = 0; - for (i = 0; i < blob->cbData; i++) + for (i = 0; i < dataLen; i++) { val <<= 8; - val |= blob->pbData[blob->cbData - i - 1]; + val |= pbEncoded[1 + lenBytes + i]; } memcpy(pvStructInfo, &val, sizeof(int)); } } - else if (GetLastError() == ERROR_MORE_DATA) - SetLastError(CRYPT_E_ASN1_LARGE); return ret; }

1 0

Juan Lang : crypt32: Fix an invalid alignment assumption decoding a subtree 's maximum.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 5f317d702a0d3c15fe6c4274ae68f0ad0b3c93f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f317d702a0d3c15fe6c4274a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 15 15:27:04 2009 -0700 crypt32: Fix an invalid alignment assumption decoding a subtree's maximum. --- dlls/crypt32/decode.c | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index ede5af2..32e61cc 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -4872,7 +4872,8 @@ static BOOL CRYPT_AsnDecodeMaximum(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { - BOOL ret = FALSE; + BOOL ret; + DWORD max, size = sizeof(max); TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo, pcbDecoded); @@ -4887,12 +4888,32 @@ static BOOL CRYPT_AsnDecodeMaximum(const BYTE *pbEncoded, SetLastError(CRYPT_E_ASN1_BADTAG); return FALSE; } - /* The BOOL is implicit: if the integer is present, then it's TRUE */ - ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags, - pvStructInfo ? (BYTE *)pvStructInfo + sizeof(BOOL) : NULL, pcbStructInfo, - pcbDecoded); - if (ret && pvStructInfo) - *(BOOL *)pvStructInfo = TRUE; + if ((ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags, + &max, &size, pcbDecoded))) + { + DWORD bytesNeeded = FINALMEMBERSIZE(CERT_GENERAL_SUBTREE, fMaximum); + + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + CERT_GENERAL_SUBTREE *subtree = (CERT_GENERAL_SUBTREE *) + ((BYTE *)pvStructInfo - offsetof(CERT_GENERAL_SUBTREE, fMaximum)); + + *pcbStructInfo = bytesNeeded; + /* The BOOL is implicit: if the integer is present, then it's + * TRUE. + */ + subtree->fMaximum = TRUE; + subtree->dwMaximum = max; + } + } TRACE("returning %d\n", ret); return ret; } @@ -4909,8 +4930,8 @@ static BOOL CRYPT_AsnDecodeSubtree(const BYTE *pbEncoded, { ASN_CONTEXT | 0, offsetof(CERT_GENERAL_SUBTREE, dwMinimum), CRYPT_AsnDecodeIntInternal, sizeof(DWORD), TRUE, FALSE, 0, 0 }, { ASN_CONTEXT | 1, offsetof(CERT_GENERAL_SUBTREE, fMaximum), - CRYPT_AsnDecodeMaximum, sizeof(BOOL) + sizeof(DWORD), TRUE, FALSE, 0, - 0 }, + CRYPT_AsnDecodeMaximum, FINALMEMBERSIZE(CERT_GENERAL_SUBTREE, fMaximum), + TRUE, FALSE, 0, 0 }, }; CERT_GENERAL_SUBTREE *subtree = pvStructInfo;

1 0

Juan Lang : crypt32: Explicitly pass pointers to blob arrays rather than relying on an invalid alignment assumption .
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 3000bc200aeb1917a8e61b403d5ff2c0dfaacbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3000bc200aeb1917a8e61b403… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 15 16:23:17 2009 -0700 crypt32: Explicitly pass pointers to blob arrays rather than relying on an invalid alignment assumption. --- dlls/crypt32/msg.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 8a88b75..b91e185 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -719,27 +719,22 @@ static BOOL CRYPT_ConstructBlob(CRYPT_DATA_BLOB *out, const CRYPT_DATA_BLOB *in) return ret; } -typedef struct _BlobArray -{ - DWORD cBlobs; - PCRYPT_DATA_BLOB blobs; -} BlobArray; - -static BOOL CRYPT_ConstructBlobArray(BlobArray *out, const BlobArray *in) +static BOOL CRYPT_ConstructBlobArray(DWORD *outCBlobs, + PCRYPT_DATA_BLOB *outPBlobs, DWORD cBlobs, const PCRYPT_DATA_BLOB pBlobs) { BOOL ret = TRUE; - out->cBlobs = in->cBlobs; - if (out->cBlobs) + *outCBlobs = cBlobs; + if (cBlobs) { - out->blobs = CryptMemAlloc(out->cBlobs * sizeof(CRYPT_DATA_BLOB)); - if (out->blobs) + *outPBlobs = CryptMemAlloc(cBlobs * sizeof(CRYPT_DATA_BLOB)); + if (*outPBlobs) { DWORD i; - memset(out->blobs, 0, out->cBlobs * sizeof(CRYPT_DATA_BLOB)); - for (i = 0; ret && i < out->cBlobs; i++) - ret = CRYPT_ConstructBlob(&out->blobs[i], &in->blobs[i]); + memset(*outPBlobs, 0, cBlobs * sizeof(CRYPT_DATA_BLOB)); + for (i = 0; ret && i < cBlobs; i++) + ret = CRYPT_ConstructBlob(&(*outPBlobs)[i], &pBlobs[i]); } else ret = FALSE; @@ -747,6 +742,12 @@ static BOOL CRYPT_ConstructBlobArray(BlobArray *out, const BlobArray *in) return ret; } +typedef struct _BlobArray +{ + DWORD cBlobs; + PCRYPT_DATA_BLOB blobs; +} BlobArray; + static void CRYPT_FreeBlobArray(BlobArray *array) { DWORD i; @@ -765,8 +766,8 @@ static BOOL CRYPT_ConstructAttribute(CRYPT_ATTRIBUTE *out, if (out->pszObjId) { strcpy(out->pszObjId, in->pszObjId); - ret = CRYPT_ConstructBlobArray((BlobArray *)&out->cValue, - (const BlobArray *)&in->cValue); + ret = CRYPT_ConstructBlobArray(&out->cValue, &out->rgValue, + in->cValue, in->rgValue); } else ret = FALSE; @@ -1435,13 +1436,13 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, } } if (ret) - ret = CRYPT_ConstructBlobArray( - (BlobArray *)&msg->msg_data.info->cCertEncoded, - (const BlobArray *)&info->cCertEncoded); + ret = CRYPT_ConstructBlobArray(&msg->msg_data.info->cCertEncoded, + &msg->msg_data.info->rgCertEncoded, info->cCertEncoded, + info->rgCertEncoded); if (ret) - ret = CRYPT_ConstructBlobArray( - (BlobArray *)&msg->msg_data.info->cCrlEncoded, - (const BlobArray *)&info->cCrlEncoded); + ret = CRYPT_ConstructBlobArray(&msg->msg_data.info->cCrlEncoded, + &msg->msg_data.info->rgCrlEncoded, info->cCrlEncoded, + info->rgCrlEncoded); if (!ret) { CSignedEncodeMsg_Close(msg);

1 0

Juan Lang : crypt32: Explicitly pass pointers to blob arrays rather than relying on an invalid alignment assumption .
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 1437d7ccc2b69de5c09e6a857d4b0bfa1a0ef56a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1437d7ccc2b69de5c09e6a857… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 15 16:25:03 2009 -0700 crypt32: Explicitly pass pointers to blob arrays rather than relying on an invalid alignment assumption. --- dlls/crypt32/msg.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index b91e185..825b6da 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -742,19 +742,13 @@ static BOOL CRYPT_ConstructBlobArray(DWORD *outCBlobs, return ret; } -typedef struct _BlobArray -{ - DWORD cBlobs; - PCRYPT_DATA_BLOB blobs; -} BlobArray; - -static void CRYPT_FreeBlobArray(BlobArray *array) +static void CRYPT_FreeBlobArray(DWORD cBlobs, PCRYPT_DATA_BLOB blobs) { DWORD i; - for (i = 0; i < array->cBlobs; i++) - CryptMemFree(array->blobs[i].pbData); - CryptMemFree(array->blobs); + for (i = 0; i < cBlobs; i++) + CryptMemFree(blobs[i].pbData); + CryptMemFree(blobs); } static BOOL CRYPT_ConstructAttribute(CRYPT_ATTRIBUTE *out, @@ -1180,8 +1174,10 @@ static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) CryptMemFree(msg->innerOID); CryptMemFree(msg->data.pbData); - CRYPT_FreeBlobArray((BlobArray *)&msg->msg_data.info->cCertEncoded); - CRYPT_FreeBlobArray((BlobArray *)&msg->msg_data.info->cCrlEncoded); + CRYPT_FreeBlobArray(msg->msg_data.info->cCertEncoded, + msg->msg_data.info->rgCertEncoded); + CRYPT_FreeBlobArray(msg->msg_data.info->cCrlEncoded, + msg->msg_data.info->rgCrlEncoded); for (i = 0; i < msg->msg_data.info->cSignerInfo; i++) CSignerInfo_Free(&msg->msg_data.info->rgSignerInfo[i]); CSignedMsgData_CloseHandles(&msg->msg_data);

1 0

Tony Wasserka : d3dx9: Add tests for ARGB pixel format conversion in D3DXLoadSurfaceFromMemory.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 7f8e4e275db8070743b64c8856e85a5da6773a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8e4e275db8070743b64c885… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Tue Oct 13 14:02:35 2009 +0200 d3dx9: Add tests for ARGB pixel format conversion in D3DXLoadSurfaceFromMemory. --- dlls/d3dx9_36/tests/texture.c | 165 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 156 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f8e4e275db8070743b64…

1 0

Rein Klazes : user32: Handle MN_GETHMENU in PopupMenuWndProc.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: b94f63ef3837f2ea2d7903c1621a0ab7c9ee68cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94f63ef3837f2ea2d7903c16… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Oct 16 13:12:33 2009 +0200 user32: Handle MN_GETHMENU in PopupMenuWndProc. --- dlls/user32/menu.c | 1 + dlls/user32/tests/menu.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index eb96ab4..230e412 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3509,6 +3509,7 @@ static LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, break; case MM_GETMENUHANDLE: + case MN_GETHMENU: return GetWindowLongPtrW( hwnd, 0 ); default: diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index a388103..56535ae 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -150,10 +150,12 @@ static int gflag_initmenupopup, static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { + static HMENU hmenupopup; switch (msg) { case WM_INITMENUPOPUP: gflag_initmenupopup++; + hmenupopup = (HMENU) wparam; break; case WM_ENTERMENULOOP: gflag_entermenuloop++; @@ -229,6 +231,11 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, { ok( lparam || broken(!lparam), /* win9x, nt4 */ "Menu window handle is NULL!\n"); + if( lparam) { + HMENU hmenu = (HMENU)SendMessageA( (HWND)lparam, MN_GETHMENU, 0, 0); + ok( hmenupopup == hmenu, "MN_GETHMENU returns %p expected %p\n", + hmenu, hmenupopup); + } PostMessage(hwnd, WM_CANCELMODE, 0, 0); return TRUE; }

1 0

Detlef Riekenberg : winspool: Fix a copy & paste error in a comment.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: fe4ba50bd96ae4885eb44486703e966568df70e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe4ba50bd96ae4885eb444867… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 16 13:40:39 2009 +0200 winspool: Fix a copy & paste error in a comment. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f0e1de6..b115148 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6755,7 +6755,7 @@ epp_cleanup: * pEnvironment [I] Printing-Environment or NULL (Default) * Level [I] Structure-Level (Only 1 is allowed) * pPPInfo [O] PTR to Buffer that receives the Result - * cbBuf [I] Size of Buffer at pMonitors + * cbBuf [I] Size of Buffer at pPPInfo * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / required for pPPInfo * pcReturned [O] PTR to DWORD that receives the number of Print Processors in pPPInfo *

1 0

Detlef Riekenberg : localspl: Implement fpGetPrintProcessorDirectory.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 065599a4dc20347ef8387e089adf20205c4f7ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=065599a4dc20347ef8387e089… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 16 14:55:20 2009 +0200 localspl: Implement fpGetPrintProcessorDirectory. --- dlls/localspl/provider.c | 72 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 5e4ba31..e032a8e 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -139,6 +139,7 @@ static const WCHAR printersW[] = {'S','y','s','t','e','m','\\', 'P','r','i','n','t','\\', 'P','r','i','n','t','e','r','s',0}; static const WCHAR spooldriversW[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\',0}; +static const WCHAR spoolprtprocsW[] = {'\\','s','p','o','o','l','\\','p','r','t','p','r','o','c','s','\\',0}; static const WCHAR version0_regpathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; static const WCHAR version0_subdirW[] = {'\\','0',0}; static const WCHAR version3_regpathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; @@ -2175,6 +2176,75 @@ epp_cleanup: } /****************************************************************************** + * fpGetPrintProcessorDirectory [exported through PRINTPROVIDOR] + * + * Return the PATH for the Print-Processors + * + * PARAMS + * pName [I] Servername or NULL (this computer) + * pEnvironment [I] Printing-Environment or NULL (Default) + * level [I] Structure-Level (must be 1) + * pPPInfo [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pPPInfo + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / required for pPPInfo + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in pcbNeeded the Bytes required for pPPInfo, if cbBuf is too small + * + * Native Values returned in pPPInfo on Success for this computer: + *| NT(Windows x64): "%winsysdir%\\spool\\PRTPROCS\\x64" + *| NT(Windows NT x86): "%winsysdir%\\spool\\PRTPROCS\\w32x86" + *| NT(Windows 4.0): "%winsysdir%\\spool\\PRTPROCS\\win40" + * + * "%winsysdir%" is the Value from GetSystemDirectoryW() + * + */ +static BOOL WINAPI fpGetPrintProcessorDirectory(LPWSTR pName, LPWSTR pEnvironment, DWORD level, + LPBYTE pPPInfo, DWORD cbBuf, LPDWORD pcbNeeded) +{ + const printenv_t * env; + DWORD needed; + LONG lres; + + TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment), + level, pPPInfo, cbBuf, pcbNeeded); + + *pcbNeeded = 0; + lres = copy_servername_from_name(pName, NULL); + if (lres) { + FIXME("server %s not supported\n", debugstr_w(pName)); + SetLastError(RPC_S_SERVER_UNAVAILABLE); + return FALSE; + } + + env = validate_envW(pEnvironment); + if (!env) + return FALSE; /* ERROR_INVALID_ENVIRONMENT */ + + /* GetSystemDirectoryW returns number of WCHAR including the '\0' */ + needed = GetSystemDirectoryW(NULL, 0); + /* add the Size for the Subdirectories */ + needed += lstrlenW(spoolprtprocsW); + needed += lstrlenW(env->subdir); + needed *= sizeof(WCHAR); /* return-value is size in Bytes */ + + *pcbNeeded = needed; + + if (needed > cbBuf) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + GetSystemDirectoryW((LPWSTR) pPPInfo, cbBuf/sizeof(WCHAR)); + /* add the Subdirectories */ + lstrcatW((LPWSTR) pPPInfo, spoolprtprocsW); + lstrcatW((LPWSTR) pPPInfo, env->subdir); + TRACE("==> %s\n", debugstr_w((LPWSTR) pPPInfo)); + return TRUE; +} + +/****************************************************************************** * fpOpenPrinter [exported through PRINTPROVIDOR] * * Open a Printer / Printserver or a Printer-Object @@ -2298,7 +2368,7 @@ void setup_provider(void) NULL, /* fpDeletePrinterDriver */ NULL, /* fpAddPrintProcessor */ fpEnumPrintProcessors, - NULL, /* fpGetPrintProcessorDirectory */ + fpGetPrintProcessorDirectory, NULL, /* fpDeletePrintProcessor */ NULL, /* fpEnumPrintProcessorDatatypes */ NULL, /* fpStartDocPrinter */

1 0

Detlef Riekenberg : winspool: Use the backend for GetPrintProcessorDirectory and update the tests.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 388aca4b9f28222a5fe756d5e9f26e2205aaaee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=388aca4b9f28222a5fe756d5e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 16 14:56:34 2009 +0200 winspool: Use the backend for GetPrintProcessorDirectory and update the tests. --- dlls/winspool.drv/info.c | 53 ++++++------------------------------- dlls/winspool.drv/tests/info.c | 56 +++++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 67 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index b115148..7dac2b6 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -175,8 +175,6 @@ static const WCHAR Version3_RegPathW[] = {'\\','V','e','r','s','i','o','n','-',' static const WCHAR Version3_SubdirW[] = {'\\','3',0}; static const WCHAR spooldriversW[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\',0}; -static const WCHAR spoolprtprocsW[] = {'\\','s','p','o','o','l','\\','p','r','t','p','r','o','c','s','\\',0}; - static const WCHAR backslashW[] = {'\\',0}; static const WCHAR Configuration_FileW[] = {'C','o','n','f','i','g','u','r','a','t', 'i','o','n',' ','F','i','l','e',0}; @@ -2162,58 +2160,25 @@ BOOL WINAPI GetPrintProcessorDirectoryW(LPWSTR server, LPWSTR env, DWORD level, LPBYTE Info, DWORD cbBuf, LPDWORD pcbNeeded) { - DWORD needed; - const printenv_t * env_t; - - TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(server), - debugstr_w(env), level, Info, cbBuf, pcbNeeded); - if(server != NULL && server[0]) { - FIXME("server not supported: %s\n", debugstr_w(server)); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(server), debugstr_w(env), level, + Info, cbBuf, pcbNeeded); - env_t = validate_envW(env); - if(!env_t) return FALSE; /* environment invalid or unsupported */ + if ((backend == NULL) && !load_backend()) return FALSE; - if(level != 1) { - WARN("(Level: %d) is ignored in win9x\n", level); + if (level != 1) { + /* (Level != 1) is ignored in win9x */ SetLastError(ERROR_INVALID_LEVEL); return FALSE; } - /* GetSystemDirectoryW returns number of WCHAR including the '\0' */ - needed = GetSystemDirectoryW(NULL, 0); - /* add the Size for the Subdirectories */ - needed += lstrlenW(spoolprtprocsW); - needed += lstrlenW(env_t->subdir); - needed *= sizeof(WCHAR); /* return-value is size in Bytes */ - - if(pcbNeeded) *pcbNeeded = needed; - TRACE ("required: 0x%x/%d\n", needed, needed); - if (needed > cbBuf) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - if(pcbNeeded == NULL) { - /* NT: RPC_X_NULL_REF_POINTER, 9x: ignored */ - WARN("(pcbNeeded == NULL) is ignored in win9x\n"); - SetLastError(RPC_X_NULL_REF_POINTER); - return FALSE; - } - if(Info == NULL) { - /* NT: RPC_X_NULL_REF_POINTER, 9x: ERROR_INVALID_PARAMETER */ + if (pcbNeeded == NULL) { + /* (pcbNeeded == NULL) is ignored in win9x */ SetLastError(RPC_X_NULL_REF_POINTER); return FALSE; } - - GetSystemDirectoryW((LPWSTR) Info, cbBuf/sizeof(WCHAR)); - /* add the Subdirectories */ - lstrcatW((LPWSTR) Info, spoolprtprocsW); - lstrcatW((LPWSTR) Info, env_t->subdir); - TRACE(" => %s\n", debugstr_w((LPWSTR) Info)); - return TRUE; + + return backend->fpGetPrintProcessorDirectory(server, env, level, Info, cbBuf, pcbNeeded); } /***************************************************************************** diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index f7e6ed5..37ddd63 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -50,7 +50,7 @@ static CHAR LocalPortA[] = "Local Port"; static CHAR portname_com1[] = "COM1:"; static CHAR portname_file[] = "FILE:"; static CHAR portname_lpt1[] = "LPT1:"; -static CHAR server_does_not_exist[] = "\\does_not_exist"; +static CHAR server_does_not_exist[] = "\\\\does_not_exist"; static CHAR version_dll[] = "version.dll"; static CHAR winetest[] = "winetest"; static CHAR xcv_localport[] = ",XcvMonitor Local Port"; @@ -1628,41 +1628,49 @@ static void test_GetPrintProcessorDirectory(void) pcbNeeded = 0; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA( NULL, NULL, 1, NULL, cbBuf, &pcbNeeded); + /* NT: ERROR_INVALID_USER_BUFFER, 9x: res != 0 */ + ok( (!res && (GetLastError() == ERROR_INVALID_USER_BUFFER)) || + broken(res), + "returned %d with %d (expected '0' with ERROR_INVALID_USER_BUFFER)\n", + res, GetLastError()); } buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA( NULL, NULL, 1, buffer, cbBuf, NULL); /* NT: RPC_X_NULL_REF_POINTER, 9x: res != 0 */ - ok( res || (GetLastError() == RPC_X_NULL_REF_POINTER), - "returned %d with %d (expected '!= 0' or '0' with " - "RPC_X_NULL_REF_POINTER)\n", res, GetLastError()); - + ok( (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) || + broken(res), + "returned %d with %d (expected '0' with RPC_X_NULL_REF_POINTER)\n", + res, GetLastError()); buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA( NULL, NULL, 1, NULL, cbBuf, NULL); /* NT: RPC_X_NULL_REF_POINTER, 9x: res != 0 */ - ok( res || (GetLastError() == RPC_X_NULL_REF_POINTER), - "returned %d with %d (expected '!= 0' or '0' with " - "RPC_X_NULL_REF_POINTER)\n", res, GetLastError()); + ok( (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) || + broken(res), + "returned %d with %d (expected '0' with RPC_X_NULL_REF_POINTER)\n", + res, GetLastError()); - /* with a valid buffer, but level is invalid */ buffer[0] = '\0'; SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA(NULL, NULL, 0, buffer, cbBuf, &pcbNeeded); + /* Level is ignored in win9x*/ + ok( (!res && (GetLastError() == ERROR_INVALID_LEVEL)) || + broken(res && buffer[0]), + "returned %d with %d (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + + buffer[0] = '\0'; + SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(NULL, NULL, 2, buffer, cbBuf, &pcbNeeded); - if (res && buffer[0]) - { - /* Level is ignored in win9x*/ - trace("invalid level (2) was ignored\n"); - } - else - { - ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), - "returned %d with %d (expected '0' with ERROR_INVALID_LEVEL)\n", - res, GetLastError()); - } + /* Level is ignored in win9x*/ + ok( (!res && (GetLastError() == ERROR_INVALID_LEVEL)) || + broken(res && buffer[0]), + "returned %d with %d (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); /* Empty environment is the same as the default environment */ buffer[0] = '\0'; @@ -1703,9 +1711,11 @@ static void test_GetPrintProcessorDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(server_does_not_exist, NULL, 1, buffer, cbBuf*2, &pcbNeeded); - ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %d with %d (expected '0' with ERROR_INVALID_PARAMETER)\n", - res, GetLastError()); + /* NT: RPC_S_SERVER_UNAVAILABLE, 9x: ERROR_INVALID_PARAMETER */ + ok( !res && + (GetLastError() == RPC_S_SERVER_UNAVAILABLE || GetLastError() == ERROR_INVALID_PARAMETER), + "returned %d with %d (expected '0' with RPC_S_SERVER_UNAVAILABLE or " + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); HeapFree(GetProcessHeap(), 0, buffer); }

1 0