February 2007 - Wine-commits

Michael Stefaniuc : msvcrt: Fix *printf() handling of negative field width.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: bbe9c51b31e8a5d7f91853350552e63ffc638de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe9c51b31e8a5d7f91853350… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 29 23:53:46 2007 +0100 msvcrt: Fix *printf() handling of negative field width. --- dlls/msvcrt/tests/printf.c | 5 +++++ dlls/msvcrt/wcs.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 53d88f4..23cc5c8 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -279,6 +279,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"f"),"Precision ignored \"%s\"\n",buffer); ok( r==1, "return count wrong\n"); + format = "%*s"; + r = sprintf(buffer,format,-5,"foo"); + ok(!strcmp(buffer,"foo "),"Negative field width ignored \"%s\"\n",buffer); + ok( r==5, "return count wrong\n"); + format = "%#-012p"; r = sprintf(buffer,format,(void *)57); ok(!strcmp(buffer,"0X00000039 "),"Pointer formatted incorrectly\n"); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ad3887f..32668a3 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -568,9 +568,14 @@ static int pf_vsnprintf( pf_output *out, /* deal with the field width specifier */ flags.FieldLength = 0; - if( *p == '*' ) + if( *p == '*' ) { flags.FieldLength = va_arg( valist, int ); + if (flags.FieldLength < 0) + { + flags.LeftAlign = '-'; + flags.FieldLength = -flags.FieldLength; + } p++; } else while( isdigit(*p) )

1 0

Bang Jun-Young : wininet: config.h police.
by Alexandre Julliard 05 Feb '07

05 Feb '07

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

Andrew Talbot : avifil32: Declare some variables static.
by Alexandre Julliard 05 Feb '07

05 Feb '07

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

Bang Jun-Young : advapi32: Fix prototypes to match the PSDK.
by Alexandre Julliard 05 Feb '07

05 Feb '07

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 : sensapi: Declare a variable static.
by Alexandre Julliard 05 Feb '07

05 Feb '07

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 05 Feb '07

05 Feb '07

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 : serialui: Declare some items static.
by Alexandre Julliard 05 Feb '07

05 Feb '07

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

Andrew Talbot : sane.ds: Declare a function static.
by Alexandre Julliard 05 Feb '07

05 Feb '07

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 : setupapi: Declare some functions static.
by Alexandre Julliard 05 Feb '07

05 Feb '07

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

Dmitry Timoshkov : gdi32: CreateBitmap and friends should return stock DEFAULT_BITMAP if requested bitmap width or height is 0 .
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 0510a7a5996ea7ece6c6fc9102a898a10f0b0af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0510a7a5996ea7ece6c6fc910… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Jan 27 17:56:31 2007 +0800 gdi32: CreateBitmap and friends should return stock DEFAULT_BITMAP if requested bitmap width or height is 0. --- dlls/gdi32/bitmap.c | 16 +++++---- dlls/gdi32/tests/bitmap.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 752c6b3..22384de 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -236,10 +236,8 @@ HBITMAP WINAPI CreateBitmapIndirect( con BITMAPOBJ *bmpobj; HBITMAP hbitmap; - if (!bmp || bmp->bmType || bmp->bmPlanes != 1) + if (!bmp || bmp->bmType) { - if (bmp && bmp->bmPlanes != 1) - FIXME("planes = %d\n", bmp->bmPlanes); SetLastError( ERROR_INVALID_PARAMETER ); return NULL; } @@ -248,10 +246,7 @@ HBITMAP WINAPI CreateBitmapIndirect( con if (!bm.bmWidth || !bm.bmHeight) { - bm.bmWidth = bm.bmHeight = 1; - bm.bmPlanes = bm.bmBitsPixel = 1; - bm.bmWidthBytes = 2; - bm.bmBits = NULL; + return GetStockObject( DEFAULT_BITMAP ); } else { @@ -261,6 +256,13 @@ HBITMAP WINAPI CreateBitmapIndirect( con bm.bmWidth = -bm.bmWidth; } + if (bm.bmPlanes != 1) + { + FIXME("planes = %d\n", bm.bmPlanes); + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + /* Create the BITMAPOBJ */ bmpobj = GDI_AllocObject( sizeof(BITMAPOBJ), BITMAP_MAGIC, (HGDIOBJ *)&hbitmap, &bitmap_funcs ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index f0da8df..ee4abc3 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1605,6 +1605,87 @@ static void test_select_object(void) DeleteDC(hdc); } +static void test_mono_1x1_bmp_dbg(HBITMAP hbmp, int line) +{ + INT ret; + BITMAP bm; + + ret = GetObjectType(hbmp); + ok_(__FILE__, line)(ret == OBJ_BITMAP, "the object %p is not bitmap\n", hbmp); + + ret = GetObject(hbmp, 0, 0); + ok_(__FILE__, line)(ret == sizeof(BITMAP) /* XP */ || + ret == sizeof(DIBSECTION) /* Win9x */, "object size %d\n", ret); + + memset(&bm, 0xDA, sizeof(bm)); + SetLastError(0xdeadbeef); + ret = GetObject(hbmp, sizeof(bm), &bm); + if (!ret) /* XP, only for curObj2 */ return; + ok_(__FILE__, line)(ret == sizeof(BITMAP) || + ret == sizeof(DIBSECTION) /* Win9x, only for curObj2 */, + "GetObject returned %d, error %u\n", ret, GetLastError()); + ok_(__FILE__, line)(bm.bmType == 0, "wrong bmType %d\n", bm.bmType); + ok_(__FILE__, line)(bm.bmWidth == 1, "wrong bmWidth %d\n", bm.bmWidth); + ok_(__FILE__, line)(bm.bmHeight == 1, "wrong bmHeight %d\n", bm.bmHeight); + ok_(__FILE__, line)(bm.bmWidthBytes == 2, "wrong bmWidthBytes %d\n", bm.bmWidthBytes); + ok_(__FILE__, line)(bm.bmPlanes == 1, "wrong bmPlanes %u\n", bm.bmPlanes); + ok_(__FILE__, line)(bm.bmBitsPixel == 1, "wrong bmBitsPixel %d\n", bm.bmBitsPixel); + ok_(__FILE__, line)(!bm.bmBits, "wrong bmBits %p\n", bm.bmBits); +} + +#define test_mono_1x1_bmp(a) test_mono_1x1_bmp_dbg((a), __LINE__) + +static void test_CreateBitmap(void) +{ + HDC screenDC = GetDC(0); + HDC hdc = CreateCompatibleDC(screenDC); + + /* all of these are the stock monochrome bitmap */ + HBITMAP bm = CreateCompatibleBitmap(hdc, 0, 0); + HBITMAP bm1 = CreateCompatibleBitmap(screenDC, 0, 0); + HBITMAP bm4 = CreateBitmap(0, 1, 0, 0, 0); + HBITMAP bm5 = CreateDiscardableBitmap(hdc, 0, 0); + HBITMAP curObj1 = (HBITMAP)GetCurrentObject(hdc, OBJ_BITMAP); + HBITMAP curObj2 = (HBITMAP)GetCurrentObject(screenDC, OBJ_BITMAP); + + /* these 2 are not the stock monochrome bitmap */ + HBITMAP bm2 = CreateCompatibleBitmap(hdc, 1, 1); + HBITMAP bm3 = CreateBitmap(1, 1, 1, 1, 0); + + HBITMAP old1 = (HBITMAP)SelectObject(hdc, bm2); + HBITMAP old2 = (HBITMAP)SelectObject(screenDC, bm3); + SelectObject(hdc, old1); + SelectObject(screenDC, old2); + + ok(bm == bm1 && bm == bm4 && bm == bm5 && bm == curObj1 && bm == old1, + "0: %p, 1: %p, 4: %p, 5: %p, curObj1 %p, old1 %p\n", + bm, bm1, bm4, bm5, curObj1, old1); + ok(bm != bm2 && bm != bm3, "0: %p, 2: %p, 3: %p\n", bm, bm2, bm3); + ok(bm != curObj2 /* XP */ || bm == curObj2 /* Win9x */, + "0: %p, curObj2 %p\n", bm, curObj2); + ok(old2 == 0, "old2 %p\n", old2); + + test_mono_1x1_bmp(bm); + test_mono_1x1_bmp(bm1); + test_mono_1x1_bmp(bm2); + test_mono_1x1_bmp(bm3); + test_mono_1x1_bmp(bm4); + test_mono_1x1_bmp(bm5); + test_mono_1x1_bmp(old1); + test_mono_1x1_bmp(curObj1); + test_mono_1x1_bmp(curObj2); + + DeleteObject(bm); + DeleteObject(bm1); + DeleteObject(bm2); + DeleteObject(bm3); + DeleteObject(bm4); + DeleteObject(bm5); + + DeleteDC(hdc); + ReleaseDC(0, screenDC); +} + START_TEST(bitmap) { is_win9x = GetWindowLongPtrW(GetDesktopWindow(), GWLP_WNDPROC) == 0; @@ -1621,4 +1702,5 @@ START_TEST(bitmap) test_GetDIBits_selected_DDB(FALSE); test_GetDIBits(); test_select_object(); + test_CreateBitmap(); }

1 0