February 2007 - Wine-Commits

Francois Gouget : credui: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 4485b4506b6f3057e0c81c93a63abce61d64329b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4485b4506b6f3057e0c81c93a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 7 16:23:38 2007 +0100 credui: Better match the PSDK types and fix the winapi_check warnings. --- dlls/credui/credui_main.c | 2 +- include/wincred.h | 8 ++++---- tools/winapi/win32.api | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 8c21d13..714ec93 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -140,7 +140,7 @@ DWORD WINAPI CredUIPromptForCredentialsW PWSTR pszUsername, ULONG ulUsernameMaxChars, PWSTR pszPassword, - ULONG ulPasswordMaxChars, BOOL *pfSave, + ULONG ulPasswordMaxChars, PBOOL pfSave, DWORD dwFlags) { INT_PTR ret; diff --git a/include/wincred.h b/include/wincred.h index 8f4f1f3..b44a83f 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -87,8 +87,8 @@ typedef struct _CREDUI_INFOW #define CREDUI_FLAGS_USERNAME_TARGET_CREDENTIALS 0x00080000 #define CREDUI_FLAGS_KEEP_USERNAME 0x00100000 -DWORD WINAPI CredUICmdLinePromptForCredentialsW(PCWSTR,PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,BOOL*,DWORD); -DWORD WINAPI CredUICmdLinePromptForCredentialsA(PCSTR,PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,BOOL*,DWORD); +DWORD WINAPI CredUICmdLinePromptForCredentialsW(PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); +DWORD WINAPI CredUICmdLinePromptForCredentialsA(PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); #define CredUICmdLinePromptForCredentials WINELIB_NAME_AW(CredUICmdLinePromptForCredentials) DWORD WINAPI CredUIConfirmCredentialsW(PCWSTR,BOOL); DWORD WINAPI CredUIConfirmCredentialsA(PCSTR,BOOL); @@ -96,8 +96,8 @@ DWORD WINAPI CredUIConfirmCredentialsA(P DWORD WINAPI CredUIParseUserNameW(PCWSTR,PWSTR,ULONG,PWSTR,ULONG); DWORD WINAPI CredUIParseUserNameA(PCSTR,PSTR,ULONG,PSTR,ULONG); #define CredUIParseUserName WINELIB_NAME_AW(CredUIParseUserName) -DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW,PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,BOOL*,DWORD); -DWORD WINAPI CredUIPromptForCredentialsA(PCREDUI_INFOA,PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,BOOL*,DWORD); +DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW,PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); +DWORD WINAPI CredUIPromptForCredentialsA(PCREDUI_INFOA,PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); #define CredUIPromptForCredentials WINELIB_NAME_AW(CredUIPromptForCredentials) DWORD WINAPI CredUIStoreSSOCredW(PCWSTR,PCWSTR,PCWSTR,BOOL); /* Note: no CredUIStoreSSOCredA in PSDK header */ diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index f7d9236..1bca4b2 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -634,6 +634,25 @@ ULONG_PTR LPDWORD PFNPROPSHEETUI +%%credui.dll + +%long + +BOOL +DWORD +ULONG + +%ptr + +PBOOL +PCREDUI_INFOW +PCtxtHandle + +%wstr + +PCWSTR +PWSTR + %%crtdll.dll %long

1 0

Ken Thomases : winecoreaudio.drv: Remove obsolete FIXME.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: d19a789fa24242cc88f92e6eb721897dbfa7fbcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19a789fa24242cc88f92e6eb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 7 10:11:34 2007 -0600 winecoreaudio.drv: Remove obsolete FIXME. --- dlls/winecoreaudio.drv/audio.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 61b2d5c..fcd84db 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1263,8 +1263,6 @@ static DWORD wodReset(WORD wDevID) wwo = &WOutDev[wDevID]; - FIXME("\n"); - /* updates current notify list */ /* if resetting, remove all wave headers and notify client that all headers were completed */ wodHelper_NotifyCompletions(wwo, TRUE);

1 0

Francois Gouget : winsock & ws2_32: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 08734d5ba1a8673c80bc7162353de65b1032aa3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=08734d5ba1a8673c80bc71623… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 7 16:23:11 2007 +0100 winsock & ws2_32: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win16.api | 4 ++-- tools/winapi/win32.api | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api index 20bea75..854ef32 100644 --- a/tools/winapi/win16.api +++ b/tools/winapi/win16.api @@ -1484,7 +1484,7 @@ HWND16 BOOL INT LONG -u_long +WS_u_long %ptr @@ -1520,7 +1520,7 @@ HWND16 INT16 SOCKET16 UINT16 -u_short +WS_u_short %%wintab.dll diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index ee615dd..f7d9236 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5589,6 +5589,10 @@ void %%ws2_32.dll +%short + +WS_u_short + %long BOOL @@ -5600,13 +5604,12 @@ INT SOCKET UINT WORD +WS_socklen_t +WS_u_long WSAESETSERVICEOP WSAEVENT int long -socklen_t -u_long -u_short %ptr @@ -5638,6 +5641,8 @@ LPWSASERVICECLASSINFOW PADDRINFOW * SOCKADDR * WS_fd_set * +WS_u_long * +WS_u_short * int * struct WS_addrinfo * struct WS_addrinfo ** @@ -5646,8 +5651,6 @@ struct WS_protoent * struct WS_servent * struct WS_sockaddr * struct WS_timeval * -u_long * -u_short * %str

1 0

Francois Gouget : clusapi: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: ba0d490b1c4b7e3c69fd6b07fcbb1917e0af75ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0d490b1c4b7e3c69fd6b07f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 7 16:22:19 2007 +0100 clusapi: Better match the PSDK types and fix the winapi_check warnings. This also makes the headers and implementation more consistent. --- include/clusapi.h | 2 +- tools/winapi/win32.api | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/include/clusapi.h b/include/clusapi.h index f79c150..0772b59 100644 --- a/include/clusapi.h +++ b/include/clusapi.h @@ -19,6 +19,6 @@ #ifndef __WINE_CLUSAPI_H #define __WINE_CLUSAPI_H -DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, DWORD *pdwClusterState); +DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState); #endif /* __WINE_CLUSAPI_H */ diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 3c36dca..12c6d08 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -443,6 +443,20 @@ ULONG * PCHAR PCSTR +%%clusapi.dll + +%long + +DWORD + +%ptr + +LPDWORD + +%wstr + +LPCWSTR + %%comcat.dll %long

1 0

Francois Gouget : atl: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 1fbd417ce955fd2abad825616accdd6fe01a47dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbd417ce955fd2abad825616… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 7 16:22:55 2007 +0100 atl: Better match the PSDK types and fix the winapi_check warnings. --- dlls/atl/atl_main.c | 6 +++--- dlls/atl/atlbase.h | 7 ++++--- tools/winapi/win32.api | 24 +++++++++++++++++++++--- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index c64ef46..4e1ea13 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -209,7 +209,7 @@ IUnknown* WINAPI AtlComPtrAssign(IUnknow } -HRESULT WINAPI AtlInternalQueryInterface(LPVOID this, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, LPVOID* ppvObject) +HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject) { int i = 0; HRESULT rc = E_NOINTERFACE; @@ -478,7 +478,7 @@ void WINAPI AtlPixelToHiMetric(const SIZ /*********************************************************************** * AtlModuleAddCreateWndData [ATL.@] */ -void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, LPVOID pvObject) +void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject) { TRACE("(%p, %p, %p)\n", pM, pData, pvObject); @@ -496,7 +496,7 @@ void WINAPI AtlModuleAddCreateWndData(_A * records from the current thread from a list * */ -LPVOID WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM) +void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM) { _AtlCreateWndData **ppData; diff --git a/dlls/atl/atlbase.h b/dlls/atl/atlbase.h index 0aec2e9..ad7acfa 100644 --- a/dlls/atl/atlbase.h +++ b/dlls/atl/atlbase.h @@ -146,12 +146,13 @@ HRESULT WINAPI AtlAxAttachControl(IUnkno HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**); HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*); HRESULT WINAPI AtlFreeMarshalStream(IStream *pStream); -HRESULT WINAPI AtlInternalQueryInterface(LPVOID pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, LPVOID* ppvObject); +HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject); HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream); -void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, LPVOID pvObject); +void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); -LPVOID WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM); +void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM); HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); +HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib); HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW* pM, DWORD dwClsContext, DWORD dwFlags); HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const CLSID* pCLSID); HRESULT WINAPI AtlModuleRegisterTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 12c6d08..ee615dd 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -233,11 +233,13 @@ REFIID %long +ATOM BOOL DWORD HINSTANCE HRESULT HWND +LPARAM %long --pointer @@ -246,27 +248,43 @@ DWORD_PTR %ptr _ATL_INTMAP_ENTRY * -_ATL_MODULEA * _ATL_MODULEW * -_ATL_OBJMAP_ENTRYA * +_ATL_OBJMAP_ENTRYW * _ATL_TERMFUNC * +_ATL_WNDCLASSINFOW * +_AtlCreateWndData * +BSTR * CLSID * +DLGPROC IID * IRegistrar * IStream * IStream ** +ITypeLib ** IUnknown * IUnknown ** LPDWORD -LPVOID LPVOID * REFCLSID REFIID +SIZEL * +WNDPROC * struct _ATL_REGMAP_ENTRY * +void * +void ** %str LPCOLESTR +LPCSTR + +%wstr + +LPCWSTR + +%void + +void %%avicap32.dll

