January 2008 - Wine-commits

Rob Shearman : rpcrt4: Add an exception handler for stubless object proxies .
by Alexandre Julliard 17 Jan '08

17 Jan '08

Module: wine Branch: master Commit: 6ec9e0c77a7209b40de10532c7c9ee070a6dae56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec9e0c77a7209b40de10532c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 17 12:25:52 2008 +0000 rpcrt4: Add an exception handler for stubless object proxies. --- dlls/rpcrt4/ndr_stubless.c | 158 +++++++++++++++++++++++++++++-------------- 1 files changed, 106 insertions(+), 52 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 4388904..af06fb8 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -38,6 +38,7 @@ #include "rpc.h" #include "rpcproxy.h" +#include "wine/exception.h" #include "wine/debug.h" #include "wine/rpcfc.h" @@ -676,70 +677,123 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma * 4. PROXY_SENDRECEIVE - send/receive buffer * 5. PROXY_UNMARHSAL - unmarshal [out] params from buffer */ - for (phase = PROXY_CALCSIZE; phase <= PROXY_UNMARSHAL; phase++) + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { - TRACE("phase = %d\n", phase); - switch (phase) + __TRY { - case PROXY_GETBUFFER: - /* allocate the buffer */ - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) - NdrProxyGetBuffer(This, &stubMsg); - else if (Oif_flags.HasPipes) - /* NdrGetPipeBuffer(...) */ - FIXME("pipes not supported yet\n"); - else + for (phase = PROXY_CALCSIZE; phase <= PROXY_UNMARSHAL; phase++) + { + TRACE("phase = %d\n", phase); + switch (phase) + { + case PROXY_GETBUFFER: + /* allocate the buffer */ + NdrProxyGetBuffer(This, &stubMsg); + break; + case PROXY_SENDRECEIVE: + /* send the [in] params and receive the [out] and [retval] + * params */ + NdrProxySendReceive(This, &stubMsg); + + /* convert strings, floating point values and endianess into our + * preferred format */ + if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&stubMsg, pFormat); + + break; + case PROXY_CALCSIZE: + case PROXY_MARSHAL: + case PROXY_UNMARSHAL: + if (bV2Format) + client_do_args(&stubMsg, pFormat, phase, number_of_params, + (unsigned char *)&RetVal); + else + client_do_args_old_format(&stubMsg, pFormat, phase, stack_size, + (unsigned char *)&RetVal, + (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)); + break; + default: + ERR("shouldn't reach here. phase %d\n", phase); + break; + } + } + } + __EXCEPT(NULL) + { + RetVal = NdrProxyErrorHandler(GetExceptionCode()); + } + __ENDTRY + } + else + { + /* order of phases: + * 1. PROXY_CALCSIZE - calculate the buffer size + * 2. PROXY_GETBUFFER - allocate the buffer + * 3. PROXY_MARHSAL - marshal [in] params into the buffer + * 4. PROXY_SENDRECEIVE - send/receive buffer + * 5. PROXY_UNMARHSAL - unmarshal [out] params from buffer + */ + for (phase = PROXY_CALCSIZE; phase <= PROXY_UNMARSHAL; phase++) + { + TRACE("phase = %d\n", phase); + switch (phase) { - if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) + case PROXY_GETBUFFER: + /* allocate the buffer */ + if (Oif_flags.HasPipes) + /* NdrGetPipeBuffer(...) */ + FIXME("pipes not supported yet\n"); + else + { + if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) #if 0 - NdrNsGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); + NdrNsGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); #else - FIXME("using auto handle - call NdrNsGetBuffer when it gets implemented\n"); + FIXME("using auto handle - call NdrNsGetBuffer when it gets implemented\n"); #endif + else + NdrGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); + } + break; + case PROXY_SENDRECEIVE: + /* send the [in] params and receive the [out] and [retval] + * params */ + if (Oif_flags.HasPipes) + /* NdrPipesSendReceive(...) */ + FIXME("pipes not supported yet\n"); else - NdrGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); - } - break; - case PROXY_SENDRECEIVE: - /* send the [in] params and receive the [out] and [retval] - * params */ - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) - NdrProxySendReceive(This, &stubMsg); - else if (Oif_flags.HasPipes) - /* NdrPipesSendReceive(...) */ - FIXME("pipes not supported yet\n"); - else - { - if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) + { + if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) #if 0 - NdrNsSendReceive(&stubMsg, stubMsg.Buffer, pStubDesc->IMPLICIT_HANDLE_INFO.pAutoHandle); + NdrNsSendReceive(&stubMsg, stubMsg.Buffer, pStubDesc->IMPLICIT_HANDLE_INFO.pAutoHandle); #else - FIXME("using auto handle - call NdrNsSendReceive when it gets implemented\n"); + FIXME("using auto handle - call NdrNsSendReceive when it gets implemented\n"); #endif - else - NdrSendReceive(&stubMsg, stubMsg.Buffer); - } + else + NdrSendReceive(&stubMsg, stubMsg.Buffer); + } - /* convert strings, floating point values and endianess into our - * preferred format */ - if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) - NdrConvert(&stubMsg, pFormat); + /* convert strings, floating point values and endianess into our + * preferred format */ + if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&stubMsg, pFormat); - break; - case PROXY_CALCSIZE: - case PROXY_MARSHAL: - case PROXY_UNMARSHAL: - if (bV2Format) - client_do_args(&stubMsg, pFormat, phase, number_of_params, - (unsigned char *)&RetVal); - else - client_do_args_old_format(&stubMsg, pFormat, phase, stack_size, - (unsigned char *)&RetVal, - (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)); - break; - default: - ERR("shouldn't reach here. phase %d\n", phase); - break; + break; + case PROXY_CALCSIZE: + case PROXY_MARSHAL: + case PROXY_UNMARSHAL: + if (bV2Format) + client_do_args(&stubMsg, pFormat, phase, number_of_params, + (unsigned char *)&RetVal); + else + client_do_args_old_format(&stubMsg, pFormat, phase, stack_size, + (unsigned char *)&RetVal, + (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)); + break; + default: + ERR("shouldn't reach here. phase %d\n", phase); + break; + } } }

