January 2008 - Wine-Commits

Jonathan Ernst : loader: Updated French man page.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: ff72b544455733a5d57e3e98eabbb3592a792258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff72b544455733a5d57e3e98e… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Fri Jan 11 14:40:09 2008 +0100 loader: Updated French man page. --- loader/wine.fr.man.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/wine.fr.man.in b/loader/wine.fr.man.in index e497ae3..17c727e 100644 --- a/loader/wine.fr.man.in +++ b/loader/wine.fr.man.in @@ -168,7 +168,7 @@ dans l'espace d'adressage d'un processus : Les dlls natives de Windows ( .I builtin ). Le type peut être abrégé avec la première lettre du type ( .I n, b -). Chaque séquence d'ordre doit être séparé par une virgule. +). La bibliothèque peut également être désactivée (''). Chaque séquence d'ordre doit être séparé par une virgule. .RS .PP Chaque dll peut avoir son ordre de chargement propre. L'orde de chargement @@ -198,12 +198,12 @@ WINEDLLOVERRIDES="comdlg32,shell32=n;c:\(rs\(rsfoo\(rs\(rsbar\(rs\(rsbaz=b" Tente de charger les bibliothèques windows natives comdlg32 et shell32. De plus, si une application demande le chargement de c:\(rsfoo\(rsbar\(rsbaz.dll, chargera la bibliothèque fournie baz. .TP -WINEDLLOVERRIDES="comdlg32=b,n;shell32=b;comctl32=n" +WINEDLLOVERRIDES="comdlg32=b,n;shell32=b;comctl32=n;oleaut32=" .br Tente de charger la bibliothèque fournie comdlg32 en premier, puis essaie la version native ensuite si le chargement de la version fournie échoue. Dans tous les cas, la version fournie de shell32 et la -version native de comctl32 sera chargée. +version native de comctl32 sera chargée. Oleaut32 sera désactivée. .RE .TP .I DISPLAY

1 0

Alexandre Julliard : server: Take into account the extended registers part of the i386 context.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: b317416b20d4ab4a63c8ed83cfa3ba9abaaef714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b317416b20d4ab4a63c8ed83c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 11:53:31 2008 +0100 server: Take into account the extended registers part of the i386 context. --- server/context_i386.c | 4 ++++ server/trace.c | 36 ++++++++++++++++++++++++------------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/server/context_i386.c b/server/context_i386.c index 575d5b9..57709fe 100644 --- a/server/context_i386.c +++ b/server/context_i386.c @@ -66,6 +66,10 @@ void copy_context( CONTEXT *to, const CONTEXT *from, unsigned int flags ) { to->FloatSave = from->FloatSave; } + if (flags & CONTEXT_EXTENDED_REGISTERS) + { + memcpy( to->ExtendedRegisters, from->ExtendedRegisters, sizeof(to->ExtendedRegisters) ); + } if (flags & CONTEXT_DEBUG_REGISTERS) { to->Dr0 = from->Dr0; diff --git a/server/trace.c b/server/trace.c index 8a11066..dab137d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -259,21 +259,30 @@ static void dump_luid( const luid_t *luid ) fprintf( stderr, "%d.%u", luid->high_part, luid->low_part ); } -static void dump_context( const CONTEXT *context ) +static void dump_context( const CONTEXT *context, data_size_t size ) { + CONTEXT ctx; + + memset( &ctx, 0, sizeof(ctx) ); + memcpy( &ctx, context, min( size, sizeof(CONTEXT) )); #ifdef __i386__ fprintf( stderr, "{flags=%08x,eax=%08x,ebx=%08x,ecx=%08x,edx=%08x,esi=%08x,edi=%08x," "ebp=%08x,eip=%08x,esp=%08x,eflags=%08x,cs=%04x,ds=%04x,es=%04x," "fs=%04x,gs=%04x,dr0=%08x,dr1=%08x,dr2=%08x,dr3=%08x,dr6=%08x,dr7=%08x,", - context->ContextFlags, context->Eax, context->Ebx, context->Ecx, context->Edx, - context->Esi, context->Edi, context->Ebp, context->Eip, context->Esp, context->EFlags, - context->SegCs, context->SegDs, context->SegEs, context->SegFs, context->SegGs, - context->Dr0, context->Dr1, context->Dr2, context->Dr3, context->Dr6, context->Dr7 ); + ctx.ContextFlags, ctx.Eax, ctx.Ebx, ctx.Ecx, ctx.Edx, + ctx.Esi, ctx.Edi, ctx.Ebp, ctx.Eip, ctx.Esp, ctx.EFlags, + ctx.SegCs, ctx.SegDs, ctx.SegEs, ctx.SegFs, ctx.SegGs, + ctx.Dr0, ctx.Dr1, ctx.Dr2, ctx.Dr3, ctx.Dr6, ctx.Dr7 ); fprintf( stderr, "float=" ); - dump_uints( (const int *)&context->FloatSave, sizeof(context->FloatSave) / sizeof(int) ); + dump_uints( (const int *)&ctx.FloatSave, sizeof(ctx.FloatSave) / sizeof(int) ); + if (size > FIELD_OFFSET( CONTEXT, ExtendedRegisters )) + { + fprintf( stderr, ",extended=" ); + dump_uints( (const int *)&ctx.ExtendedRegisters, sizeof(ctx.ExtendedRegisters) / sizeof(int) ); + } fprintf( stderr, "}" ); #else - dump_uints( (const int *)context, sizeof(*context) / sizeof(int) ); + dump_uints( (const int *)&ctx, sizeof(ctx) / sizeof(int) ); #endif } @@ -384,8 +393,8 @@ static void dump_varargs_context( data_size_t size ) fprintf( stderr, "{}" ); return; } - dump_context( cur_data ); - remove_data( size ); + dump_context( cur_data, size ); + remove_data( min( size, sizeof(CONTEXT) )); } static void dump_varargs_exc_event( data_size_t size ) @@ -398,9 +407,12 @@ static void dump_varargs_exc_event( data_size_t size ) return; } fprintf( stderr, "{context=" ); - dump_context( ptr ); - fprintf( stderr, ",rec=" ); - dump_exc_record( (const EXCEPTION_RECORD *)(ptr + 1) ); + dump_context( ptr, size ); + if (size > sizeof(CONTEXT)) + { + fprintf( stderr, ",rec=" ); + dump_exc_record( (const EXCEPTION_RECORD *)(ptr + 1) ); + } fputc( '}', stderr ); remove_data( size ); }

1 0

Paul Vriens : kernel32/tests: FindFirstVolumeA is not available on win98.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: 4111ea931cb6c41ea2f538f7d3397eb145d40dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4111ea931cb6c41ea2f538f7d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jan 15 11:37:28 2008 +0100 kernel32/tests: FindFirstVolumeA is not available on win98. --- dlls/kernel32/tests/volume.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 94ace87..da34f54 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -52,6 +52,11 @@ static void test_FindFirstVolume(void) char volume[50]; HANDLE handle; + if (!pFindFirstVolumeA) { + skip("FindFirstVolumeA not found\n"); + return; + } + handle = pFindFirstVolumeA( volume, 0 ); ok( handle == INVALID_HANDLE_VALUE, "succeeded with short buffer\n" ); ok( GetLastError() == ERROR_FILENAME_EXCED_RANGE, "wrong error %u\n", GetLastError() );

1 0

Dmitry Timoshkov : gdi32: Do not allow to create too large device dependent bitmaps like Windows does .
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: d5456de058da12e06d6b96b129bf699bae380ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5456de058da12e06d6b96b12… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 15 18:45:17 2008 +0800 gdi32: Do not allow to create too large device dependent bitmaps like Windows does. --- dlls/gdi32/bitmap.c | 118 +++++++++++++++++++++++---------------------- dlls/gdi32/tests/bitmap.c | 18 +++++++ 2 files changed, 79 insertions(+), 57 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 3355541..55b3236 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -136,79 +136,71 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height) TRACE("(%p,%d,%d) =\n", hdc, width, height); - if ((width >= 0x10000) || (height >= 0x10000)) + if (!(dc = DC_GetDCPtr(hdc))) return 0; + + if (GDIMAGIC( dc->header.wMagic ) != MEMORY_DC_MAGIC) { - FIXME("got bad width %d or height %d, please look for reason\n", - width, height); + hbmpRet = CreateBitmap(width, height, + GetDeviceCaps(hdc, PLANES), + GetDeviceCaps(hdc, BITSPIXEL), + NULL); } - else + else /* Memory DC */ { - if (!(dc = DC_GetDCPtr(hdc))) return 0; + BITMAPOBJ *bmp = GDI_GetObjPtr( dc->hBitmap, BITMAP_MAGIC ); - if (GDIMAGIC( dc->header.wMagic ) != MEMORY_DC_MAGIC) + if (!bmp->dib) { + /* A device-dependent bitmap is selected in the DC */ hbmpRet = CreateBitmap(width, height, - GetDeviceCaps(hdc, PLANES), - GetDeviceCaps(hdc, BITSPIXEL), + bmp->bitmap.bmPlanes, + bmp->bitmap.bmBitsPixel, NULL); } - else /* Memory DC */ + else { - BITMAPOBJ *bmp = GDI_GetObjPtr( dc->hBitmap, BITMAP_MAGIC ); - - if (!bmp->dib) - { - /* A device-dependent bitmap is selected in the DC */ - hbmpRet = CreateBitmap(width, height, - bmp->bitmap.bmPlanes, - bmp->bitmap.bmBitsPixel, - NULL); - } - else - { - /* A DIB section is selected in the DC */ - BITMAPINFO *bi; - void *bits; + /* A DIB section is selected in the DC */ + BITMAPINFO *bi; + void *bits; - /* Allocate memory for a BITMAPINFOHEADER structure and a - color table. The maximum number of colors in a color table - is 256 which corresponds to a bitmap with depth 8. - Bitmaps with higher depths don't have color tables. */ - bi = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + /* Allocate memory for a BITMAPINFOHEADER structure and a + color table. The maximum number of colors in a color table + is 256 which corresponds to a bitmap with depth 8. + Bitmaps with higher depths don't have color tables. */ + bi = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (bi) + if (bi) + { + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biWidth = width; + bi->bmiHeader.biHeight = height; + bi->bmiHeader.biPlanes = bmp->dib->dsBmih.biPlanes; + bi->bmiHeader.biBitCount = bmp->dib->dsBmih.biBitCount; + bi->bmiHeader.biCompression = bmp->dib->dsBmih.biCompression; + bi->bmiHeader.biSizeImage = 0; + bi->bmiHeader.biXPelsPerMeter = bmp->dib->dsBmih.biXPelsPerMeter; + bi->bmiHeader.biYPelsPerMeter = bmp->dib->dsBmih.biYPelsPerMeter; + bi->bmiHeader.biClrUsed = bmp->dib->dsBmih.biClrUsed; + bi->bmiHeader.biClrImportant = bmp->dib->dsBmih.biClrImportant; + + if (bi->bmiHeader.biCompression == BI_BITFIELDS) + { + /* Copy the color masks */ + CopyMemory(bi->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD)); + } + else if (bi->bmiHeader.biBitCount <= 8) { - bi->bmiHeader.biSize = sizeof(bi->bmiHeader); - bi->bmiHeader.biWidth = width; - bi->bmiHeader.biHeight = height; - bi->bmiHeader.biPlanes = bmp->dib->dsBmih.biPlanes; - bi->bmiHeader.biBitCount = bmp->dib->dsBmih.biBitCount; - bi->bmiHeader.biCompression = bmp->dib->dsBmih.biCompression; - bi->bmiHeader.biSizeImage = 0; - bi->bmiHeader.biXPelsPerMeter = bmp->dib->dsBmih.biXPelsPerMeter; - bi->bmiHeader.biYPelsPerMeter = bmp->dib->dsBmih.biYPelsPerMeter; - bi->bmiHeader.biClrUsed = bmp->dib->dsBmih.biClrUsed; - bi->bmiHeader.biClrImportant = bmp->dib->dsBmih.biClrImportant; - - if (bi->bmiHeader.biCompression == BI_BITFIELDS) - { - /* Copy the color masks */ - CopyMemory(bi->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD)); - } - else if (bi->bmiHeader.biBitCount <= 8) - { - /* Copy the color table */ - GetDIBColorTable(hdc, 0, 256, bi->bmiColors); - } - - hbmpRet = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); - HeapFree(GetProcessHeap(), 0, bi); + /* Copy the color table */ + GetDIBColorTable(hdc, 0, 256, bi->bmiColors); } + + hbmpRet = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); + HeapFree(GetProcessHeap(), 0, bi); } - GDI_ReleaseObj(dc->hBitmap); } - DC_ReleaseDCPtr( dc ); + GDI_ReleaseObj(dc->hBitmap); } + DC_ReleaseDCPtr( dc ); TRACE("\t\t%p\n", hbmpRet); return hbmpRet; @@ -242,6 +234,12 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) return NULL; } + if (bmp->bmWidth > 0x7ffffff || bmp->bmHeight > 0x7ffffff) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + bm = *bmp; if (!bm.bmWidth || !bm.bmHeight) @@ -278,6 +276,12 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) /* Windows ignores the provided bm.bmWidthBytes */ bm.bmWidthBytes = BITMAP_GetWidthBytes( bm.bmWidth, bm.bmBitsPixel ); + /* XP doesn't allow to create bitmaps larger than 128 Mb */ + if (bm.bmHeight * bm.bmWidthBytes > 128 * 1024 * 1024) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return 0; + } /* Create the BITMAPOBJ */ bmpobj = GDI_AllocObject( sizeof(BITMAPOBJ), BITMAP_MAGIC, diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index eb6c09d..573fe56 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" +#include "winerror.h" #include "wingdi.h" #include "winuser.h" #include "mmsystem.h" @@ -966,6 +967,23 @@ static void test_bitmap(void) hdc = CreateCompatibleDC(0); assert(hdc != 0); + SetLastError(0xdeadbeef); + hbmp = CreateBitmap(0x7ffffff, 1, 1, 1, NULL); + ok(hbmp != 0, "CreateBitmap should not fail\n"); + DeleteObject(hbmp); + + SetLastError(0xdeadbeef); + hbmp = CreateBitmap(0x7ffffff, 9, 1, 1, NULL); + ok(!hbmp, "CreateBitmap should fail\n"); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, + "expected ERROR_NOT_ENOUGH_MEMORY, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + hbmp = CreateBitmap(0x7ffffff + 1, 1, 1, 1, NULL); + ok(!hbmp, "CreateBitmap should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + hbmp = CreateBitmap(15, 15, 1, 1, NULL); assert(hbmp != NULL);

1 0

Andrew Talbot : ole32: Remove unneeded casts.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: 554644fd0db98e8eafe5ab41ad47839ff5fdbfd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=554644fd0db98e8eafe5ab41a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jan 14 22:02:11 2008 +0000 ole32: Remove unneeded casts. --- dlls/ole32/clipboard.c | 2 +- dlls/ole32/git.c | 4 ++-- dlls/ole32/ole16.c | 2 +- dlls/ole32/ole2.c | 4 ++-- dlls/ole32/stg_prop.c | 10 +++++----- dlls/ole32/storage32.c | 16 +++------------- 6 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 89ecfd5..4e43e38 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1273,7 +1273,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData( * Return the clipboard data in the storage medium structure */ pmedium->tymed = (hData == 0) ? TYMED_NULL : TYMED_HGLOBAL; - pmedium->u.hGlobal = (HGLOBAL)hData; + pmedium->u.hGlobal = hData; pmedium->pUnkForRelease = NULL; hr = S_OK; diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index e878f83..49dc3c8 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -104,7 +104,7 @@ StdGlobalInterfaceTable_FindEntry(IGlobalInterfaceTable* iface, DWORD cookie) StdGlobalInterfaceTableImpl* const self = (StdGlobalInterfaceTableImpl*) iface; StdGITEntry* e; - TRACE("iface=%p, cookie=0x%x\n", iface, (UINT)cookie); + TRACE("iface=%p, cookie=0x%x\n", iface, cookie); LIST_FOR_EACH_ENTRY(e, &self->list, StdGITEntry, entry) { if (e->cookie == cookie) @@ -227,7 +227,7 @@ StdGlobalInterfaceTable_RevokeInterfaceFromGlobal( StdGITEntry* entry; HRESULT hr; - TRACE("iface=%p, dwCookie=0x%x\n", iface, (UINT)dwCookie); + TRACE("iface=%p, dwCookie=0x%x\n", iface, dwCookie); EnterCriticalSection(&git_section); diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index b89efa8..56a30f4 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -154,7 +154,7 @@ DWORD CDECL IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv) * IMalloc16_DidAlloc [COMPOBJ.507] */ INT16 CDECL IMalloc16_fnDidAlloc(IMalloc16* iface,LPVOID pv) { - IMalloc16 *This = (IMalloc16 *)iface; + IMalloc16 *This = iface; TRACE("(%p)->DidAlloc(%p)\n",This,pv); return (INT16)-1; } diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index f6c0d18..91e35e2 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1400,7 +1400,7 @@ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lPar * If the window has an OLEMenu property we may need to dispatch * the menu message to its active objects window instead. */ - hOleMenu = (HOLEMENU)GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); + hOleMenu = GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); if ( !hOleMenu ) goto NEXTHOOK; @@ -1505,7 +1505,7 @@ static LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lPara * If the window has an OLEMenu property we may need to dispatch * the menu message to its active objects window instead. */ - hOleMenu = (HOLEMENU)GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); + hOleMenu = GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); if ( !hOleMenu ) goto NEXTHOOK; diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 76a86ca..6f4c690 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -200,7 +200,7 @@ static HRESULT WINAPI IPropertyStorage_fnQueryInterface( IsEqualGUID(&IID_IPropertyStorage, riid)) { IPropertyStorage_AddRef(iface); - *ppvObject = (IPropertyStorage*)iface; + *ppvObject = iface; return S_OK; } @@ -263,7 +263,7 @@ static PROPVARIANT *PropertyStorage_FindPropertyByName( if (This->codePage == CP_UNICODE) { if (dictionary_find(This->name_to_propid, name, (void **)&propid)) - ret = PropertyStorage_FindProperty(This, (PROPID)propid); + ret = PropertyStorage_FindProperty(This, propid); } else { @@ -275,7 +275,7 @@ static PROPVARIANT *PropertyStorage_FindPropertyByName( { if (dictionary_find(This->name_to_propid, ansiName, (void **)&propid)) - ret = PropertyStorage_FindProperty(This, (PROPID)propid); + ret = PropertyStorage_FindProperty(This, propid); CoTaskMemFree(ansiName); } } @@ -528,7 +528,7 @@ static HRESULT PropertyStorage_StoreNameWithId(PropertyStorage_impl *This, assert(srcName); - hr = PropertyStorage_StringCopy((LPCSTR)srcName, cp, &name, This->codePage); + hr = PropertyStorage_StringCopy(srcName, cp, &name, This->codePage); if (SUCCEEDED(hr)) { if (This->codePage == CP_UNICODE) @@ -1059,7 +1059,7 @@ static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This, TRACE("Read char 0x%x ('%c')\n", prop->u.cVal, prop->u.cVal); break; case VT_UI1: - prop->u.bVal = *(const UCHAR *)data; + prop->u.bVal = *data; TRACE("Read byte 0x%x\n", prop->u.bVal); break; case VT_I2: diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 4bea165..a83c729 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1300,14 +1300,7 @@ static HRESULT WINAPI StorageImpl_CreateStorage( /* * Open it to get a pointer to return. */ - hr = IStorage_OpenStorage( - iface, - (const OLECHAR*)pwcsName, - 0, - grfMode, - 0, - 0, - ppstg); + hr = IStorage_OpenStorage(iface, pwcsName, 0, grfMode, 0, 0, ppstg); if( (hr != S_OK) || (*ppstg == NULL)) { @@ -2004,9 +1997,7 @@ static HRESULT deleteStorageProperty( hr = IEnumSTATSTG_Next(elements, 1, &currentElement, NULL); if (hr==S_OK) { - destroyHr = StorageImpl_DestroyElement( - (IStorage*)childStorage, - (OLECHAR*)currentElement.pwcsName); + destroyHr = StorageImpl_DestroyElement(childStorage, currentElement.pwcsName); CoTaskMemFree(currentElement.pwcsName); } @@ -4053,8 +4044,7 @@ static ULONG IEnumSTATSTGImpl_FindProperty( currentProperty); if ( propertyNameCmp( - (const OLECHAR*)currentProperty->name, - (const OLECHAR*)lpszPropName) == 0) + (const OLECHAR*)currentProperty->name, lpszPropName) == 0) return currentSearchNode; /*

1 0

Dmitry Timoshkov : gdi32: Add a test for undocumented EnumFontFamiliesEx( NULL), make it pass under Wine.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: 2fdaa56693077a846b4844eb5611ec0fe21470bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fdaa56693077a846b4844eb5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 15 16:02:29 2008 +0800 gdi32: Add a test for undocumented EnumFontFamiliesEx(NULL), make it pass under Wine. --- dlls/gdi32/font.c | 62 ++++++++++++++++++++++++++++++--------------- dlls/gdi32/freetype.c | 8 ++++++ dlls/gdi32/tests/font.c | 12 +++++++++ dlls/winex11.drv/xfont.c | 9 ++++++ 4 files changed, 70 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 66ae6d7..2789df5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -692,7 +692,8 @@ static INT CALLBACK FONT_EnumInstance16( const LOGFONTW *plf, const TEXTMETRICW INT ret = 1; DC *dc; - if( pfe->lpLogFontParam->lfCharSet == DEFAULT_CHARSET || + if (!pfe->lpLogFontParam || + pfe->lpLogFontParam->lfCharSet == DEFAULT_CHARSET || pfe->lpLogFontParam->lfCharSet == plf->lfCharSet ) { WORD args[7]; @@ -740,7 +741,8 @@ static INT CALLBACK FONT_EnumInstance( const LOGFONTW *plf, const TEXTMETRICW *p DC *dc; /* lfCharSet is at the same offset in both LOGFONTA and LOGFONTW */ - if((pfe->lpLogFontParam->lfCharSet == DEFAULT_CHARSET || + if ((!pfe->lpLogFontParam || + pfe->lpLogFontParam->lfCharSet == DEFAULT_CHARSET || pfe->lpLogFontParam->lfCharSet == plf->lfCharSet) && (!(fType & RASTER_FONTTYPE) || GetDeviceCaps(pfe->hdc, TEXTCAPS) & TC_RA_ABLE) ) { @@ -785,11 +787,17 @@ INT16 WINAPI EnumFontFamiliesEx16( HDC16 hDC, LPLOGFONT16 plf, DC* dc = DC_GetDCPtr( HDC_32(hDC) ); NEWTEXTMETRICEX16 tm16; ENUMLOGFONTEX16 lf16; - LOGFONTW lfW; + LOGFONTW lfW, *plfW; BOOL enum_gdi_fonts; if (!dc) return 0; - FONT_LogFont16ToW(plf, &lfW); + + if (plf) + { + FONT_LogFont16ToW(plf, &lfW); + plfW = &lfW; + } + else plfW = NULL; fe16.hdc = HDC_32(hDC); fe16.dc = dc; @@ -812,10 +820,10 @@ INT16 WINAPI EnumFontFamiliesEx16( HDC16 hDC, LPLOGFONT16 plf, } if (enum_gdi_fonts) - ret = WineEngEnumFonts( &lfW, FONT_EnumInstance16, (LPARAM)&fe16 ); + ret = WineEngEnumFonts( plfW, FONT_EnumInstance16, (LPARAM)&fe16 ); fe16.dwFlags &= ~ENUM_CALLED; if (ret && dc->funcs->pEnumDeviceFonts) { - ret2 = dc->funcs->pEnumDeviceFonts( dc->physDev, &lfW, FONT_EnumInstance16, (LPARAM)&fe16 ); + ret2 = dc->funcs->pEnumDeviceFonts( dc->physDev, plfW, FONT_EnumInstance16, (LPARAM)&fe16 ); if(fe16.dwFlags & ENUM_CALLED) /* update ret iff a font gets enumed */ ret = ret2; } @@ -888,10 +896,16 @@ INT WINAPI EnumFontFamiliesExA( HDC hDC, LPLOGFONTA plf, FONTENUMPROCA efproc, LPARAM lParam, DWORD dwFlags) { - LOGFONTW lfW; - FONT_LogFontAToW( plf, &lfW ); + LOGFONTW lfW, *plfW; + + if (plf) + { + FONT_LogFontAToW( plf, &lfW ); + plfW = &lfW; + } + else plfW = NULL; - return FONT_EnumFontFamiliesEx( hDC, &lfW, (FONTENUMPROCW)efproc, lParam, 0); + return FONT_EnumFontFamiliesEx( hDC, plfW, (FONTENUMPROCW)efproc, lParam, 0); } /*********************************************************************** @@ -900,17 +914,19 @@ INT WINAPI EnumFontFamiliesExA( HDC hDC, LPLOGFONTA plf, INT16 WINAPI EnumFontFamilies16( HDC16 hDC, LPCSTR lpFamily, FONTENUMPROC16 efproc, LPARAM lpData ) { - LOGFONT16 lf; + LOGFONT16 lf, *plf; - lf.lfCharSet = DEFAULT_CHARSET; if (lpFamily) { if (!*lpFamily) return 1; lstrcpynA( lf.lfFaceName, lpFamily, LF_FACESIZE ); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = 0; + plf = &lf; } - else lf.lfFaceName[0] = '\0'; + else plf = NULL; - return EnumFontFamiliesEx16( hDC, &lf, efproc, lpData, 0 ); + return EnumFontFamiliesEx16( hDC, plf, efproc, lpData, 0 ); } /*********************************************************************** @@ -919,17 +935,19 @@ INT16 WINAPI EnumFontFamilies16( HDC16 hDC, LPCSTR lpFamily, INT WINAPI EnumFontFamiliesA( HDC hDC, LPCSTR lpFamily, FONTENUMPROCA efproc, LPARAM lpData ) { - LOGFONTA lf; + LOGFONTA lf, *plf; - lf.lfCharSet = DEFAULT_CHARSET; if (lpFamily) { if (!*lpFamily) return 1; lstrcpynA( lf.lfFaceName, lpFamily, LF_FACESIZE ); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = 0; + plf = &lf; } - else lf.lfFaceName[0] = lf.lfFaceName[1] = '\0'; + else plf = NULL; - return EnumFontFamiliesExA( hDC, &lf, efproc, lpData, 0 ); + return EnumFontFamiliesExA( hDC, plf, efproc, lpData, 0 ); } /*********************************************************************** @@ -938,17 +956,19 @@ INT WINAPI EnumFontFamiliesA( HDC hDC, LPCSTR lpFamily, INT WINAPI EnumFontFamiliesW( HDC hDC, LPCWSTR lpFamily, FONTENUMPROCW efproc, LPARAM lpData ) { - LOGFONTW lf; + LOGFONTW lf, *plf; - lf.lfCharSet = DEFAULT_CHARSET; if (lpFamily) { if (!*lpFamily) return 1; lstrcpynW( lf.lfFaceName, lpFamily, LF_FACESIZE ); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = 0; + plf = &lf; } - else lf.lfFaceName[0] = 0; + else plf = NULL; - return EnumFontFamiliesExW( hDC, &lf, efproc, lpData, 0 ); + return EnumFontFamiliesExW( hDC, plf, efproc, lpData, 0 ); } /*********************************************************************** diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 562c329..7689cf9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3371,6 +3371,14 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) LOGFONTW lf; int i; + if (!plf) + { + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = 0; + lf.lfFaceName[0] = 0; + plf = &lf; + } + TRACE("facename = %s charset %d\n", debugstr_w(plf->lfFaceName), plf->lfCharSet); if(plf->lfFaceName[0]) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6138731..ee577c6 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1287,6 +1287,18 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n"); + + efd.total = 0; + SetLastError(0xdeadbeef); + ret = EnumFontFamiliesEx(hdc, NULL, arial_enum_proc, (LPARAM)&efd, 0); + ok(ret, "EnumFontFamiliesEx error %u\n", GetLastError()); + get_charset_stats(&efd, &ansi_charset, &symbol_charset, &russian_charset); + trace("enumerated ansi %d, symbol %d, russian %d fonts for NULL\n", + ansi_charset, symbol_charset, russian_charset); + ok(efd.total > 0, "no fonts enumerated: NULL\n"); + ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); + ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); + ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n"); } efd.total = 0; diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 3298818..a55e77d 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -3305,10 +3305,19 @@ BOOL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf, NEWTEXTMETRICEXW tm; fontResource* pfr = fontList; BOOL b, bRet = 0; + LOGFONTW lfW; /* don't enumerate x11 fonts if we're using client side fonts */ if (physDev->has_gdi_font) return FALSE; + if (!plf) + { + lfW.lfCharSet = DEFAULT_CHARSET; + lfW.lfPitchAndFamily = 0; + lfW.lfFaceName[0] = 0; + plf = &lfW; + } + if( plf->lfFaceName[0] ) { char facename[LF_FACESIZE+1];

1 0

Juan Lang : crypt32: Fix race condition in loading default provider.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: 5c8aa89163fabc0496c96deeabd3775b2c9116cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8aa89163fabc0496c96deea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jan 14 11:15:35 2008 -0800 crypt32: Fix race condition in loading default provider. --- dlls/crypt32/main.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index fa90ee0..922dd19 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -59,8 +59,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved) HCRYPTPROV CRYPT_GetDefaultProvider(void) { if (!hDefProv) - CryptAcquireContextW(&hDefProv, NULL, MS_ENHANCED_PROV_W, - PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + { + HCRYPTPROV prov; + + CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, + CRYPT_VERIFYCONTEXT); + InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, + NULL); + if (hDefProv != prov) + CryptReleaseContext(prov, 0); + } return hDefProv; }

1 0

Juan Lang : wintrust: Don' t expect ImageGetCertificateData to succeed when Certificate is NULL.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: 14a12b88614746375c8456a29324965cd61b652e URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a12b88614746375c8456a29… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 8 11:40:27 2008 -0800 wintrust: Don't expect ImageGetCertificateData to succeed when Certificate is NULL. --- dlls/wintrust/crypt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index e69db9e..c919eef 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -218,10 +218,10 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn } else { - DWORD len; + DWORD len = 0; ret = ImageGetCertificateData(pSubjectInfo->hFile, dwIndex, NULL, &len); - if (!ret) + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) goto error; pCert = HeapAlloc(GetProcessHeap(), 0, len); if (!pCert)

1 0

Juan Lang : crypt32: Don' t release default crypto provider on process shutdown.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: 027236b04f83f9d8f4b14bc29ab5e501ec0e0048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=027236b04f83f9d8f4b14bc29… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jan 14 11:14:11 2008 -0800 crypt32: Don't release default crypto provider on process shutdown. --- dlls/crypt32/main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 727246e..fa90ee0 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -47,7 +47,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved) crypt_sip_free(); root_store_free(); default_chain_engine_free(); - if (hDefProv) CryptReleaseContext(hDefProv, 0); + /* Don't release the default provider on process shutdown, there's + * no guarantee the provider dll hasn't already been unloaded. + */ + if (hDefProv && !pvReserved) CryptReleaseContext(hDefProv, 0); break; } return TRUE;

1 0

Alexander Nicolaysen Sørnes : riched20: Include selection bar size in POSFROMCHAR.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: eec14a4de6d5a485f059ee0764290dc0945fb268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec14a4de6d5a485f059ee076… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jan 14 01:22:32 2008 +0100 riched20: Include selection bar size in POSFROMCHAR. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 85ac5b2..1780541 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2393,6 +2393,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, pt.x = 0; pt.y = editor->pBuffer->pLast->member.para.nYPos; } + pt.x += editor->selofs; if (wParam >= 0x40000) { *(POINTL *)wParam = pt; }

1 0