1 0

Francois Gouget : browseui: Add missing '\n's to ok() calls.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 99df8e8db4d2178a3e075dd2a584450cd00a9109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99df8e8db4d2178a3e075dd2a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 7 16:22:33 2007 +0100 browseui: Add missing '\n's to ok() calls. --- dlls/browseui/tests/autocomplete.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index 63e444b..72d8f96 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -281,16 +281,16 @@ void test_ACLMulti() ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); ole_ok(acl->lpVtbl->Expand(acl, exp)); - ok(acl1->expcount == 2, "expcount - expected 1, got %d", acl1->expcount); - ok(acl2->expcount == 0, "expcount - expected 0, got %d", acl2->expcount); + ok(acl1->expcount == 2, "expcount - expected 1, got %d\n", acl1->expcount); + ok(acl2->expcount == 0, "expcount - expected 0, got %d\n", acl2->expcount); acl1->expret = S_FALSE; ole_ok(acl->lpVtbl->Expand(acl, exp)); - ok(acl1->expcount == 3, "expcount - expected 1, got %d", acl1->expcount); - ok(acl2->expcount == 1, "expcount - expected 0, got %d", acl2->expcount); + ok(acl1->expcount == 3, "expcount - expected 1, got %d\n", acl1->expcount); + ok(acl2->expcount == 1, "expcount - expected 0, got %d\n", acl2->expcount); acl1->expret = E_NOTIMPL; ole_ok(acl->lpVtbl->Expand(acl, exp)); - ok(acl1->expcount == 4, "expcount - expected 1, got %d", acl1->expcount); - ok(acl2->expcount == 2, "expcount - expected 0, got %d", acl2->expcount); + ok(acl1->expcount == 4, "expcount - expected 1, got %d\n", acl1->expcount); + ok(acl2->expcount == 2, "expcount - expected 0, got %d\n", acl2->expcount); acl2->expret = E_OUTOFMEMORY; ok(acl->lpVtbl->Expand(acl, exp) == E_OUTOFMEMORY, "Unexpected Expand return\n"); acl2->expret = E_FAIL;

