February 2007 - Wine-Commits

Bang Jun-Young : ntdll: Fix NtUnloadKey to match the DDK.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: fdff5c3a3a9e7c90c2ac65b39e2a2fb47628c0c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdff5c3a3a9e7c90c2ac65b39… Author: Bang Jun-Young <junyoung(a)mogua.com> Date: Mon Jan 29 22:55:02 2007 +0900 ntdll: Fix NtUnloadKey to match the DDK. --- dlls/advapi32/registry.c | 6 +++++- dlls/ntdll/reg.c | 6 +++--- include/winternl.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 54b0bfb..6589a23 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2089,6 +2089,8 @@ LONG WINAPI RegUnLoadKeyW( HKEY hkey, LP { DWORD ret; HKEY shkey; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING subkey; TRACE("(%p,%s)\n",hkey, debugstr_w(lpSubKey)); @@ -2096,7 +2098,9 @@ LONG WINAPI RegUnLoadKeyW( HKEY hkey, LP if( ret ) return ERROR_INVALID_PARAMETER; - ret = RtlNtStatusToDosError(NtUnloadKey(shkey)); + RtlInitUnicodeString(&subkey, lpSubKey); + InitializeObjectAttributes(&attr, &subkey, OBJ_CASE_INSENSITIVE, shkey, NULL); + ret = RtlNtStatusToDosError(NtUnloadKey(&attr)); RegCloseKey(shkey); diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index be9a34a..99a46c0 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -775,15 +775,15 @@ NTSTATUS WINAPI RtlpNtSetValueKey( HANDL * NtUnloadKey [NTDLL.@] * ZwUnloadKey [NTDLL.@] */ -NTSTATUS WINAPI NtUnloadKey(IN HANDLE KeyHandle) +NTSTATUS WINAPI NtUnloadKey(IN POBJECT_ATTRIBUTES attr) { NTSTATUS ret; - TRACE("(%p)\n", KeyHandle); + TRACE("(%p)\n", attr); SERVER_START_REQ( unload_registry ) { - req->hkey = KeyHandle; + req->hkey = attr->RootDirectory; ret = wine_server_call(req); } SERVER_END_REQ; diff --git a/include/winternl.h b/include/winternl.h index 19b2ac9..e128268 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1935,7 +1935,7 @@ NTSTATUS WINAPI NtTerminateProcess(HAND NTSTATUS WINAPI NtTerminateThread(HANDLE,LONG); NTSTATUS WINAPI NtTestAlert(VOID); NTSTATUS WINAPI NtUnloadDriver(const UNICODE_STRING *); -NTSTATUS WINAPI NtUnloadKey(HANDLE); +NTSTATUS WINAPI NtUnloadKey(POBJECT_ATTRIBUTES); NTSTATUS WINAPI NtUnloadKeyEx(POBJECT_ATTRIBUTES,HANDLE); NTSTATUS WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PLARGE_INTEGER,PULONG); NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG);

1 0

Bang Jun-Young : wininet: config.h police.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: b71e42b794e46f63368e9932aa2bc2bfa7e6a2ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b71e42b794e46f63368e9932a… Author: Bang Jun-Young <junyoung(a)mogua.com> Date: Mon Jan 29 22:52:00 2007 +0900 wininet: config.h police. --- dlls/wininet/internet.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 438654b..846e705 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -23,6 +23,10 @@ #ifndef _WINE_INTERNET_H_ #define _WINE_INTERNET_H_ +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + #include "wine/unicode.h" #include <time.h>

1 0

Bang Jun-Young : advapi32: Fix prototypes to match the PSDK.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 671b023de8371351f8165dce31a39af18be55bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=671b023de8371351f8165dce3… Author: Bang Jun-Young <junyoung(a)mogua.com> Date: Mon Jan 29 22:49:46 2007 +0900 advapi32: Fix prototypes to match the PSDK. --- dlls/advapi32/crypt.c | 12 ++++++------ dlls/advapi32/crypt.h | 6 +++--- include/wincrypt.h | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 27ca768..bd1a9c7 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1741,7 +1741,7 @@ BOOL WINAPI CryptHashSessionKey (HCRYPTH * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, BYTE *pbData, DWORD dwDataLen, +BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey) { PCRYPTPROV prov = (PCRYPTPROV)hProv; @@ -1856,7 +1856,7 @@ BOOL WINAPI CryptSignHashA (HCRYPTHASH h * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, BYTE *pbData, DWORD dwFlags) +BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov; PCRYPTHASH hash = (PCRYPTHASH)hHash; @@ -1889,7 +1889,7 @@ BOOL WINAPI CryptSetHashParam (HCRYPTHAS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags) +BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov; PCRYPTKEY key = (PCRYPTKEY)hKey; @@ -2063,7 +2063,7 @@ BOOL WINAPI CryptSetProviderExA (LPCSTR * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD dwFlags) +BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov = (PCRYPTPROV)hProv; @@ -2122,7 +2122,7 @@ BOOL WINAPI CryptSetProvParam (HCRYPTPRO * NULL. It is supported only for compatibility with Microsoft's Cryptographic * Providers. */ -BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, BYTE *pbSignature, DWORD dwSigLen, +BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags) { PCRYPTHASH hash = (PCRYPTHASH)hHash; @@ -2155,7 +2155,7 @@ BOOL WINAPI CryptVerifySignatureW (HCRYP * * See CryptVerifySignatureW. */ -BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, BYTE *pbSignature, DWORD dwSigLen, +BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCSTR sDescription, DWORD dwFlags) { LPWSTR wsDescription; diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h index 310c350..fcfb0b0 100644 --- a/dlls/advapi32/crypt.h +++ b/dlls/advapi32/crypt.h @@ -49,9 +49,9 @@ typedef struct tagPROVFUNCS BOOL (WINAPI *pCPHashSessionKey)(HCRYPTPROV hProv, HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags); BOOL (WINAPI *pCPImportKey)(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey); BOOL (WINAPI *pCPReleaseContext)(HCRYPTPROV hProv, DWORD dwFlags); - BOOL (WINAPI *pCPSetHashParam)(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwParam, BYTE *pbData, DWORD dwFlags); - BOOL (WINAPI *pCPSetKeyParam)(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags); - BOOL (WINAPI *pCPSetProvParam)(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD dwFlags); + BOOL (WINAPI *pCPSetHashParam)(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); + BOOL (WINAPI *pCPSetKeyParam)(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); + BOOL (WINAPI *pCPSetProvParam)(HCRYPTPROV hProv, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); BOOL (WINAPI *pCPSignHash)(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR sDescription, DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen); BOOL (WINAPI *pCPVerifySignature)(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags); } PROVFUNCS, *PPROVFUNCS; diff --git a/include/wincrypt.h b/include/wincrypt.h index e5cc031..6554376 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3052,28 +3052,28 @@ BOOL WINAPI CryptGetDefaultProviderW (DW DWORD dwFlags, LPWSTR pszProvName, DWORD *pcbProvName); #define CryptGetDefaultProvider WINELIB_NAME_AW(CryptGetDefaultProvider) BOOL WINAPI CryptGetUserKey (HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *phUserKey); -BOOL WINAPI CryptHashData (HCRYPTHASH hHash, const BYTE *pbData, DWORD dwDataLen, DWORD dwFlags); +BOOL WINAPI CryptHashData (HCRYPTHASH hHash, CONST BYTE *pbData, DWORD dwDataLen, DWORD dwFlags); BOOL WINAPI CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags); -BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, BYTE *pbData, DWORD dwDataLen, +BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey); BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags); -BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, BYTE *pbData, DWORD dwFlags); -BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags); +BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); +BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); BOOL WINAPI CryptSetProviderA (LPCSTR pszProvName, DWORD dwProvType); BOOL WINAPI CryptSetProviderW (LPCWSTR pszProvName, DWORD dwProvType); #define CryptSetProvider WINELIB_NAME_AW(CryptSetProvider) BOOL WINAPI CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags); BOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags); #define CryptSetProviderEx WINELIB_NAME_AW(CryptSetProviderEx) -BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD dwFlags); +BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); BOOL WINAPI CryptSignHashA (HCRYPTHASH hHash, DWORD dwKeySpec, LPCSTR sDescription, DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen); BOOL WINAPI CryptSignHashW (HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR sDescription, DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen); #define CryptSignHash WINELIB_NAME_AW(CryptSignHash) -BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, BYTE *pbSignature, DWORD dwSigLen, +BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCSTR sDescription, DWORD dwFlags); -BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, BYTE *pbSignature, DWORD dwSigLen, +BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags); #define CryptVerifySignature WINELIB_NAME_AW(CryptVerifySignature)

1 0

Andrew Talbot : avifil32: Declare some variables static.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: ba9e77b8f641960e330fb7a4485ea33d53681fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9e77b8f641960e330fb7a44… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Jan 28 13:07:18 2007 +0000 avifil32: Declare some variables static. --- dlls/avifil32/factory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 24d669d..8b0faac 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -40,8 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); HMODULE AVIFILE_hModule = NULL; -BOOL AVIFILE_bLocked = FALSE; -UINT AVIFILE_uUseCount = 0; +static BOOL AVIFILE_bLocked; +static UINT AVIFILE_uUseCount; static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj); static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface);

1 0

Andrew Talbot : sensapi: Declare a variable static.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 76a0224696170f00f2a4454ac107df2e696c3960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a0224696170f00f2a4454ac… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 27 18:09:34 2007 +0000 sensapi: Declare a variable static. --- dlls/sensapi/sensapi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sensapi/sensapi.c b/dlls/sensapi/sensapi.c index 4357d4f..86e4a92 100644 --- a/dlls/sensapi/sensapi.c +++ b/dlls/sensapi/sensapi.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(sensapi); -HMODULE SENSAPI_hModule = 0; +static HMODULE SENSAPI_hModule; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {

1 0

Andrew Talbot : secur32: Declare a function static.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: da90b4a8dd075f048d3eef8eef3bd0993aedffef URL: http://source.winehq.org/git/wine.git/?a=commit;h=da90b4a8dd075f048d3eef8ee… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 27 18:08:50 2007 +0000 secur32: Declare a function static. --- dlls/secur32/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/util.c b/dlls/secur32/util.c index ed39336..3994f51 100644 --- a/dlls/secur32/util.c +++ b/dlls/secur32/util.c @@ -145,7 +145,7 @@ SECURITY_STATUS SECUR32_CreateNTLMv1Sess return SEC_E_OK; } -void SECUR32_CalcNTLMv2Subkey(PBYTE session_key, const char *magic, PBYTE subkey) +static void SECUR32_CalcNTLMv2Subkey(PBYTE session_key, const char *magic, PBYTE subkey) { MD5_CTX ctx;

1 0

Andrew Talbot : setupapi: Declare some functions static.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 1efcf3769203e4d14ffe144939fce61ae5e853b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1efcf3769203e4d14ffe14493… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 27 18:11:12 2007 +0000 setupapi: Declare some functions static. --- dlls/setupapi/setupx_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c index 4aacbc8..2fadb8c 100644 --- a/dlls/setupapi/setupx_main.c +++ b/dlls/setupapi/setupx_main.c @@ -280,7 +280,7 @@ static LDD_LIST *pFirstLDD = NULL; static BOOL std_LDDs_done = FALSE; -void SETUPX_CreateStandardLDDs(void) +static void SETUPX_CreateStandardLDDs(void) { HKEY hKey = 0; WORD n; @@ -350,7 +350,7 @@ void SETUPX_CreateStandardLDDs(void) * RETURN * ERR_VCP_LDDINVALID if ldid < LDID_ASSIGN_START. */ -RETERR16 SETUPX_DelLdd(LOGDISKID16 ldid) +static RETERR16 SETUPX_DelLdd(LOGDISKID16 ldid) { LDD_LIST *pCurr, *pPrev = NULL;

1 0

Andrew Talbot : sane.ds: Declare a function static.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 3c43ca5df3fc111b44a2bb5b5da8ec104abd90f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c43ca5df3fc111b44a2bb5b5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 27 18:08:01 2007 +0000 sane.ds: Declare a function static. --- dlls/sane.ds/sane_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 6b4c6b9..b3754b7 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -66,7 +66,7 @@ static TW_UINT16 SANE_GetIdentity( pTW_I static TW_UINT16 SANE_OpenDS( pTW_IDENTITY, pTW_IDENTITY); #endif -TW_UINT16 SANE_SourceControlHandler ( +static TW_UINT16 SANE_SourceControlHandler ( pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG,

1 0

Andrew Talbot : serialui: Declare some items static.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: b618fc2ce9e457905e5a13ef9c2e1d4ece54aa31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b618fc2ce9e457905e5a13ef9… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 27 18:10:19 2007 +0000 serialui: Declare some items static. --- dlls/serialui/confdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index 465c4e2..d6b8f1e 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); -HMODULE SERIALUI_hModule = 0; +static HMODULE SERIALUI_hModule; /*********************************************************************** * DllMain [Internal] Initializes the internal 'SERIALUI.DLL'. @@ -342,7 +342,7 @@ static void SERIALUI_DialogInfoToDCB(HWN * * Shows a dialog for configuring a COMM port */ -INT_PTR CALLBACK SERIALUI_ConfigDialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK SERIALUI_ConfigDialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { static const WCHAR szSettings[] = { 'S','e','t','t','i','n','g','s',' ','f','o','r',' ',0

1 0

Thomas Weidenmueller : comctl32: Fix the TAB_ITEM_SIZE macro.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 2c620c82697a67293549ac70f1a3377966c3cbff URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c620c82697a67293549ac70f… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Sat Jan 27 14:27:38 2007 +0100 comctl32: Fix the TAB_ITEM_SIZE macro. --- dlls/comctl32/tab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 5ccc059..d17f6a7 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -96,7 +96,7 @@ typedef struct } TAB_ITEM; /* The size of a tab item depends on how much extra data is requested */ -#define TAB_ITEM_SIZE(infoPtr) (sizeof(TAB_ITEM) - sizeof(BYTE) + infoPtr->cbInfo) +#define TAB_ITEM_SIZE(infoPtr) (FIELD_OFFSET(TAB_ITEM, extra[(infoPtr)->cbInfo])) typedef struct {

1 0