November 2006 - Wine-commits

Kai Blin : secur32: Implement NTLM2 encryption.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: d5c0acd0576f26b64186cbf3211e7924a5704851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c0acd0576f26b64186cbf32… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Nov 9 11:31:31 2006 +0100 secur32: Implement NTLM2 encryption. --- dlls/secur32/ntlm.c | 115 ++++++++++++++++++++------------------------------- 1 files changed, 45 insertions(+), 70 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 1bee91b..257562b 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1235,14 +1235,20 @@ static int ntlm_GetTokenBufferIndex(PSec * ntlm_CreateSignature * As both MakeSignature and VerifySignature need this, but different keys * are needed for NTLMv2, the logic goes into a helper function. + * To ensure maximal reusability, we can specify the direction as NTLM_SEND for + * signing/encrypting and NTLM_RECV for verfying/decrypting. When encrypting, + * the signature is encrypted after the message was encrypted, so + * CreateSignature shouldn't do it. In this case, encrypt_sig can be set to + * false. */ static SECURITY_STATUS ntlm_CreateSignature(PNegoHelper helper, PSecBufferDesc pMessage, - int token_idx, SignDirection direction) + int token_idx, SignDirection direction, BOOL encrypt_sig) { ULONG sign_version = 1; UINT i; PBYTE sig; - TRACE("%p, %p, %d, %d\n", helper, pMessage, token_idx, direction); + TRACE("%p, %p, %d, %d, %d\n", helper, pMessage, token_idx, direction, + encrypt_sig); sig = pMessage->pBuffers[token_idx].pvBuffer; @@ -1253,11 +1259,10 @@ static SECURITY_STATUS ntlm_CreateSignat BYTE seq_no[4]; HMAC_MD5_CTX hmac_md5_ctx; - TRACE("Encrypting NTLM2 style\n"); + TRACE("Signing NTLM2 style\n"); if(direction == NTLM_SEND) { - TRACE("Signing for sending\n"); seq_no[0] = (helper->crypt.ntlm2.send_seq_no >> 0) & 0xff; seq_no[1] = (helper->crypt.ntlm2.send_seq_no >> 8) & 0xff; seq_no[2] = (helper->crypt.ntlm2.send_seq_no >> 16) & 0xff; @@ -1265,9 +1270,7 @@ static SECURITY_STATUS ntlm_CreateSignat ++(helper->crypt.ntlm2.send_seq_no); - TRACE("HMACMD5Init...\n"); HMACMD5Init(&hmac_md5_ctx, helper->crypt.ntlm2.send_sign_key, 16); - TRACE("Done\n"); } else { @@ -1281,8 +1284,6 @@ static SECURITY_STATUS ntlm_CreateSignat HMACMD5Init(&hmac_md5_ctx, helper->crypt.ntlm2.recv_sign_key, 16); } - TRACE("Starting the update loop\n"); - HMACMD5Update(&hmac_md5_ctx, seq_no, 4); for( i = 0; i < pMessage->cBuffers; ++i ) { @@ -1293,9 +1294,7 @@ static SECURITY_STATUS ntlm_CreateSignat HMACMD5Final(&hmac_md5_ctx, digest); - TRACE("After HMACMD5Final\n"); - - if(helper->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCHANGE) + if(encrypt_sig && helper->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCHANGE) { if(direction == NTLM_SEND) SECUR32_arc4Process(helper->crypt.ntlm2.send_a4i, digest, 8); @@ -1320,6 +1319,7 @@ static SECURITY_STATUS ntlm_CreateSignat if(helper->neg_flags & NTLMSSP_NEGOTIATE_SIGN) { ULONG crc = 0U; + TRACE("Signing NTLM1 style\n"); for(i=0; i < pMessage->cBuffers; ++i) { @@ -1346,7 +1346,8 @@ static SECURITY_STATUS ntlm_CreateSignat ++(helper->crypt.ntlm.seq_num); - SECUR32_arc4Process(helper->crypt.ntlm.a4i, sig+4, 12); + if(encrypt_sig) + SECUR32_arc4Process(helper->crypt.ntlm.a4i, sig+4, 12); return SEC_E_OK; } @@ -1395,7 +1396,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ma helper = (PNegoHelper)phContext->dwLower; TRACE("Negotiated flags are: 0x%08lx\n", helper->neg_flags); - return ntlm_CreateSignature(helper, pMessage, token_idx, NTLM_SEND); + return ntlm_CreateSignature(helper, pMessage, token_idx, NTLM_SEND, TRUE); } /*********************************************************************** @@ -1454,7 +1455,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ve } } - if((ret = ntlm_CreateSignature(helper, &local_desc, token_idx, NTLM_RECV)) != SEC_E_OK) + if((ret = ntlm_CreateSignature(helper, &local_desc, token_idx, NTLM_RECV, TRUE)) != SEC_E_OK) return ret; if(memcmp(((PBYTE)local_buff[token_idx].pvBuffer) + 8, @@ -1498,8 +1499,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_En ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { PNegoHelper helper; - UINT i; - int token_idx = -1; + int token_idx; TRACE("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); @@ -1515,16 +1515,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_En if(!pMessage || !pMessage->pBuffers || pMessage->cBuffers < 2) return SEC_E_INVALID_TOKEN; - for(i=0; i < pMessage->cBuffers; ++i) - { - if(pMessage->pBuffers[i].BufferType == SECBUFFER_TOKEN) - { - token_idx = i; - break; - } - } - - if(token_idx == -1) + if((token_idx = ntlm_GetTokenBufferIndex(pMessage)) == -1) return SEC_E_INVALID_TOKEN; if(pMessage->pBuffers[token_idx].cbBuffer < 16) @@ -1532,39 +1523,34 @@ static SECURITY_STATUS SEC_ENTRY ntlm_En helper = (PNegoHelper) phContext->dwLower; - if(helper->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) - { - FIXME("Can't handle NTLMv2 encryption yet, aborting\n"); - return SEC_E_UNSUPPORTED_FUNCTION; + if(helper->neg_flags & NTLMSSP_NEGOTIATE_NTLM2 && + helper->neg_flags & NTLMSSP_NEGOTIATE_SEAL) + { + ntlm_CreateSignature(helper, pMessage, token_idx, NTLM_SEND, FALSE); + SECUR32_arc4Process(helper->crypt.ntlm2.send_a4i, + (BYTE *)pMessage->pBuffers[1].pvBuffer, + pMessage->pBuffers[1].cbBuffer); + + if(helper->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCHANGE) + SECUR32_arc4Process(helper->crypt.ntlm2.send_a4i, + ((BYTE *)pMessage->pBuffers[token_idx].pvBuffer)+4, 8); + + + return SEC_E_OK; } else { - PBYTE sig = pMessage->pBuffers[token_idx].pvBuffer; - ULONG crc = 0U; - ULONG sign_version = 1l; + PBYTE sig; + ULONG save_flags; - for(i=0; i < pMessage->cBuffers; ++i) - { - if(pMessage->pBuffers[i].BufferType & SECBUFFER_DATA) - { - crc = ComputeCrc32(pMessage->pBuffers[i].pvBuffer, - pMessage->pBuffers[i].cbBuffer, crc); - } - } + /* EncryptMessage always produces real signatures, so make sure + * NTLMSSP_NEGOTIATE_SIGN is set*/ + save_flags = helper->neg_flags; + helper->neg_flags |= NTLMSSP_NEGOTIATE_SIGN; + ntlm_CreateSignature(helper, pMessage, token_idx, NTLM_SEND, FALSE); + helper->neg_flags = save_flags; - sig[ 0] = (sign_version >> 0) & 0xff; - sig[ 1] = (sign_version >> 8) & 0xff; - sig[ 2] = (sign_version >> 16) & 0xff; - sig[ 3] = (sign_version >> 24) & 0xff; - memset(sig+4, 0, 4); - sig[ 8] = (crc >> 0) & 0xff; - sig[ 9] = (crc >> 8) & 0xff; - sig[10] = (crc >> 16) & 0xff; - sig[11] = (crc >> 24) & 0xff; - sig[12] = (helper->crypt.ntlm.seq_num >> 0) & 0xff; - sig[13] = (helper->crypt.ntlm.seq_num >> 8) & 0xff; - sig[14] = (helper->crypt.ntlm.seq_num >> 16) & 0xff; - sig[15] = (helper->crypt.ntlm.seq_num >> 24) & 0xff; + sig = pMessage->pBuffers[token_idx].pvBuffer; SECUR32_arc4Process(helper->crypt.ntlm.a4i, pMessage->pBuffers[1].pvBuffer, pMessage->pBuffers[1].cbBuffer); @@ -1573,8 +1559,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_En if(helper->neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN || helper->neg_flags == 0) memset(sig+4, 0, 4); - ++(helper->crypt.ntlm.seq_num); - } return SEC_E_OK; @@ -1589,8 +1573,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_De SECURITY_STATUS ret; ULONG ntlmssp_flags_save; PNegoHelper helper; - UINT i; - int token_idx = -1; + int token_idx; TRACE("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); if(!phContext) @@ -1602,15 +1585,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_De if(!pMessage || !pMessage->pBuffers || pMessage->cBuffers < 2) return SEC_E_INVALID_TOKEN; - for(i=0; i < pMessage->cBuffers; ++i) - { - if(pMessage->pBuffers[i].BufferType == SECBUFFER_TOKEN) - { - token_idx = i; - break; - } - } - if(token_idx == -1) + if((token_idx = ntlm_GetTokenBufferIndex(pMessage)) == -1) return SEC_E_INVALID_TOKEN; if(pMessage->pBuffers[token_idx].cbBuffer < 16) @@ -1618,10 +1593,10 @@ static SECURITY_STATUS SEC_ENTRY ntlm_De helper = (PNegoHelper) phContext->dwLower; - if(helper->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) + if(helper->neg_flags & NTLMSSP_NEGOTIATE_NTLM2 && helper->neg_flags & NTLMSSP_NEGOTIATE_SEAL) { - FIXME("Can't handle NTLMv2 encryption yet, aborting\n"); - return SEC_E_UNSUPPORTED_FUNCTION; + SECUR32_arc4Process(helper->crypt.ntlm2.recv_a4i, + pMessage->pBuffers[1].pvBuffer, pMessage->pBuffers[1].cbBuffer); } else {

1 0

Jacek Caban : mshtml: Added QueryStatus(IDM_FONTNAME) implementation.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: cab25424d2bde00dc14a18ff731a55adb7abfede URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab25424d2bde00dc14a18ff7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 10:44:15 2006 +0100 mshtml: Added QueryStatus(IDM_FONTNAME) implementation. --- dlls/mshtml/olecmd.c | 6 +++--- dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index dfeb81d..01c98bb 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -310,7 +310,7 @@ static DWORD query_edit_status(HTMLDocum if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) return OLECMDF_SUPPORTED; - if(This->nscontainer) { + if(This->nscontainer && nscmd) { nsparam = create_nscommand_params(); get_ns_command_state(This->nscontainer, nscmd, nsparam); @@ -636,8 +636,8 @@ static HRESULT WINAPI OleCommandTarget_Q prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; break; case IDM_FONTNAME: - FIXME("CGID_MSHTML: IDM_FONTNAME\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_FONTNAME\n"); + prgCmds[i].cmdf = query_edit_status(This, NULL); break; case IDM_FONTSIZE: FIXME("CGID_MSHTML: IDM_FONTSIZE\n"); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 6b28b13..c643456 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2039,6 +2039,7 @@ static void test_MSHTML_QueryStatus(IUnk if(unk) _unk = unk; else unk = _unk; + test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTNAME, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_BOLD, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf);

1 0

Francois Gouget : include/usp10.h: Add missing include directives.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 3baffa39792e7f534b0a8b03d2dc0d56d0e95f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3baffa39792e7f534b0a8b03d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 9 11:39:54 2006 +0100 include/usp10.h: Add missing include directives. --- include/usp10.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/usp10.h b/include/usp10.h index 79e27bc..9b997c4 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -20,6 +20,11 @@ #ifndef __USP10_H #define __USP10_H +#ifndef __WINESRC__ +# include <windows.h> +#endif +/* FIXME: #include <specstrings.h> */ + #ifdef __cplusplus extern "C" { #endif

1 0

Francois Gouget : include/oledlg.h: Add missing include directives.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 041df966d4ce115fe4fecb16243f97ff05d677d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=041df966d4ce115fe4fecb162… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 9 11:36:42 2006 +0100 include/oledlg.h: Add missing include directives. --- include/oledlg.h | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/include/oledlg.h b/include/oledlg.h index 9cc00f7..29fff5a 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -21,9 +21,18 @@ #ifndef __WINE_OLEDLG_H #define __WINE_OLEDLG_H +#ifndef __WINESRC__ +# include <windows.h> +#endif +#include <shellapi.h> #include <commdlg.h> -#include <prsht.h> #include <ole2.h> +#ifndef __WINESRC__ +# include <string.h> +# include <tchar.h> +#endif +#include <dlgs.h> +#include <prsht.h> #ifdef __cplusplus extern "C" {

1 0

Francois Gouget : include: Add missing include directives to d3d8. h and d3d9.h.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 56f7209a949a1805d80ae0a59e093bbe2857677e URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f7209a949a1805d80ae0a59… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 9 11:29:20 2006 +0100 include: Add missing include directives to d3d8.h and d3d9.h. --- include/d3d8.h | 6 ++++++ include/d3d9.h | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/d3d8.h b/include/d3d8.h index 8b7ea53..3ca310a 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -23,9 +23,15 @@ #ifndef DIRECT3D_VERSION #define DIRECT3D_VERSION 0x0800 #endif +#include <stdlib.h> + #define COM_NO_WINDOWS_H #include <objbase.h> +#ifndef __WINESRC__ +# include <windows.h> +#endif + #include <d3d8types.h> #include <d3d8caps.h> diff --git a/include/d3d9.h b/include/d3d9.h index 2575dbe..c6c3004 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -24,9 +24,15 @@ #ifndef DIRECT3D_VERSION #define DIRECT3D_VERSION 0x0900 #endif +#include <stdlib.h> + #define COM_NO_WINDOWS_H #include <objbase.h> +#ifndef __WINESRC__ +# include <windows.h> +#endif + #include <d3d9types.h> #include <d3d9caps.h>

1 0

Francois Gouget : include/dshow.h: Add missing include directives.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 8a2b4026b9cde30722d7a9d63a689cff49e005d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a2b4026b9cde30722d7a9d63… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 9 11:36:08 2006 +0100 include/dshow.h: Add missing include directives. --- include/dshow.h | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/include/dshow.h b/include/dshow.h index 94dc7db..6513140 100644 --- a/include/dshow.h +++ b/include/dshow.h @@ -21,24 +21,35 @@ #define __DSHOW_INCLUDED__ #define AM_NOVTABLE -#include <windef.h> -#include <wingdi.h> -#include <objbase.h> +#ifndef __WINESRC__ +# include <windows.h> +# include <windowsx.h> +#else +# include <windef.h> +# include <wingdi.h> +# include <objbase.h> +#endif +#include <olectl.h> #include <ddraw.h> #include <mmsystem.h> +/* FIXME: #include <strsafe.h>*/ #ifndef NUMELMS #define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) #endif #include <strmif.h> -/*#include <amvideo.h>*/ -/*#include <amaudio.h>*/ +#include <amvideo.h> +#ifdef DSHOW_USE_AMAUDIO +/* FIXME: #include <amaudio.h>*/ +#endif #include <control.h> -/*#include <evcode.h>*/ +#include <evcode.h> #include <uuids.h> #include <errors.h> +/* FIXME: #include <edevdefs.h> */ #include <audevcod.h> +/* FIXME: #include <dvdevcod.h> */ #ifndef OATRUE #define OATRUE (-1)

1 0

Hwang YunSong(황윤성) : localspl: Added Korean resource.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: aba0d45024027a9343452a6c2c01b3edb7e4c6e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba0d45024027a9343452a6c2… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Nov 9 17:00:51 2006 +0900 localspl: Added Korean resource. --- dlls/localspl/localspl.rc | 1 + dlls/localspl/spl_Ko.rc | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index 299023f..4b60164 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -38,3 +38,4 @@ #include "wine/wine_common_ver.rc" #include "spl_En.rc" #include "spl_De.rc" +#include "spl_Ko.rc" diff --git a/dlls/localspl/spl_Ko.rc b/dlls/localspl/spl_Ko.rc new file mode 100644 index 0000000..b46be3a --- /dev/null +++ b/dlls/localspl/spl_Ko.rc @@ -0,0 +1,29 @@ +/* + * Korean resources for localspl + * + * Copyright 2005 Huw Davies + * Copyright 2006 Detlef Riekenberg + * Copyright 2006 YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "�� Ʈ" + IDS_LOCALMONITOR "�� " +}

1 0

Francois Gouget : include: The PSDK headers don' t define WM_SYSTIMER so we shouldn't either.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: eab56a5abd6f94daeacfd60120e18b111ef47238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab56a5abd6f94daeacfd6012… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 9 11:24:16 2006 +0100 include: The PSDK headers don't define WM_SYSTIMER so we shouldn't either. --- dlls/user/tests/msg.c | 4 ++++ dlls/user/user_private.h | 2 ++ include/winuser.h | 1 - 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 175c5bb..3ddb878 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -42,6 +42,10 @@ #define SWP_NOCLIENTMOVE 0x1000 #define SW_NORMALNA 0xCC /* undoc. flag in MinMaximize */ +#ifndef WM_SYSTIMER +#define WM_SYSTIMER 0x0118 +#endif + #define WND_PARENT_ID 1 #define WND_POPUP_ID 2 #define WND_CHILD_ID 3 diff --git a/dlls/user/user_private.h b/dlls/user/user_private.h index acb1f5a..1a975b4 100644 --- a/dlls/user/user_private.h +++ b/dlls/user/user_private.h @@ -81,6 +81,8 @@ #define USER_HEAP_LIN_ADDR(handle) \ #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr)) +#define WM_SYSTIMER 0x0118 + /* internal messages codes */ enum wine_internal_message { diff --git a/include/winuser.h b/include/winuser.h index 4cb8a47..8015ea2 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1105,7 +1105,6 @@ #define WM_INITDIALOG 0x0110 #define WM_COMMAND 0x0111 #define WM_SYSCOMMAND 0x0112 #define WM_TIMER 0x0113 -#define WM_SYSTIMER 0x0118 /* scroll messages */ #define WM_HSCROLL 0x0114

1 0

Detlef Riekenberg : winspool/tests: Add tests for ConfigurePort.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: ca86c76c8553f083225863e82a4fc9547f914a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca86c76c8553f083225863e82… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 7 00:07:48 2006 +0100 winspool/tests: Add tests for ConfigurePort. --- dlls/winspool.drv/tests/info.c | 69 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index ed11765..89b4a30 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -33,12 +33,16 @@ #define MAGIC_DEAD 0xdeadbeef #define DEFAULT_PRINTER_SIZE 1000 static CHAR does_not_exist_dll[]= "does_not_exists.dll"; +static CHAR does_not_exist[] = "does_not_exists"; static CHAR empty[] = ""; static CHAR env_x86[] = "Windows NT x86"; static CHAR env_win9x_case[] = "windowS 4.0"; static CHAR illegal_name[] = "illegal,name"; static CHAR invalid_env[] = "invalid_env"; static CHAR invalid_server[] = "\\invalid_server"; +static CHAR portname_com1[] = "COM1:"; +static CHAR portname_file[] = "FILE:"; +static CHAR portname_lpt1[] = "LPT1:"; static CHAR version_dll[] = "version.dll"; static CHAR winetest_monitor[] = "winetest"; @@ -323,6 +327,70 @@ #endif /* ########################### */ +static void test_ConfigurePort(void) +{ + DWORD res; + + + SetLastError(0xdeadbeef); + res = ConfigurePortA(NULL, 0, NULL); + RETURN_ON_DEACTIVATED_SPOOLER(res) + /* NT: RPC_X_NULL_REF_POINTER, 9x: ERROR_INVALID_PARAMETER */ + ok( !res && ((GetLastError() == RPC_X_NULL_REF_POINTER) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " \ + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = ConfigurePortA(NULL, 0, empty); + /* Allowed only for (Printer-)Administrators */ + if (!res && (GetLastError() == ERROR_ACCESS_DENIED)) { + trace(" skip tests (ACCESS_DENIED)\n"); + return; + } + /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ + ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " \ + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + + + SetLastError(0xdeadbeef); + res = ConfigurePortA(NULL, 0, does_not_exist); + /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ + ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " \ + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + + + /* Testing-Results: + - Case of Portnames is ignored + - Portname without ":" => NT: ERROR_NOT_SUPPORTED, 9x: Dialog comes up + - Empty Servername (LPT1:) => NT: ERROR_NOT_SUPPORTED, 9x: Dialog comes up + + - Port not present => 9x: ERROR_INVALID_PARAMETER, NT:ERROR_NOT_SUPPORTED + - "FILE:" => 9x:Success, NT:ERROR_CANCELED + - Cancel ("Local Port") => ERROR_CANCELED + - Cancel ("Redirected Port") => Success + */ + if (winetest_interactive > 0) { + SetLastError(0xdeadbeef); + res = ConfigurePortA(NULL, 0, portname_com1); + trace("'%s' returned %d with %d\n", portname_com1, res, GetLastError()); + + SetLastError(0xdeadbeef); + res = ConfigurePortA(NULL, 0, portname_lpt1); + trace("'%s' returned %d with %d\n", portname_lpt1, res, GetLastError()); + + SetLastError(0xdeadbeef); + res = ConfigurePortA(NULL, 0, portname_file); + trace("'%s' returned %d with %d\n", portname_file, res, GetLastError()); + } +} + +/* ########################### */ + static void test_DeleteMonitor(void) { MONITOR_INFO_2A mi2a; @@ -1507,6 +1575,7 @@ START_TEST(info) default_printer = find_default_printer(); test_AddMonitor(); + test_ConfigurePort(); test_DeleteMonitor(); test_DocumentProperties(); test_EnumForms(NULL);

1 0

Detlef Riekenberg : winspool: Implement ConfigurePortA.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 6d88e4352bbcc5f7259519d2290dd7d6a14cfd6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d88e4352bbcc5f7259519d22… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Nov 9 00:04:11 2006 +0100 winspool: Implement ConfigurePortA. --- dlls/winspool.drv/info.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 47f7b81..8759257 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5788,8 +5788,31 @@ BOOL WINAPI AddPrinterDriverExA( LPSTR p */ BOOL WINAPI ConfigurePortA(LPSTR pName, HWND hWnd, LPSTR pPortName) { - FIXME("%s %p %s\n", debugstr_a(pName), hWnd, debugstr_a(pPortName)); - return FALSE; + LPWSTR nameW = NULL; + LPWSTR portW = NULL; + INT len; + DWORD res; + + TRACE("(%s, %p, %s)\n", debugstr_a(pName), hWnd, debugstr_a(pPortName)); + + /* convert servername to unicode */ + if (pName) { + len = MultiByteToWideChar(CP_ACP, 0, pName, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pName, -1, nameW, len); + } + + /* convert portname to unicode */ + if (pPortName) { + len = MultiByteToWideChar(CP_ACP, 0, pPortName, -1, NULL, 0); + portW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pPortName, -1, portW, len); + } + + res = ConfigurePortW(nameW, hWnd, portW); + HeapFree(GetProcessHeap(), 0, nameW); + HeapFree(GetProcessHeap(), 0, portW); + return res; } /******************************************************************************

1 0