1 0

Francois Gouget : rpcrt4: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 45d5ff01a62443fc227fa86b3d744f4555f8b193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d5ff01a62443fc227fa86b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 7 16:20:45 2007 +0100 rpcrt4: Better match the PSDK types and fix the winapi_check warnings. --- dlls/rpcrt4/ndr_clientserver.c | 6 +++--- dlls/rpcrt4/rpc_epmap.c | 2 +- include/rpcndr.h | 6 +++--- tools/winapi/win32.api | 24 ++++++++++++++++++++---- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index 5977d22..1745b90 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -129,7 +129,7 @@ unsigned char* WINAPI NdrServerInitializ /*********************************************************************** * NdrGetBuffer [RPCRT4.@] */ -unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle) +unsigned char *WINAPI NdrGetBuffer(PMIDL_STUB_MESSAGE stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle) { TRACE("(stubmsg == ^%p, buflen == %u, handle == %p): wild guess.\n", stubmsg, buflen, handle); @@ -150,7 +150,7 @@ unsigned char *WINAPI NdrGetBuffer(MIDL_ /*********************************************************************** * NdrFreeBuffer [RPCRT4.@] */ -void WINAPI NdrFreeBuffer(MIDL_STUB_MESSAGE *pStubMsg) +void WINAPI NdrFreeBuffer(PMIDL_STUB_MESSAGE pStubMsg) { TRACE("(pStubMsg == ^%p): wild guess.\n", pStubMsg); I_RpcFreeBuffer(pStubMsg->RpcMsg); @@ -161,7 +161,7 @@ void WINAPI NdrFreeBuffer(MIDL_STUB_MESS /************************************************************************ * NdrSendReceive [RPCRT4.@] */ -unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer ) +unsigned char *WINAPI NdrSendReceive( PMIDL_STUB_MESSAGE stubmsg, unsigned char *buffer ) { RPC_STATUS status; diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index ee183f7..45471c1 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -258,7 +258,7 @@ typedef struct twr_t * TowerExplode (RPCRT4.@) */ RPC_STATUS WINAPI TowerExplode( - const twr_t *tower, RPC_SYNTAX_IDENTIFIER *object, RPC_SYNTAX_IDENTIFIER *syntax, + const twr_t *tower, PRPC_SYNTAX_IDENTIFIER object, PRPC_SYNTAX_IDENTIFIER syntax, char **protseq, char **endpoint, char **address) { size_t tower_size; diff --git a/include/rpcndr.h b/include/rpcndr.h index 126091b..2c28020 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -610,11 +610,11 @@ RPCRTAPI void RPC_ENTRY RPCRTAPI unsigned char* RPC_ENTRY NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc ); RPCRTAPI unsigned char* RPC_ENTRY - NdrGetBuffer( MIDL_STUB_MESSAGE *stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle ); + NdrGetBuffer( PMIDL_STUB_MESSAGE stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle ); RPCRTAPI void RPC_ENTRY - NdrFreeBuffer( MIDL_STUB_MESSAGE *pStubMsg ); + NdrFreeBuffer( PMIDL_STUB_MESSAGE pStubMsg ); RPCRTAPI unsigned char* RPC_ENTRY - NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer ); + NdrSendReceive( PMIDL_STUB_MESSAGE stubmsg, unsigned char *buffer ); RPCRTAPI unsigned char * RPC_ENTRY NdrNsGetBuffer( PMIDL_STUB_MESSAGE pStubMsg, ULONG BufferLength, RPC_BINDING_HANDLE Handle ); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 6c5a2f3..3c36dca 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3624,6 +3624,7 @@ RPC_IF_HANDLE RPC_STATUS UINT ULONG +XLAT_SIDE int size_t unsigned char @@ -3649,47 +3650,62 @@ LPTYPEINFO LPUNKNOWN LPVOID LPVOID * -LPWSTR * MIDL_STUB_MESSAGE * NDR_CCONTEXT NDR_CCONTEXT * NDR_RUNDOWN NDR_SCONTEXT PFORMAT_STRING +PFULL_PTR_XLAT_TABLES PMIDL_STUB_DESC PMIDL_STUB_MESSAGE PRPC_MESSAGE PRPC_POLICY PRPCOLEMESSAGE +PRPC_SYNTAX_IDENTIFIER ProxyFileInfo ** REFCLSID REFIID RPC_AUTH_KEY_RETRIEVAL_FN +RPC_AUTH_IDENTITY_HANDLE +RPC_AUTH_IDENTITY_HANDLE * RPC_BINDING_HANDLE * RPC_BINDING_VECTOR * RPC_BINDING_VECTOR ** RPC_BLOCKING_FN +RPC_CSTR * +RPC_EP_INQ_HANDLE * RPC_IF_CALLBACK_FN * +RPC_IF_ID * +RPC_IF_ID_VECTOR ** RPC_MGR_EPV * +RPC_SECURITY_QOS * RPC_STATUS * +RPC_SYNTAX_IDENTIFIER * +RPC_WSTR * UUID * UUID_VECTOR * ULONG * struct IRpcChannelBuffer * struct IRpcStubBuffer * +twr_t * +twr_t ** unsigned char * unsigned char ** -unsigned short * -unsigned short ** void * +void ** %void void +%str + +RPC_CSTR + %wstr -LPWSTR +RPC_WSTR %%rsaenh.dll

1 0

Paul Vriens : wininet/tests: Add a few more tests.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 37eb0955cd2f6df15f36f7c015b292f1c7179e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37eb0955cd2f6df15f36f7c01… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 15:54:30 2007 +0100 wininet/tests: Add a few more tests. --- dlls/wininet/tests/ftp.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index df36db7..3a5fa70 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -253,6 +253,11 @@ static void test_getfile(void) return; } + /* Make sure we start clean */ + + DeleteFileA("should_be_non_existing_deadbeef"); + DeleteFileA("should_also_be_non_existing_deadbeef"); + /* We should have a ftp-connection, try some getting */ /* No remote file */ @@ -260,8 +265,14 @@ static void test_getfile(void) bRet = FtpGetFileA(hFtp, NULL, "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); todo_wine + { ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* Currently Wine always creates the local file (even on failure) which is not correct, hence the test */ + ok (GetFileAttributesA("should_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, + "Local file should not have been created\n"); + } + DeleteFileA("should_be_non_existing_deadbeef"); /* No local file */ SetLastError(0xdeadbeef); @@ -280,6 +291,9 @@ static void test_getfile(void) ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); } + /* Wine passes this test but for the wrong reason */ + ok (GetFileAttributesA("should_be_non_existing_deadbeef") != INVALID_FILE_ATTRIBUTES, + "Local file should have been created\n"); DeleteFileA("should_be_non_existing_deadbeef"); /* Illegal condition flags */ @@ -287,20 +301,25 @@ static void test_getfile(void) bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, 5, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); todo_wine + { ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok (GetFileAttributesA("should_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, + "Local file should not have been created\n"); + } + DeleteFileA("should_be_non_existing_deadbeef"); /* Remote file doesn't exist */ SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "should_be_non_existing_deadbeef", "should_also_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); todo_wine + { ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); - /* Wine currently creates the file (empty though), cater for that */ - todo_wine ok (GetFileAttributesA("should_also_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, "Local file should not have been created\n"); + } DeleteFileA("should_also_be_non_existing_deadbeef"); /* This one should succeed and give us a copy of the 'welcome.msg' file */

1 0

Francois Gouget : credui: Make wincred.h C++ compatible.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 78c874f9825b5981be2e021abc400d19c062fd5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=78c874f9825b5981be2e021ab… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 7 16:23:23 2007 +0100 credui: Make wincred.h C++ compatible. --- include/wincred.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/wincred.h b/include/wincred.h index f66af02..8f4f1f3 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -19,6 +19,10 @@ #ifndef _WINCRED_H_ #define _WINCRED_H_ +#ifdef __cplusplus +extern "C" { +#endif + #ifndef __SECHANDLE_DEFINED__ #define __SECHANDLE_DEFINED__ typedef struct _SecHandle @@ -100,4 +104,8 @@ DWORD WINAPI CredUIStoreSSOCredW(PCWSTR, DWORD WINAPI CredUIReadSSOCredW(PCWSTR,PWSTR*); /* Note: no CredUIReadSSOCredA in PSDK header */ +#ifdef __cplusplus +} +#endif + #endif /* _WINCRED_H_ */

1 0

Paul Vriens : wininet/ftp: Remove unneeded (double) checks.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 70be65b76eb83dce4ff1b47405821c1aa0d251d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70be65b76eb83dce4ff1b4740… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 13:31:11 2007 +0100 wininet/ftp: Remove unneeded (double) checks. --- dlls/wininet/ftp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 68c2e4f..4e99dae 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1685,8 +1685,6 @@ BOOL FTP_FtpRenameFileW( LPWININETFTPSES TRACE("\n"); - assert (WH_HFTPSESSION == lpwfs->hdr.htype); - /* Clear any error information */ INTERNET_SetLastError(0);

1 0