1 0

Rob Shearman : rpcrt4: Only initialise the context handle to NULL in NdrContextHandleUnmarshall if it is an out-only or return one .
by Alexandre Julliard 17 Jan '08

17 Jan '08

Module: wine Branch: master Commit: a4b18699ac6739caf0e089167e3e6d247a44f781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b18699ac6739caf0e089167… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 17 12:26:42 2008 +0000 rpcrt4: Only initialise the context handle to NULL in NdrContextHandleUnmarshall if it is an out-only or return one. Fix the indentation and add tracing of the context handle flags. --- dlls/rpcrt4/ndr_marshall.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 0f415b0..888b150 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6207,6 +6207,7 @@ static unsigned char *WINAPI NdrContextHandleMarshall( ERR("invalid format type %x\n", *pFormat); RpcRaiseException(RPC_S_INTERNAL_ERROR); } + TRACE("flags: 0x%02x\n", pFormat[1]); if (pFormat[1] & 0x80) NdrClientContextMarshall(pStubMsg, *(NDR_CCONTEXT **)pMemory, FALSE); @@ -6225,16 +6226,22 @@ static unsigned char *WINAPI NdrContextHandleUnmarshall( PFORMAT_STRING pFormat, unsigned char fMustAlloc) { + TRACE("pStubMsg %p, ppMemory %p, pFormat %p, fMustAlloc %s\n", pStubMsg, + ppMemory, pFormat, fMustAlloc ? "TRUE": "FALSE"); + if (*pFormat != RPC_FC_BIND_CONTEXT) { ERR("invalid format type %x\n", *pFormat); RpcRaiseException(RPC_S_INTERNAL_ERROR); } + TRACE("flags: 0x%02x\n", pFormat[1]); - **(NDR_CCONTEXT **)ppMemory = NULL; - NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + /* [out]-only or [ret] param */ + if ((pFormat[1] & 0x60) == 0x20) + **(NDR_CCONTEXT **)ppMemory = NULL; + NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); - return NULL; + return NULL; } /***********************************************************************

1 0

Rob Shearman : iphlpapi: Implement GetBestInterfaceEx.
by Alexandre Julliard 17 Jan '08

17 Jan '08

Module: wine Branch: master Commit: a9e967346002253e576285c9af83b0fc41fe47b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e967346002253e576285c9a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 17 12:26:14 2008 +0000 iphlpapi: Implement GetBestInterfaceEx. --- dlls/iphlpapi/iphlpapi.spec | 1 + dlls/iphlpapi/iphlpapi_main.c | 40 +++++++++++++++++++++++++++++++++++----- include/iphlpapi.h | 10 ++++++++++ 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index a9797ac..5ea43c5 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -20,6 +20,7 @@ @ stub GetAdapterOrderMap @ stdcall GetAdaptersInfo( ptr ptr ) @ stdcall GetBestInterface( long ptr ) +@ stdcall GetBestInterfaceEx( ptr ptr ) @ stub GetBestInterfaceFromStack @ stdcall GetBestRoute( long long long ) @ stub GetBestRouteFromStack diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 43ea323..748a74a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -39,9 +39,12 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" +#define USE_WS_PREFIX +#include "winsock2.h" #include "iphlpapi.h" #include "ifenum.h" #include "ipstats.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); @@ -812,17 +815,44 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) */ DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex) { + struct WS_sockaddr_in sa_in; + memset(&sa_in, 0, sizeof(sa_in)); + sa_in.sin_family = AF_INET; + sa_in.sin_addr.S_un.S_addr = dwDestAddr; + return GetBestInterfaceEx((struct WS_sockaddr *)&sa_in, pdwBestIfIndex); +} + +/****************************************************************** + * GetBestInterfaceEx (IPHLPAPI.@) + * + * Get the interface, with the best route for the given IP address. + * + * PARAMS + * dwDestAddr [In] IP address to search the interface for + * pdwBestIfIndex [Out] found best interface + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetBestInterfaceEx(struct WS_sockaddr *pDestAddr, PDWORD pdwBestIfIndex) +{ DWORD ret; - TRACE("dwDestAddr 0x%08lx, pdwBestIfIndex %p\n", dwDestAddr, pdwBestIfIndex); - if (!pdwBestIfIndex) + TRACE("pDestAddr %p, pdwBestIfIndex %p\n", pDestAddr, pdwBestIfIndex); + if (!pDestAddr || !pdwBestIfIndex) ret = ERROR_INVALID_PARAMETER; else { MIB_IPFORWARDROW ipRow; - ret = GetBestRoute(dwDestAddr, 0, &ipRow); - if (ret == ERROR_SUCCESS) - *pdwBestIfIndex = ipRow.dwForwardIfIndex; + if (pDestAddr->sa_family == AF_INET) { + ret = GetBestRoute(((struct WS_sockaddr_in *)pDestAddr)->sin_addr.S_un.S_addr, 0, &ipRow); + if (ret == ERROR_SUCCESS) + *pdwBestIfIndex = ipRow.dwForwardIfIndex; + } else { + FIXME("address family %d not supported\n", pDestAddr->sa_family); + ret = ERROR_NOT_SUPPORTED; + } } TRACE("returning %d\n", ret); return ret; diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 8fa352a..1e64a18 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -94,6 +94,16 @@ DWORD WINAPI GetUniDirectionalAdapterInfo( DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex); +#ifdef __WINE_WINSOCKAPI_STDLIB_H +DWORD WINAPI GetBestInterfaceEx( +#ifdef USE_WS_PREFIX + struct WS_sockaddr *pDestAddr, +#else + struct sockaddr *pDestAddr, +#endif + PDWORD pdwBestIfIndex); +#endif + DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDROW pBestRoute);

1 0

Alexandre Julliard : server: Don't force the process affinity to 1, leave it up to the client.
by Alexandre Julliard 17 Jan '08

17 Jan '08

Module: wine Branch: master Commit: 3bf12b9aca9dc6f32eca0f6f84edafd0276b923d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bf12b9aca9dc6f32eca0f6f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 16 21:02:04 2008 +0100 server: Don't force the process affinity to 1, leave it up to the client. --- dlls/ntdll/process.c | 5 ++++- dlls/ntdll/thread.c | 5 ++++- include/wine/server_protocol.h | 10 +++++----- server/process.c | 8 ++------ server/process.h | 2 +- server/protocol.def | 8 ++++---- server/thread.c | 7 ++----- server/thread.h | 2 +- server/trace.c | 8 ++++---- 9 files changed, 27 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bf12b9aca9dc6f32eca0…

1 0

Marcus Meissner : urlmon: Skip pstgmed related tests if NULL.
by Alexandre Julliard 17 Jan '08

17 Jan '08

Module: wine Branch: master Commit: 61b4b0c362d92e590517f7d5bc6ed87206ba554c URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b4b0c362d92e590517f7d5b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 16 20:03:58 2008 +0100 urlmon: Skip pstgmed related tests if NULL. --- dlls/urlmon/tests/url.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 8ac533a..91366aa 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1283,11 +1283,13 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR } ok(pstgmed != NULL, "stgmeg == NULL\n"); - if(pstgmed) { - ok(pstgmed->tymed == TYMED_ISTREAM, "tymed=%u\n", pstgmed->tymed); - ok(U(*pstgmed).pstm != NULL, "pstm == NULL\n"); - ok(pstgmed->pUnkForRelease != NULL, "pUnkForRelease == NULL\n"); + if(!pstgmed) { + skip("further pstgmed related tests here.\n"); + return S_OK; } + ok(pstgmed->tymed == TYMED_ISTREAM, "tymed=%u\n", pstgmed->tymed); + ok(U(*pstgmed).pstm != NULL, "pstm == NULL\n"); + ok(pstgmed->pUnkForRelease != NULL, "pUnkForRelease == NULL\n"); if(grfBSCF & BSCF_FIRSTDATANOTIFICATION) { hres = IStream_Write(U(*pstgmed).pstm, buf, 10, NULL);

1 0

Marcus Meissner : wmi: Initial version of wmi.dll.
by Alexandre Julliard 17 Jan '08

17 Jan '08

Module: wine Branch: master Commit: 4328d92da3d65cd4f072b3edaf33b5f2d07e0c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4328d92da3d65cd4f072b3eda… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 16 15:03:03 2008 +0100 wmi: Initial version of wmi.dll. --- Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/wmi/Makefile.in | 10 ++++++++++ dlls/wmi/wmi.spec | 45 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 62 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index f22b6a0..d561c2a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -461,6 +461,7 @@ ALL_MAKEFILES = \ dlls/wintrust/Makefile \ dlls/wintrust/tests/Makefile \ dlls/wldap32/Makefile \ + dlls/wmi/Makefile \ dlls/wnaspi32/Makefile \ dlls/wow32/Makefile \ dlls/ws2_32/Makefile \ @@ -848,6 +849,7 @@ dlls/wintab32/Makefile: dlls/wintab32/Makefile.in dlls/Makedll.rules dlls/wintrust/Makefile: dlls/wintrust/Makefile.in dlls/Makedll.rules dlls/wintrust/tests/Makefile: dlls/wintrust/tests/Makefile.in dlls/Maketest.rules dlls/wldap32/Makefile: dlls/wldap32/Makefile.in dlls/Makedll.rules +dlls/wmi/Makefile: dlls/wmi/Makefile.in dlls/Makedll.rules dlls/wnaspi32/Makefile: dlls/wnaspi32/Makefile.in dlls/Makedll.rules dlls/wow32/Makefile: dlls/wow32/Makefile.in dlls/Makedll.rules dlls/ws2_32/Makefile: dlls/ws2_32/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 940ad51..a42a271 100755 --- a/configure +++ b/configure @@ -21713,6 +21713,8 @@ ac_config_files="$ac_config_files dlls/wintrust/tests/Makefile" ac_config_files="$ac_config_files dlls/wldap32/Makefile" +ac_config_files="$ac_config_files dlls/wmi/Makefile" + ac_config_files="$ac_config_files dlls/wnaspi32/Makefile" ac_config_files="$ac_config_files dlls/wow32/Makefile" @@ -22720,6 +22722,7 @@ do "dlls/wintrust/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintrust/Makefile" ;; "dlls/wintrust/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintrust/tests/Makefile" ;; "dlls/wldap32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wldap32/Makefile" ;; + "dlls/wmi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wmi/Makefile" ;; "dlls/wnaspi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wnaspi32/Makefile" ;; "dlls/wow32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wow32/Makefile" ;; "dlls/ws2_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ws2_32/Makefile" ;; diff --git a/configure.ac b/configure.ac index 328dfc8..8fb2daf 100644 --- a/configure.ac +++ b/configure.ac @@ -1958,6 +1958,7 @@ AC_CONFIG_FILES([dlls/wintab32/Makefile]) AC_CONFIG_FILES([dlls/wintrust/Makefile]) AC_CONFIG_FILES([dlls/wintrust/tests/Makefile]) AC_CONFIG_FILES([dlls/wldap32/Makefile]) +AC_CONFIG_FILES([dlls/wmi/Makefile]) AC_CONFIG_FILES([dlls/wnaspi32/Makefile]) AC_CONFIG_FILES([dlls/wow32/Makefile]) AC_CONFIG_FILES([dlls/ws2_32/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 452a444..60de3a6 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -237,6 +237,7 @@ BASEDIRS = \ wintab32 \ wintrust \ wldap32 \ + wmi \ wnaspi32 \ wow32 \ ws2_32 \ diff --git a/dlls/wmi/Makefile.in b/dlls/wmi/Makefile.in new file mode 100644 index 0000000..29bacb0 --- /dev/null +++ b/dlls/wmi/Makefile.in @@ -0,0 +1,10 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wmi.dll +IMPORTS = advapi32 kernel32 + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wmi/wmi.spec b/dlls/wmi/wmi.spec new file mode 100644 index 0000000..c6ae3cc --- /dev/null +++ b/dlls/wmi/wmi.spec @@ -0,0 +1,45 @@ +@ stdcall CloseTrace(long) advapi32.CloseTrace +@ stdcall ControlTraceA(long long ptr long) advapi32.ControlTraceA +@ stdcall ControlTraceW(long long ptr long) advapi32.ControlTraceW +@ stdcall CreateTraceInstanceId(long ptr) advapi32.CreateTraceInstanceId +@ stdcall EnableTrace(long long long ptr long) advapi32.EnableTrace +@ stdcall GetTraceEnableFlags(long) advapi32.GetTraceEnableFlags +@ stdcall GetTraceEnableLevel(long) advapi32.GetTraceEnableLevel +@ stdcall GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle +@ stdcall OpenTraceA(ptr) advapi32.OpenTraceA +@ stdcall OpenTraceW(ptr) advapi32.OpenTraceW +@ stdcall ProcessTrace(ptr long ptr ptr) advapi32.ProcessTrace +@ stdcall QueryAllTracesA(ptr long ptr) advapi32.QueryAllTracesA +@ stdcall QueryAllTracesW(ptr long ptr) advapi32.QueryAllTracesW +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsW +@ stdcall RemoveTraceCallback(ptr) advapi32.RemoveTraceCallback +@ stdcall SetTraceCallback(ptr ptr) advapi32.SetTraceCallback +@ stdcall StartTraceA(ptr ptr ptr) advapi32.StartTraceA +@ stdcall StartTraceW(ptr ptr ptr) advapi32.StartTraceW +@ stdcall TraceEvent(long ptr) advapi32.TraceEvent +@ stdcall TraceEventInstance(long ptr ptr ptr) advapi32.TraceEventInstance +@ stdcall UnregisterTraceGuids(long) advapi32.UnregisterTraceGuids +@ stdcall WmiCloseBlock() advapi32.WmiCloseBlock +@ stdcall WmiDevInstToInstanceNameA() advapi32.WmiDevInstToInstanceNameA +@ stdcall WmiDevInstToInstanceNameW() advapi32.WmiDevInstToInstanceNameW +@ stdcall WmiEnumerateGuids() advapi32.WmiEnumerateGuids +@ stdcall WmiExecuteMethodA() advapi32.WmiExecuteMethodA +@ stdcall WmiExecuteMethodW() advapi32.WmiExecuteMethodW +@ stdcall WmiFileHandleToInstanceNameA() advapi32.WmiFileHandleToInstanceNameA +@ stdcall WmiFileHandleToInstanceNameW() advapi32.WmiFileHandleToInstanceNameW +@ stdcall WmiFreeBuffer() advapi32.WmiFreeBuffer +@ stdcall WmiMofEnumerateResourcesA() advapi32.WmiMofEnumerateResourcesA +@ stdcall WmiMofEnumerateResourcesW() advapi32.WmiMofEnumerateResourcesW +@ stdcall WmiNotificationRegistrationA() advapi32.WmiNotificationRegistrationA +@ stdcall WmiNotificationRegistrationW() advapi32.WmiNotificationRegistrationW +@ stdcall WmiOpenBlock() advapi32.WmiOpenBlock +@ stdcall WmiQueryAllDataA() advapi32.WmiQueryAllDataA +@ stdcall WmiQueryAllDataW() advapi32.WmiQueryAllDataW +@ stdcall WmiQueryGuidInformation() advapi32.WmiQueryGuidInformation +@ stdcall WmiQuerySingleInstanceA() advapi32.WmiQuerySingleInstanceA +@ stdcall WmiQuerySingleInstanceW() advapi32.WmiQuerySingleInstanceW +@ stdcall WmiSetSingleInstanceA() advapi32.WmiSetSingleInstanceA +@ stdcall WmiSetSingleInstanceW() advapi32.WmiSetSingleInstanceW +@ stdcall WmiSetSingleItemA() advapi32.WmiSetSingleItemA +@ stdcall WmiSetSingleItemW() advapi32.WmiSetSingleItemW

1 0

Andrew Talbot : rpcrt4: Remove unneeded casts.
by Alexandre Julliard 17 Jan '08

17 Jan '08

Module: wine Branch: master Commit: 3c14ae6699475164b41d26f44f0bc29a551f3dce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c14ae6699475164b41d26f44… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 16 21:57:31 2008 +0000 rpcrt4: Remove unneeded casts. --- dlls/rpcrt4/ndr_marshall.c | 13 ++++++------- dlls/rpcrt4/ndr_ole.c | 2 +- dlls/rpcrt4/ndr_stubless.c | 4 ++-- dlls/rpcrt4/rpc_message.c | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 6ed102f..0f415b0 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1527,8 +1527,7 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, * BufferStart and BufferEnd won't be reset when allocating memory for * sending the response. we don't have to check for the new buffer here as * it won't be used a type memory, only for buffer memory */ - if (Pointer >= (unsigned char *)pStubMsg->BufferStart && - Pointer < (unsigned char *)pStubMsg->BufferEnd) + if (Pointer >= pStubMsg->BufferStart && Pointer < pStubMsg->BufferEnd) goto notfree; if (attr & RPC_FC_P_ONSTACK) { @@ -4980,7 +4979,7 @@ static ULONG get_discriminant(unsigned char fc, const unsigned char *pMemory) case RPC_FC_CHAR: case RPC_FC_SMALL: case RPC_FC_USMALL: - return *(const UCHAR *)pMemory; + return *pMemory; case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: @@ -5800,12 +5799,12 @@ unsigned char *WINAPI NdrRangeUnmarshall( case RPC_FC_CHAR: case RPC_FC_SMALL: RANGE_UNMARSHALL(UCHAR, "%d"); - TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); + TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_BYTE: case RPC_FC_USMALL: RANGE_UNMARSHALL(CHAR, "%u"); - TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); + TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_WCHAR: /* FIXME: valid? */ case RPC_FC_USHORT: @@ -5913,7 +5912,7 @@ static unsigned char *WINAPI NdrBaseTypeMarshall( case RPC_FC_SMALL: case RPC_FC_USMALL: safe_copy_to_buffer(pStubMsg, pMemory, sizeof(UCHAR)); - TRACE("value: 0x%02x\n", *(UCHAR *)pMemory); + TRACE("value: 0x%02x\n", *pMemory); break; case RPC_FC_WCHAR: case RPC_FC_SHORT: @@ -5998,7 +5997,7 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall( case RPC_FC_SMALL: case RPC_FC_USMALL: BASE_TYPE_UNMARSHALL(UCHAR); - TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); + TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_WCHAR: case RPC_FC_SHORT: diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 5c1845a..edfc78c 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -112,7 +112,7 @@ static ULONG WINAPI RpcStream_Release(LPSTREAM iface) RpcStreamImpl *This = (RpcStreamImpl *)iface; if (!--(This->RefCount)) { TRACE("size=%d\n", *This->size); - This->pMsg->Buffer = (unsigned char*)This->data + *This->size; + This->pMsg->Buffer = This->data + *This->size; HeapFree(GetProcessHeap(),0,This); return 0; } diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 2a16601..4388904 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -888,7 +888,7 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pArg; current_stack_offset = pParam->stack_offset; - pArg = (unsigned char *)(args+current_stack_offset); + pArg = args + current_stack_offset; TRACE("param[%d]: new format\n", i); TRACE("\tparam_attributes:"); dump_RPC_FC_PROC_PF(pParam->param_attributes); TRACE("\n"); @@ -1063,7 +1063,7 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, * if present, so adjust this */ unsigned short current_stack_offset_adjusted = current_stack_offset + (object ? sizeof(void *) : 0); - unsigned char *pArg = (unsigned char *)(args+current_stack_offset_adjusted); + unsigned char *pArg = args + current_stack_offset_adjusted; /* no more parameters; exit loop */ if (current_stack_offset_adjusted >= stack_size) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 9246afd..07af1fc 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -846,7 +846,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, *Header, hdr_length, (unsigned char *)pMsg->Buffer + buffer_length, data_length, (RpcAuthVerifier *)auth_data, - (unsigned char *)auth_data + sizeof(RpcAuthVerifier), + auth_data + sizeof(RpcAuthVerifier), header_auth_len - sizeof(RpcAuthVerifier)); if (status != RPC_S_OK) goto fail; }

