wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Eric Pouech : dbghelp: Fix invalid pointer dereference.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: d2fa765087b0502242a1fa1ce2c8ad370be1e727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fa765087b0502242a1fa1ce… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Apr 12 12:58:50 2008 +0200 dbghelp: Fix invalid pointer dereference. --- dlls/dbghelp/pe_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index ca40417..533cfeb 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -456,7 +456,7 @@ PVOID WINAPI ImageDirectoryEntryToDataEx( PVOID base, BOOLEAN image, USHORT dir, *size = nt->OptionalHeader.DataDirectory[dir].Size; if (image || addr < nt->OptionalHeader.SizeOfHeaders) { - if (*section) *section = NULL; + if (section) *section = NULL; return (char *)base + addr; }

1 0

Rob Shearman : rpcrt4: Add buffer size checks to base type unmarshalling.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: e05ccfe2bb50bf0f6f44d113b8f6a537d4524084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05ccfe2bb50bf0f6f44d113b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Apr 12 10:07:26 2008 +0100 rpcrt4: Add buffer size checks to base type unmarshalling. Reimplement NdrSimpleTypeUnmarshall using similar macros to NdrBaseTypeUnmarshalling without buffer checks, due to NdrSimpleTypeUnmarshall not doing any safety checks. --- dlls/rpcrt4/ndr_marshall.c | 65 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index c496581..8e9ea5c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -24,7 +24,7 @@ * - transmit_as/represent as * - Multi-dimensional arrays * - Conversion functions (NdrConvert) - * - Checks for integer addition overflow in base type and user marshall functions + * - Checks for integer addition overflow in user marshall functions */ #include <stdarg.h> @@ -2003,11 +2003,70 @@ void WINAPI NdrSimpleTypeMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* p /*********************************************************************** * NdrSimpleTypeUnmarshall [RPCRT4.@] + * + * Unmarshall a base type. + * + * NOTES + * Doesn't check that the buffer is long enough before copying, so the caller + * should do this. */ void WINAPI NdrSimpleTypeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, unsigned char FormatChar ) { - NdrBaseTypeUnmarshall(pStubMsg, &pMemory, &FormatChar, 0); +#define BASE_TYPE_UNMARSHALL(type) \ + ALIGN_POINTER(pStubMsg->Buffer, sizeof(type)); \ + TRACE("pMemory: %p\n", pMemory); \ + *(type *)pMemory = *(type *)pStubMsg->Buffer; \ + pStubMsg->Buffer += sizeof(type); + + switch(FormatChar) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + BASE_TYPE_UNMARSHALL(UCHAR); + TRACE("value: 0x%02x\n", *pMemory); + break; + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + BASE_TYPE_UNMARSHALL(USHORT); + TRACE("value: 0x%04x\n", *(USHORT *)pMemory); + break; + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_ERROR_STATUS_T: + case RPC_FC_ENUM32: + BASE_TYPE_UNMARSHALL(ULONG); + TRACE("value: 0x%08x\n", *(ULONG *)pMemory); + break; + case RPC_FC_FLOAT: + BASE_TYPE_UNMARSHALL(float); + TRACE("value: %f\n", *(float *)pMemory); + break; + case RPC_FC_DOUBLE: + BASE_TYPE_UNMARSHALL(double); + TRACE("value: %f\n", *(double *)pMemory); + break; + case RPC_FC_HYPER: + BASE_TYPE_UNMARSHALL(ULONGLONG); + TRACE("value: %s\n", wine_dbgstr_longlong(*(ULONGLONG *)pMemory)); + break; + case RPC_FC_ENUM16: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); + TRACE("pMemory: %p\n", pMemory); + /* 16-bits on the wire, but int in memory */ + *(UINT *)pMemory = *(USHORT *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(USHORT); + TRACE("value: 0x%08x\n", *(UINT *)pMemory); + break; + case RPC_FC_IGNORE: + break; + default: + FIXME("Unhandled base type: 0x%02x\n", FormatChar); + } +#undef BASE_TYPE_UNMARSHALL } /*********************************************************************** @@ -6013,7 +6072,7 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall( TRACE("*ppMemory: %p\n", *ppMemory); \ **(type **)ppMemory = *(type *)pStubMsg->Buffer; \ } \ - pStubMsg->Buffer += sizeof(type); + safe_buffer_increment(pStubMsg, sizeof(type)); switch(*pFormat) {

1 0

Rob Shearman : qmgr: Dynamically link to advpack.dll.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: b2603687ccac5a6ce51132a1da9a7111cf5e2326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2603687ccac5a6ce51132a1d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Apr 12 10:06:56 2008 +0100 qmgr: Dynamically link to advpack.dll. Use RegInstall instead of RegInstallA as RegInstallA isn't available in some native versions of advpack commonly installed by programs. --- dlls/qmgr/Makefile.in | 2 +- dlls/qmgr/qmgr_main.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index de636db..57609ca 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = qmgr.dll -IMPORTS = advpack wininet urlmon ole32 advapi32 kernel32 +IMPORTS = wininet urlmon ole32 advapi32 kernel32 EXTRALIBS = -luuid C_SRCS = \ diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 2a21a28..5094874 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -141,6 +141,9 @@ static HRESULT register_server(BOOL do_register) { HRESULT hr; STRTABLEA strtable; + HMODULE hAdvpack; + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); + static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; TRACE("(%x)\n", do_register); @@ -150,9 +153,12 @@ static HRESULT register_server(BOOL do_register) return hr; } + hAdvpack = LoadLibraryW(wszAdvpack); + pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); + hr = init_register_strtable(&strtable); if (SUCCEEDED(hr)) - hr = RegInstallA(hInst, do_register ? "RegisterDll" : "UnregisterDll", + hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); cleanup_register_strtable(&strtable);

1 0

Andrew Talbot : comctl32: Remove unused variables.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: bab7871cac297216f7bc177d9b55d8c8da06ed91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab7871cac297216f7bc177d9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 12 18:31:43 2008 +0100 comctl32: Remove unused variables. --- dlls/comctl32/comboex.c | 4 +--- dlls/comctl32/listview.c | 3 +-- dlls/comctl32/monthcal.c | 4 +--- dlls/comctl32/rebar.c | 5 ++--- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index a98243d..e79831d 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -530,13 +530,11 @@ static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, int n, LPWSTR buf) static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT index) { - CBE_ITEMDATA const *item; - TRACE("(index=%d)\n", index); /* if item number requested does not exist then return failure */ if ((index >= infoPtr->nb_items) || (index < 0)) return CB_ERR; - if (!(item = COMBOEX_FindItem(infoPtr, index))) return CB_ERR; + if (!COMBOEX_FindItem(infoPtr, index)) return CB_ERR; /* doing this will result in WM_DELETEITEM being issued */ SendMessageW (infoPtr->hwndCombo, CB_DELETESTRING, (WPARAM)index, 0); diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index abe1470..ab819e6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9968,10 +9968,9 @@ static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *infoPtr, WPARAM wParam, LPA HFONT hFont, hOldFont = 0; RECT rect; SIZE sz; - int len; if (!infoPtr->hwndEdit || !hdc) return 0; - len = GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0])); + GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0])); GetWindowRect(infoPtr->hwndEdit, &rect); /* Select font to get the right dimension of the string */ diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 1c325de..a9647cd 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -442,7 +442,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT RECT *days=&dayrect; RECT rtoday; int i, j, m, mask, day, firstDay, weeknum, weeknum1,prevMonth; - int textHeight = infoPtr->textHeight, textWidth = infoPtr->textWidth; + int textHeight = infoPtr->textHeight; SIZE size; HBRUSH hbr; HFONT currentFont; @@ -659,13 +659,11 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT * date if necessary */ if(!(dwStyle & MCS_NOTODAY)) { - int offset = 0; if(!(dwStyle & MCS_NOTODAYCIRCLE)) { /*day is the number of days from nextmonth we put on the calendar */ MONTHCAL_CircleDay(infoPtr, hdc, day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear), infoPtr->currentMonth); - offset+=textWidth; } if (!LoadStringW(COMCTL32_hModule,IDM_TODAY,buf1,countof(buf1))) { diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 033b474..638acea 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2848,7 +2848,6 @@ REBAR_Create (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { LPCREATESTRUCTW cs = (LPCREATESTRUCTW) lParam; RECT wnrc1, clrc1; - HTHEME theme; if (TRACE_ON(rebar)) { GetWindowRect(infoPtr->hwndSelf, &wnrc1); @@ -2859,8 +2858,8 @@ REBAR_Create (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) } TRACE("created!\n"); - - if ((theme = OpenThemeData (infoPtr->hwndSelf, themeClass))) + + if (OpenThemeData (infoPtr->hwndSelf, themeClass)) { /* native seems to clear WS_BORDER when themed */ infoPtr->dwStyle &= ~WS_BORDER;

1 0

Andrew Talbot : dnsapi: Remove unused variables.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 07d73206c63c9628550a336160acd18e962e21ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d73206c63c9628550a33616… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Apr 11 21:40:37 2008 +0100 dnsapi: Remove unused variables. --- dlls/dnsapi/record.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index d84275a..9584031 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -644,7 +644,7 @@ BOOL WINAPI DnsRecordSetCompare( PDNS_RECORD set1, PDNS_RECORD set2, PDNS_RECORD *diff1, PDNS_RECORD *diff2 ) { BOOL ret = TRUE; - DNS_RECORD *r, *s1, *s2, *t, *u; + DNS_RECORD *r, *t, *u; DNS_RRSET rr1, rr2; TRACE( "(%p,%p,%p,%p)\n", set1, set2, diff1, diff2 ); @@ -668,9 +668,9 @@ BOOL WINAPI DnsRecordSetCompare( PDNS_RECORD set1, PDNS_RECORD set2, DNS_RRSET_INIT( rr1 ); DNS_RRSET_INIT( rr2 ); - for (r = s1 = set1; (s1 = r); r = r->pNext) + for (r = set1; r; r = r->pNext) { - for (t = s2 = set2; (s2 = t); t = t->pNext) + for (t = set2; t; t = t->pNext) { u = DnsRecordCopyEx( r, r->Flags.S.CharSet, t->Flags.S.CharSet ); if (!u) goto error; @@ -684,9 +684,9 @@ BOOL WINAPI DnsRecordSetCompare( PDNS_RECORD set1, PDNS_RECORD set2, } } - for (t = s2 = set2; (s2 = t); t = t->pNext) + for (t = set2; t; t = t->pNext) { - for (r = s1 = set1; (s1 = r); r = r->pNext) + for (r = set1; r; r = r->pNext) { u = DnsRecordCopyEx( t, t->Flags.S.CharSet, r->Flags.S.CharSet ); if (!u) goto error;

1 0

Alex Villacís Lasso : user32: LoadImage(IMAGE_BITMAP ) should reject invalid BMP files (with tests).
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 1fcc4ffdfa84dd6d56f7947c43ebe1d8446b9d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcc4ffdfa84dd6d56f7947c4… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Fri Apr 11 10:19:00 2008 -0500 user32: LoadImage(IMAGE_BITMAP) should reject invalid BMP files (with tests). --- dlls/user32/cursoricon.c | 11 ++++ dlls/user32/tests/cursoricon.c | 111 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index df6a408..153a2a4 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2148,8 +2148,19 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, } else { + BITMAPFILEHEADER * bmfh; + if (!(ptr = map_fileW( name, NULL ))) return 0; info = (BITMAPINFO *)(ptr + sizeof(BITMAPFILEHEADER)); + bmfh = (BITMAPFILEHEADER *)ptr; + if (!( bmfh->bfType == 0x4d42 /* 'BM' */ && + bmfh->bfReserved1 == 0 && + bmfh->bfReserved2 == 0)) + { + WARN("Invalid/unsupported bitmap format!\n"); + UnmapViewOfFile( ptr ); + return 0; + } } size = bitmap_info_size(info, DIB_RGB_COLORS); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 7ea79ad..40f3a14 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -583,6 +583,111 @@ static void test_CreateIcon(void) DeleteObject(hbmColor); } +/* Shamelessly ripped from dlls/oleaut32/tests/olepicture.c */ +/* 1x1 pixel gif */ +static const unsigned char gifimage[35] = { +0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, +0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, +0x01,0x00,0x3b +}; + +/* 1x1 pixel jpg */ +static const unsigned char jpgimage[285] = { +0xff,0xd8,0xff,0xe0,0x00,0x10,0x4a,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x01,0x2c, +0x01,0x2c,0x00,0x00,0xff,0xdb,0x00,0x43,0x00,0x05,0x03,0x04,0x04,0x04,0x03,0x05, +0x04,0x04,0x04,0x05,0x05,0x05,0x06,0x07,0x0c,0x08,0x07,0x07,0x07,0x07,0x0f,0x0b, +0x0b,0x09,0x0c,0x11,0x0f,0x12,0x12,0x11,0x0f,0x11,0x11,0x13,0x16,0x1c,0x17,0x13, +0x14,0x1a,0x15,0x11,0x11,0x18,0x21,0x18,0x1a,0x1d,0x1d,0x1f,0x1f,0x1f,0x13,0x17, +0x22,0x24,0x22,0x1e,0x24,0x1c,0x1e,0x1f,0x1e,0xff,0xdb,0x00,0x43,0x01,0x05,0x05, +0x05,0x07,0x06,0x07,0x0e,0x08,0x08,0x0e,0x1e,0x14,0x11,0x14,0x1e,0x1e,0x1e,0x1e, +0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e, +0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e, +0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0xff,0xc0, +0x00,0x11,0x08,0x00,0x01,0x00,0x01,0x03,0x01,0x22,0x00,0x02,0x11,0x01,0x03,0x11, +0x01,0xff,0xc4,0x00,0x15,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0xff,0xc4,0x00,0x14,0x10,0x01,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xc4, +0x00,0x14,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0xff,0xc4,0x00,0x14,0x11,0x01,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xda,0x00,0x0c,0x03,0x01, +0x00,0x02,0x11,0x03,0x11,0x00,0x3f,0x00,0xb2,0xc0,0x07,0xff,0xd9 +}; + +/* 1x1 pixel png */ +static const unsigned char pngimage[285] = { +0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, +0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, +0xde,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b, +0x13,0x01,0x00,0x9a,0x9c,0x18,0x00,0x00,0x00,0x07,0x74,0x49,0x4d,0x45,0x07,0xd5, +0x06,0x03,0x0f,0x07,0x2d,0x12,0x10,0xf0,0xfd,0x00,0x00,0x00,0x0c,0x49,0x44,0x41, +0x54,0x08,0xd7,0x63,0xf8,0xff,0xff,0x3f,0x00,0x05,0xfe,0x02,0xfe,0xdc,0xcc,0x59, +0xe7,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82 +}; + +/* 1x1 pixel bmp */ +static const unsigned char bmpimage[66] = { +0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, +0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00, +0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, +0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00, +0x00,0x00 +}; + +/* 2x2 pixel gif */ +static const unsigned char gif4pixel[42] = { +0x47,0x49,0x46,0x38,0x37,0x61,0x02,0x00,0x02,0x00,0xa1,0x00,0x00,0x00,0x00,0x00, +0x39,0x62,0xfc,0xff,0x1a,0xe5,0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x02,0x00, +0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b +}; + +static void test_LoadImageFile(const unsigned char * image_data, + unsigned int image_size, const char * ext, BOOL expect_success) +{ + HANDLE handle; + BOOL ret; + DWORD error, bytes_written; + char filename[64]; + + strcpy(filename, "test."); + strcat(filename, ext); + + /* Create the test image. */ + handle = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "CreateFileA failed. %u\n", GetLastError()); + ret = WriteFile(handle, image_data, image_size, &bytes_written, NULL); + ok(bytes_written == image_size, "test file created improperly.\n"); + CloseHandle(handle); + + /* Load as cursor. For all tested formats, this should fail */ + SetLastError(0xdeadbeef); + handle = LoadImageA(NULL, filename, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); + ok(handle == NULL, "LoadImage(%s) as IMAGE_CURSOR succeeded incorrectly.\n", ext); + error = GetLastError(); + ok(error == 0, "Last error: %u\n", error); + if (handle != NULL) DestroyCursor(handle); + + /* Load as icon. For all tested formats, this should fail */ + SetLastError(0xdeadbeef); + handle = LoadImageA(NULL, filename, IMAGE_ICON, 0, 0, LR_LOADFROMFILE); + ok(handle == NULL, "LoadImage(%s) as IMAGE_ICON succeeded incorrectly.\n", ext); + error = GetLastError(); + ok(error == 0, "Last error: %u\n", error); + if (handle != NULL) DestroyIcon(handle); + + /* Load as bitmap. Should succeed if bmp, fail for everything else */ + SetLastError(0xdeadbeef); + handle = LoadImageA(NULL, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); + if (expect_success) + ok(handle != NULL, "LoadImage(%s) as IMAGE_BITMAP failed.\n", ext); + else ok(handle == NULL, "LoadImage(%s) as IMAGE_BITMAP succeeded incorrectly.\n", ext); + error = GetLastError(); + ok(error == 0, "Last error: %u\n", error); + if (handle != NULL) DeleteObject(handle); + + DeleteFileA(filename); +} + static void test_LoadImage(void) { HANDLE handle; @@ -668,6 +773,12 @@ static void test_LoadImage(void) HeapFree(GetProcessHeap(), 0, icon_data); DeleteFileA("icon.ico"); + + test_LoadImageFile(bmpimage, sizeof(bmpimage), "bmp", 1); + test_LoadImageFile(gifimage, sizeof(gifimage), "gif", 0); + test_LoadImageFile(gif4pixel, sizeof(gif4pixel), "gif", 0); + test_LoadImageFile(jpgimage, sizeof(jpgimage), "jpg", 0); + test_LoadImageFile(pngimage, sizeof(pngimage), "png", 0); } static void test_DestroyCursor(void)

1 0

Alexandre Julliard : gdi32: Fix CreateCompatibleDC to reject invalid DCs.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 0482c8e81854ed52f5db2b177e0e51fec091ad1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0482c8e81854ed52f5db2b177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 12:06:24 2008 +0200 gdi32: Fix CreateCompatibleDC to reject invalid DCs. --- dlls/gdi32/dc.c | 1 + dlls/gdi32/tests/dc.c | 4 ---- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ffd6a1b..debbde8 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -785,6 +785,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) release_dc_ptr( origDC ); if (funcs) funcs = DRIVER_get_driver( funcs ); } + else if (hdc) return 0; if (!funcs && !(funcs = DRIVER_load_driver( displayW ))) return 0; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index d0ca5cf..9e0048e 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -248,15 +248,11 @@ static void test_CreateCompatibleDC(void) bRet = DeleteDC(hDC); ok(bRet == TRUE, "DeleteDC returned %u\n", bRet); -todo_wine -{ /* Try to create a DC compatible to the deleted DC. This has to fail */ hNewDC = CreateCompatibleDC(hDC); ok(hNewDC == NULL, "CreateCompatibleDC returned %p\n", hNewDC); } -} - START_TEST(dc) { test_savedc();

1 0

Alexandre Julliard : wordpad: Don' t pass an invalid DC to CreateCompatibleDC.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 2004d2b2f687846ca0120462c8f50e3012368dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2004d2b2f687846ca0120462c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 12:05:57 2008 +0200 wordpad: Don't pass an invalid DC to CreateCompatibleDC. --- programs/wordpad/print.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index aa9ac71..c0cd182 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -500,7 +500,7 @@ static void add_ruler_units(HDC hdcRuler, RECT* drawRect, BOOL NewMetrics, long DeleteObject(hBitmap); } - hdc = CreateCompatibleDC(hdc); + hdc = CreateCompatibleDC(0); CmPixels = twips_to_pixels(TWIPS_PER_CM, GetDeviceCaps(hdc, LOGPIXELSX)); QuarterCmPixels = (int)((float)CmPixels / 4.0);

1 0

Colin Finck : gdi32: Add a test to demonstrate a CreateCompatibleDC problem .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 8a2e787161fc4551d6c3dede095202c72dc7fe60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a2e787161fc4551d6c3dede0… Author: Colin Finck <mail(a)colinfinck.de> Date: Fri Apr 11 15:07:20 2008 +0200 gdi32: Add a test to demonstrate a CreateCompatibleDC problem. --- dlls/gdi32/tests/dc.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 79b6ef7..d0ca5cf 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -234,9 +234,33 @@ static void test_GdiConvertToDevmodeW(void) HeapFree(GetProcessHeap(), 0, dmW); } +static void test_CreateCompatibleDC(void) +{ + BOOL bRet; + HDC hDC; + HDC hNewDC; + + /* Create a DC compatible with the screen */ + hDC = CreateCompatibleDC(NULL); + ok(hDC != NULL, "CreateCompatibleDC returned %p\n", hDC); + + /* Delete this DC, this should succeed */ + bRet = DeleteDC(hDC); + ok(bRet == TRUE, "DeleteDC returned %u\n", bRet); + +todo_wine +{ + /* Try to create a DC compatible to the deleted DC. This has to fail */ + hNewDC = CreateCompatibleDC(hDC); + ok(hNewDC == NULL, "CreateCompatibleDC returned %p\n", hNewDC); +} + +} + START_TEST(dc) { test_savedc(); test_savedc_2(); test_GdiConvertToDevmodeW(); + test_CreateCompatibleDC(); }

1 0

Aric Stewart : user32: Make sure there is space for at least 6 items in a combo dropdown without forcing it to be at most 6 items as well .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: d0cf2342df427afa6d0c5f367f83b55f578e56e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0cf2342df427afa6d0c5f367… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 11 09:07:31 2008 -0500 user32: Make sure there is space for at least 6 items in a combo dropdown without forcing it to be at most 6 items as well. --- dlls/user32/combo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 14eebe8..0e66b7d 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1107,7 +1107,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) { if (nItems < 5) nDroppedHeight = (nItems+1)*nIHeight; - else + else if (nDroppedHeight < 6*nIHeight) nDroppedHeight = 6*nIHeight; } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008