November 2006 - Wine-commits

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 1ccf94490030b68ac17a8e067ddcd25997ca1c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccf94490030b68ac17a8e067… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 12 19:51:37 2006 +0100 Assorted spelling fixes. --- dlls/avifil32/api.c | 2 +- dlls/comctl32/rebar.c | 6 +++--- dlls/comctl32/tests/header.c | 2 +- dlls/dplayx/dplayx_messages.c | 2 +- dlls/dsound/tests/capture.c | 2 +- dlls/dsound/tests/dsound.c | 2 +- dlls/dsound/tests/dsound8.c | 2 +- dlls/msi/action.c | 2 +- dlls/msi/custom.c | 4 ++-- dlls/msvfw32/msvideo_main.c | 2 +- dlls/ntdll/handletable.c | 2 +- dlls/ole32/moniker.c | 2 +- dlls/ole32/ole2_16.c | 2 +- dlls/uxtheme/system.c | 2 +- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_main.c | 2 +- dlls/winex11.drv/dib_convert.c | 4 ++-- dlls/winex11.drv/opengl.c | 8 ++++---- dlls/winmm/wineoss/dscapture.c | 2 +- 19 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ccf94490030b68ac17a8…

1 0

Francois Gouget : Add some documentation headers to make winapi_check happy .
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: b2656633a66369fc49e44d9466794b8dcf2667f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2656633a66369fc49e44d946… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 12 20:23:28 2006 +0100 Add some documentation headers to make winapi_check happy. --- dlls/advapi32/security.c | 3 +++ dlls/crypt32/oid.c | 9 +++++++++ dlls/hlink/hlink_main.c | 3 +++ dlls/infosoft/infosoft_main.c | 6 ++++++ dlls/inseng/inseng_main.c | 3 +++ dlls/kernel32/heap.c | 3 +++ dlls/ntdsapi/ntdsapi.c | 3 +++ dlls/opengl32/wgl.c | 6 +++--- dlls/pstorec/pstorec.c | 3 +++ dlls/quartz/main.c | 6 ++++++ dlls/query/query_main.c | 3 +++ dlls/rpcrt4/rpc_epmap.c | 6 ++++++ dlls/secur32/secur32.c | 3 +++ 13 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 7b4f5bc..5d66d0a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3715,6 +3715,9 @@ BOOL WINAPI CreateProcessAsUserW( return TRUE; } +/****************************************************************************** + * DuplicateTokenEx [ADVAPI32.@] + */ BOOL WINAPI DuplicateTokenEx( HANDLE ExistingTokenHandle, DWORD dwDesiredAccess, LPSECURITY_ATTRIBUTES lpTokenAttributes, diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 4ab8a90..20d3b5d 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -502,6 +502,9 @@ error_close_key: return TRUE; } +/*********************************************************************** + * CryptUnregisterOIDFunction (CRYPT32.@) + */ BOOL WINAPI CryptUnregisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName, LPCSTR pszOID) { @@ -768,6 +771,9 @@ static inline BOOL CRYPT_SetDefaultOIDDl return r == ERROR_SUCCESS; } +/*********************************************************************** + * CryptRegisterDefaultOIDFunction (CRYPT32.@) + */ BOOL WINAPI CryptRegisterDefaultOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName, DWORD dwIndex, LPCWSTR pwszDll) { @@ -1247,6 +1253,9 @@ static void free_oid_info(void) DeleteCriticalSection(&oidInfoCS); } +/*********************************************************************** + * CryptEnumOIDInfo (CRYPT32.@) + */ BOOL WINAPI CryptEnumOIDInfo(DWORD dwGroupId, DWORD dwFlags, void *pvArg, PFN_CRYPT_ENUM_OID_INFO pfnEnumOIDInfo) { diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index f0f0039..1a595ae 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -339,6 +339,9 @@ static const IClassFactoryVtbl hlcfvt = static CFImpl HLink_cf = { &hlcfvt, &HLink_Constructor }; static CFImpl HLinkBrowseContext_cf = { &hlcfvt, &HLinkBrowseContext_Constructor }; +/*********************************************************************** + * DllGetClassObject (HLINK.@) + */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { IClassFactory *pcf = NULL; diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index ea59476..16fbb73 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -123,6 +123,9 @@ static const IClassFactoryVtbl infosoft_ static CFImpl wb_cf = { &infosoft_cfvt, &wb_Constructor }; +/*********************************************************************** + * DllGetClassObject (INFOSOFT.@) + */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { IClassFactory *pcf = NULL; @@ -183,6 +186,9 @@ static HRESULT add_content_index_keys(vo return S_OK; } +/*********************************************************************** + * DllRegisterServer (INFOSOFT.@) + */ HRESULT WINAPI DllRegisterServer(void) { add_content_index_keys(); diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 4e0b1f5..83b1457 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -50,6 +50,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, return TRUE; } +/*********************************************************************** + * DllGetClassObject (INSENG.@) + */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index bb415f2..5d7f61c 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -268,6 +268,9 @@ DWORD WINAPI GetProcessHeaps( DWORD coun /* These are needed so that we can call the functions from inside kernel itself */ +/*********************************************************************** + * HeapAlloc (KERNEL32.@) + */ LPVOID WINAPI HeapAlloc( HANDLE heap, DWORD flags, SIZE_T size ) { return RtlAllocateHeap( heap, flags, size ); diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 940950b..f8fd98c 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -45,6 +45,9 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWO return TRUE; } +/*********************************************************************** + * DsMakeSpnW (NTDSAPI.@) + */ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, LPCWSTR inst_name, USHORT inst_port, LPCWSTR ref, DWORD *spn_length, LPWSTR spn) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index bc5014a..1191850 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -156,9 +156,6 @@ int WINAPI wglGetLayerPaletteEntries(HDC return 0; } -/*********************************************************************** - * wglGetProcAddress (OPENGL32.@) - */ static int compar(const void *elt_a, const void *elt_b) { return strcmp(((const OpenGL_extension *) elt_a)->name, ((const OpenGL_extension *) elt_b)->name); @@ -211,6 +208,9 @@ static BOOL is_extension_supported(const return FALSE; } +/*********************************************************************** + * wglGetProcAddress (OPENGL32.@) + */ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { void *local_func; OpenGL_extension ext; diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 96ebe5b..6e2b5a5 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -379,6 +379,9 @@ HRESULT WINAPI DllUnregisterServer(void) return S_OK; } +/*********************************************************************** + * DllGetClassObject (PSTOREC.@) + */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index c5111bc..def4598 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -269,6 +269,9 @@ LONG WINAPI DBToAmpFactor(LONG db) return 100; } +/*********************************************************************** + * AMGetErrorTextA (QUARTZ.@) + */ DWORD WINAPI AMGetErrorTextA(HRESULT hr, char *buffer, DWORD maxlen) { int len; @@ -284,6 +287,9 @@ DWORD WINAPI AMGetErrorTextA(HRESULT hr, return len; } +/*********************************************************************** + * AMGetErrorTextW (QUARTZ.@) + */ DWORD WINAPI AMGetErrorTextW(HRESULT hr, WCHAR *buffer, DWORD maxlen) { int len; diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index f25c905..cdf0966 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -52,6 +52,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, return TRUE; } +/*********************************************************************** + * DllGetClassObject (QUERY.@) + */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 93e3e60..ee183f7 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -254,6 +254,9 @@ typedef struct twr_t /* [size_is] */ BYTE tower_octet_string[ 1 ]; } twr_t; +/*********************************************************************** + * TowerExplode (RPCRT4.@) + */ RPC_STATUS WINAPI TowerExplode( const twr_t *tower, RPC_SYNTAX_IDENTIFIER *object, RPC_SYNTAX_IDENTIFIER *syntax, char **protseq, char **endpoint, char **address) @@ -320,6 +323,9 @@ RPC_STATUS WINAPI TowerExplode( return status; } +/*********************************************************************** + * TowerConstruct (RPCRT4.@) + */ RPC_STATUS WINAPI TowerConstruct( const RPC_SYNTAX_IDENTIFIER *object, const RPC_SYNTAX_IDENTIFIER *syntax, const char *protseq, const char *endpoint, const char *address, diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 8b3da3d..edb2c1d 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1031,6 +1031,9 @@ BOOLEAN WINAPI GetComputerObjectNameW( return status; } +/*********************************************************************** + * GetUserNameExA (SECUR32.@) + */ BOOLEAN WINAPI GetUserNameExA( EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG nSize) {

1 0

Francois Gouget : ole32: Standardize some documentation comments.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: aa857dead36e91eb5f611a38bdc4385e658c5f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa857dead36e91eb5f611a38b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 12 20:23:57 2006 +0100 ole32: Standardize some documentation comments. --- dlls/ole32/ole2_16.c | 5 ++++- dlls/ole32/storage.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2_16.c b/dlls/ole32/ole2_16.c index a7a5f55..1c6bba1 100644 --- a/dlls/ole32/ole2_16.c +++ b/dlls/ole32/ole2_16.c @@ -154,9 +154,12 @@ HRESULT WINAPI CreateFileMoniker16(LPCOL /****************************************************************************** * OleSetMenuDescriptor (OLE2.41) + * + * PARAMS + * hOleMenu FIXME: Should probably be an HOLEMENU16. */ HRESULT WINAPI OleSetMenuDescriptor16( - HOLEMENU hOleMenu, /* FIXME: HOLEMENU16 likely */ + HOLEMENU hOleMenu, HWND16 hwndFrame, HWND16 hwndActiveObject, LPOLEINPLACEFRAME lpFrame, diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index 901150c..401c984 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -2181,9 +2181,12 @@ HRESULT WINAPI StgIsStorageILockBytes16( /****************************************************************************** * StgOpenStorageOnILockBytes [STORAGE.4] + * + * PARAMS + * plkbyt FIXME: Should probably be an ILockBytes16 *. */ HRESULT WINAPI StgOpenStorageOnILockBytes16( - SEGPTR /*ILockBytes16 **/plkbyt, + SEGPTR plkbyt, IStorage16 *pstgPriority, DWORD grfMode, SNB16 snbExclude,

1 0

Francois Gouget : winex11.drv: Fix some comments so they are properly formatted documentation headers.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: e9fb8c6728a40e64e76c520f54385ba1620e624a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9fb8c6728a40e64e76c520f5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 12 20:23:38 2006 +0100 winex11.drv: Fix some comments so they are properly formatted documentation headers. --- dlls/winex11.drv/opengl.c | 205 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 170 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9fb8c6728a40e64e76c5…

1 0

Francois Gouget : rpcrt4: Add some stub documentation headers to make winapi_check happy.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 5962cf6e4f2805dd02ba4e245347859076258289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5962cf6e4f2805dd02ba4e245… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 12 20:23:02 2006 +0100 rpcrt4: Add some stub documentation headers to make winapi_check happy. Also fix some headers that identified internal APIs as external. --- dlls/rpcrt4/ndr_marshall.c | 41 +++++++++++++++++++++++++++++++---------- 1 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 8ecc534..f5aee76 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -792,7 +792,7 @@ static inline void dump_pointer_attr(uns } /*********************************************************************** - * PointerMarshall + * PointerMarshall [internal] */ static void PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Buffer, @@ -857,7 +857,7 @@ #endif } /*********************************************************************** - * PointerUnmarshall + * PointerUnmarshall [internal] */ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Buffer, @@ -936,7 +936,7 @@ static void PointerUnmarshall(PMIDL_STUB } /*********************************************************************** - * PointerBufferSize + * PointerBufferSize [internal] */ static void PointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Pointer, @@ -986,7 +986,7 @@ static void PointerBufferSize(PMIDL_STUB } /*********************************************************************** - * PointerMemorySize [RPCRT4.@] + * PointerMemorySize [internal] */ static unsigned long PointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Buffer, @@ -1022,7 +1022,7 @@ static unsigned long PointerMemorySize(P } /*********************************************************************** - * PointerFree [RPCRT4.@] + * PointerFree [internal] */ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Pointer, @@ -1292,7 +1292,7 @@ static void EmbeddedPointerBufferSize(PM } /*********************************************************************** - * EmbeddedPointerMemorySize + * EmbeddedPointerMemorySize [internal] */ static unsigned long EmbeddedPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) @@ -1353,7 +1353,7 @@ static unsigned long EmbeddedPointerMemo } /*********************************************************************** - * EmbeddedPointerFree + * EmbeddedPointerFree [internal] */ static void EmbeddedPointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, @@ -4203,7 +4203,7 @@ static long unmarshall_discriminant(PMID } /********************************************************************** - * NdrNonEncapsulatedUnionUnmarshall[RPCRT4.@] + * NdrNonEncapsulatedUnionUnmarshall [RPCRT4.@] */ unsigned char * WINAPI NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, @@ -4762,7 +4762,7 @@ static void WINAPI NdrBaseTypeFree(PMIDL } /*********************************************************************** - * NdrClientContextMarshall + * NdrClientContextMarshall [RPCRT4.@] */ void WINAPI NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_CCONTEXT ContextHandle, @@ -4780,7 +4780,7 @@ void WINAPI NdrClientContextMarshall(PMI } /*********************************************************************** - * NdrClientContextUnmarshall + * NdrClientContextUnmarshall [RPCRT4.@] */ void WINAPI NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_CCONTEXT * pContextHandle, @@ -4961,6 +4961,9 @@ static UINT ndr_update_context_handle(ND return ERROR_SUCCESS; } +/*********************************************************************** + * NDRCContextUnmarshall [RPCRT4.@] + */ void WINAPI NDRCContextUnmarshall(NDR_CCONTEXT *CContext, RPC_BINDING_HANDLE hBinding, void *pBuff, ULONG DataRepresentation) @@ -4977,6 +4980,9 @@ void WINAPI NDRCContextUnmarshall(NDR_CC RpcRaiseException(r); } +/*********************************************************************** + * NDRSContextMarshall [RPCRT4.@] + */ void WINAPI NDRSContextMarshall(NDR_SCONTEXT CContext, void *pBuff, NDR_RUNDOWN userRunDownIn) @@ -4984,6 +4990,9 @@ void WINAPI NDRSContextMarshall(NDR_SCON FIXME("(%p %p %p): stub\n", CContext, pBuff, userRunDownIn); } +/*********************************************************************** + * NDRSContextMarshallEx [RPCRT4.@] + */ void WINAPI NDRSContextMarshallEx(RPC_BINDING_HANDLE hBinding, NDR_SCONTEXT CContext, void *pBuff, @@ -4992,6 +5001,9 @@ void WINAPI NDRSContextMarshallEx(RPC_BI FIXME("(%p %p %p %p): stub\n", hBinding, CContext, pBuff, userRunDownIn); } +/*********************************************************************** + * NDRSContextMarshall2 [RPCRT4.@] + */ void WINAPI NDRSContextMarshall2(RPC_BINDING_HANDLE hBinding, NDR_SCONTEXT CContext, void *pBuff, @@ -5002,6 +5014,9 @@ void WINAPI NDRSContextMarshall2(RPC_BIN hBinding, CContext, pBuff, userRunDownIn, CtxGuard, Flags); } +/*********************************************************************** + * NDRSContextUnmarshall [RPCRT4.@] + */ NDR_SCONTEXT WINAPI NDRSContextUnmarshall(void *pBuff, ULONG DataRepresentation) { @@ -5009,6 +5024,9 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshal return NULL; } +/*********************************************************************** + * NDRSContextUnmarshallEx [RPCRT4.@] + */ NDR_SCONTEXT WINAPI NDRSContextUnmarshallEx(RPC_BINDING_HANDLE hBinding, void *pBuff, ULONG DataRepresentation) @@ -5017,6 +5035,9 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshal return NULL; } +/*********************************************************************** + * NDRSContextUnmarshall2 [RPCRT4.@] + */ NDR_SCONTEXT WINAPI NDRSContextUnmarshall2(RPC_BINDING_HANDLE hBinding, void *pBuff, ULONG DataRepresentation,

1 0

Francois Gouget : shell32: Fix inclusion of conditional headers ( spotted by winapi_check).
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: c35b6b922371cbe1974dcbd3f54292a0527a6850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35b6b922371cbe1974dcbd3f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 12 19:45:52 2006 +0100 shell32: Fix inclusion of conditional headers (spotted by winapi_check). --- dlls/shell32/trash.c | 10 ++++++++-- dlls/shell32/xdg.c | 12 +++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 4fe43e5..ccd347f 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -19,11 +19,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> -#include <sys/stat.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #include <sys/types.h> #include <stdlib.h> -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include <dirent.h> #include "windef.h" diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 188d21c..4c4d10e 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -17,12 +17,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - + +#include "config.h" + #include <stdarg.h> #include <stdlib.h> #include <string.h> -#include <sys/stat.h> -#include <unistd.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include <errno.h> #include "windef.h"

1 0

Francois Gouget : msi: assert.h is not a local header ( spotted by winapi_check).
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 6a385ae273e7f5f2695e003e7e38a702b8b1676f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a385ae273e7f5f2695e003e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 12 19:43:16 2006 +0100 msi: assert.h is not a local header (spotted by winapi_check). --- dlls/msi/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index c66048a..014c453 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS #define NONAMELESSUNION @@ -34,7 +35,6 @@ #include "objidl.h" #include "winnls.h" #include "msipriv.h" #include "query.h" -#include "assert.h" #include "wine/debug.h" #include "wine/unicode.h"

1 0

Francois Gouget : ole32/tests: Don' t use the NONAMELESS* macros in the tests.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 49ad2b10c1e106fe2b05bd10f3bf7f4d0acbfedf URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ad2b10c1e106fe2b05bd10f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 12 19:42:39 2006 +0100 ole32/tests: Don't use the NONAMELESS* macros in the tests. --- dlls/ole32/tests/clipboard.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index ad15b5e..f2a71e4 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -19,8 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h> @@ -201,7 +199,7 @@ static HRESULT WINAPI DataObjectImpl_Get return DV_E_TYMED; if(This->text && pformatetc->cfFormat == CF_TEXT) - pmedium->u.hGlobal = This->text; + U(*pmedium).hGlobal = This->text; else return DV_E_FORMATETC;

1 0

Dmitry Timoshkov : ntdll: Alphabetically sort the Makefile entries.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 2fab58053ece81264b78718cd9507cbabadbdea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fab58053ece81264b78718cd… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Nov 13 17:05:40 2006 +0800 ntdll: Alphabetically sort the Makefile entries. --- dlls/ntdll/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 01f5b5b..37b18f1 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -45,10 +45,10 @@ C_SRCS = \ string.c \ sync.c \ tape.c \ - version.c \ thread.c \ threadpool.c \ time.c \ + version.c \ virtual.c \ wcstring.c

1 0

Paul Vriens : comdlg32: Remove unused variable (Coverity).
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 646139dd6ed64b7a38fc99ef33b0253063a9ec4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=646139dd6ed64b7a38fc99ef3… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Nov 12 18:50:25 2006 +0100 comdlg32: Remove unused variable (Coverity). --- dlls/comdlg32/fontdlg16.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/fontdlg16.c b/dlls/comdlg32/fontdlg16.c index 4b13c2d..c5f11df 100644 --- a/dlls/comdlg32/fontdlg16.c +++ b/dlls/comdlg32/fontdlg16.c @@ -164,7 +164,7 @@ INT16 WINAPI FontStyleEnumProc16( SEGPTR BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont) { HINSTANCE16 hInst; - HANDLE16 hDlgTmpl16 = 0, hResource16 = 0; + HANDLE16 hDlgTmpl16 = 0; HGLOBAL16 hGlobal16 = 0; BOOL16 bRet = FALSE; LPVOID template; @@ -255,7 +255,6 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT1 hInst = GetWindowLongPtrA(HWND_32(lpChFont->hwndOwner), GWLP_HINSTANCE); bRet = DialogBoxIndirectParam16(hInst, hDlgTmpl16, lpChFont->hwndOwner, (DLGPROC16) ptr, (DWORD)lpChFont); - if (hResource16) FreeResource16(hDlgTmpl16); if (hGlobal16) { GlobalUnlock16(hGlobal16);

1 0