1 0

Andrew Talbot : quartz: Remove unneeded casts.
by Alexandre Julliard 17 Jan '08

17 Jan '08

Module: wine Branch: master Commit: 8caed63edb6bb58ea7d43f5ed71e7597f6e11cf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8caed63edb6bb58ea7d43f5ed… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 16 21:57:19 2008 +0000 quartz: Remove unneeded casts. --- dlls/quartz/systemclock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 7f52b95..88ac7ad 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -113,7 +113,7 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { /** First SingleShots Advice: sorted list */ for (it = This->pSingleShotAdvise; NULL != it && (it->rtBaseTime + it->rtIntervalTime) <= curTime; it = it->next) { /** send event ... */ - SetEvent((HANDLE) it->hEvent); + SetEvent(it->hEvent); /** ... and Release it */ QUARTZ_RemoveAviseEntryFromQueue(This, it); CoTaskMemFree(it); @@ -125,7 +125,7 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { if (it->rtBaseTime <= curTime) { DWORD nPeriods = (DWORD) ((curTime - it->rtBaseTime) / it->rtIntervalTime); /** Release the semaphore ... */ - ReleaseSemaphore((HANDLE) it->hEvent, nPeriods, NULL); + ReleaseSemaphore(it->hEvent, nPeriods, NULL); /** ... and refresh time */ it->rtBaseTime += nPeriods * it->rtIntervalTime; /*assert( it->rtBaseTime + it->rtIntervalTime < curTime );*/

1 0

Andrew Talbot : riched20: Remove unneeded casts.
by Alexandre Julliard 17 Jan '08

17 Jan '08

Module: wine Branch: master Commit: 5a5a9bcd5dd033b3374c15247aca34c74eb6a15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5a9bcd5dd033b3374c15247… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 16 21:57:25 2008 +0000 riched20: Remove unneeded casts. --- dlls/riched20/editor.c | 14 +++++++------- dlls/riched20/richole.c | 2 +- dlls/riched20/style.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1780541..4e7c820 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -628,9 +628,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre int nEventMask = editor->nEventMask; ME_InStream inStream; - TRACE("stream==%p hWnd==%p format==0x%X\n", stream, editor->hWnd, (UINT)format); + TRACE("stream==%p hWnd==%p format==0x%X\n", stream, editor->hWnd, format); editor->nEventMask = 0; - + ME_GetSelection(editor, &from, &to); if ((format & SFF_SELECTION) && (editor->mode & TM_RICHTEXT)) { style = ME_GetSelectionInsertStyle(editor); @@ -1140,7 +1140,7 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) int seltype = 0; if(!editor->lpOleCallback) return FALSE; - ME_GetSelection(editor, (int *)&selrange.cpMin, (int *)&selrange.cpMax); + ME_GetSelection(editor, &selrange.cpMin, &selrange.cpMax); if(selrange.cpMin == selrange.cpMax) seltype |= SEL_EMPTY; else @@ -1561,7 +1561,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, case EM_EXGETSEL: { CHARRANGE *pRange = (CHARRANGE *)lParam; - ME_GetSelection(editor, (int *)&pRange->cpMin, (int *)&pRange->cpMax); + ME_GetSelection(editor, &pRange->cpMin, &pRange->cpMax); TRACE("EM_EXGETSEL = (%d,%d)\n", pRange->cpMin, pRange->cpMax); return 0; } @@ -2034,11 +2034,11 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, LPDATAOBJECT dataObj = NULL; CHARRANGE range; HRESULT hr = S_OK; - + if (editor->cPasswordMask) return 0; /* Copying or Cutting masked text isn't allowed */ - - ME_GetSelection(editor, (int*)&range.cpMin, (int*)&range.cpMax); + + ME_GetSelection(editor, &range.cpMin, &range.cpMax); if(editor->lpOleCallback) hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, &range, RECO_COPY, &dataObj); if(FAILED(hr) || !dataObj) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 9bd44aa..742323e 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -162,7 +162,7 @@ IRichEditOle_fnGetClipboardData(IRichEditOle *me, CHARRANGE *lpchrg, if(!lplpdataobj) return E_INVALIDARG; if(!lpchrg) { - ME_GetSelection(This->editor, (int*)&tmpchrg.cpMin, (int*)&tmpchrg.cpMax); + ME_GetSelection(This->editor, &tmpchrg.cpMin, &tmpchrg.cpMax); lpchrg = &tmpchrg; } return ME_GetDataObject(This->editor, lpchrg, lplpdataobj); diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index ba7d6d3..06d76cf 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -262,12 +262,12 @@ void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]) p += sprintf(p, "N/A"); if (pFmt->dwMask & CFM_SIZE) - p += sprintf(p, "\nFont size: %d\n", (int)pFmt->yHeight); + p += sprintf(p, "\nFont size: %d\n", pFmt->yHeight); else p += sprintf(p, "\nFont size: N/A\n"); - + if (pFmt->dwMask & CFM_OFFSET) - p += sprintf(p, "Char offset: %d\n", (int)pFmt->yOffset); + p += sprintf(p, "Char offset: %d\n", pFmt->yOffset); else p += sprintf(p, "Char offset: N/A\n");

1 0

Dmitry Timoshkov : ntdll: Do not perform base relocation if an image is not a DLL.
by Alexandre Julliard 17 Jan '08

17 Jan '08

Module: wine Branch: master Commit: bf89330fb665e7913aeb081bbb1882c06e6607f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf89330fb665e7913aeb081bb… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jan 17 21:05:25 2008 +0800 ntdll: Do not perform base relocation if an image is not a DLL. --- dlls/ntdll/virtual.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index cbd524a..1c44d49 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1147,14 +1147,16 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz /* perform base relocation, if necessary */ - if (ptr != base) + if (ptr != base && + ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || + !NtCurrentTeb()->Peb->ImageBaseAddress) ) { const IMAGE_DATA_DIRECTORY *relocs; relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) { - WARN( "Need to relocate module from addr %lx, but there are no relocation records\n", + WARN_(module)( "Need to relocate module from addr %lx, but there are no relocation records\n", (ULONG_PTR)nt->OptionalHeader.ImageBase ); status = STATUS_CONFLICTING_ADDRESSES; goto error; @@ -1165,7 +1167,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz * Some DLLs really check the MSB of the module handle :-/ */ if ((nt->OptionalHeader.ImageBase & 0x80000000) && !((ULONG_PTR)base & 0x80000000)) - ERR( "Forced to relocate system DLL (base > 2GB). This is not good.\n" ); + ERR_(module)( "Forced to relocate system DLL (base > 2GB). This is not good.\n" ); if (!do_relocations( ptr, relocs, ptr - base, total_size )) {

1 0