May 2008 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Rename DIB_BitmapInfoSize to bitmap_info_size and fix to take into account bit field masks .
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: 515b40c2de77e8bec84b2cc8f5bc8ea31c91b925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=515b40c2de77e8bec84b2cc8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 2 12:35:40 2008 +0100 gdi32: Rename DIB_BitmapInfoSize to bitmap_info_size and fix to take into account bit field masks. --- dlls/gdi32/brush.c | 2 +- dlls/gdi32/dib.c | 9 +++++---- dlls/gdi32/enhmfdrv/bitblt.c | 4 ++-- dlls/gdi32/enhmfdrv/objects.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/metafile.c | 8 ++++---- dlls/gdi32/mfdrv/bitblt.c | 6 +++--- dlls/gdi32/mfdrv/objects.c | 2 +- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 0a6b652..01f69a8 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -67,7 +67,7 @@ static HGLOBAL16 dib_copy(const BITMAPINFO *info, UINT coloruse) size = DIB_GetDIBImageBytes(info->bmiHeader.biWidth, info->bmiHeader.biHeight, info->bmiHeader.biBitCount); - size += DIB_BitmapInfoSize( info, coloruse ); + size += bitmap_info_size( info, coloruse ); if (!(hmem = GlobalAlloc16( GMEM_MOVEABLE, size ))) { diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index de5a5a4..980e0f3 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -117,13 +117,13 @@ int DIB_GetDIBImageBytes( int width, int height, int depth ) /*********************************************************************** - * DIB_BitmapInfoSize + * bitmap_info_size * * Return the size of the bitmap info structure including color table. */ -int DIB_BitmapInfoSize( const BITMAPINFO * info, WORD coloruse ) +int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) { - int colors; + int colors, masks = 0; if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { @@ -138,7 +138,8 @@ int DIB_BitmapInfoSize( const BITMAPINFO * info, WORD coloruse ) if (colors > 256) colors = 256; if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; - return sizeof(BITMAPINFOHEADER) + colors * + if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; + return sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); } } diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 0be0948..0458ac1 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -206,7 +206,7 @@ INT EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, info->bmiHeader.biBitCount); /* calculate the size of the colour table */ - bmi_size = DIB_BitmapInfoSize(info, wUsage); + bmi_size = bitmap_info_size(info, wUsage); emr_size = sizeof (EMRSTRETCHDIBITS) + bmi_size + bits_size; emr = HeapAlloc(GetProcessHeap(), 0, emr_size ); @@ -262,7 +262,7 @@ INT EMFDRV_SetDIBitsToDevice( EMRSETDIBITSTODEVICE* pEMR; DWORD size, bmiSize, bitsSize; - bmiSize = DIB_BitmapInfoSize(info, wUsage); + bmiSize = bitmap_info_size(info, wUsage); bitsSize = DIB_GetDIBImageBytes( info->bmiHeader.biWidth, info->bmiHeader.biHeight, info->bmiHeader.biBitCount ); diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 24a8934..c7ecd54 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -174,7 +174,7 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) bmSize = DIB_GetDIBImageBytes(info->bmiHeader.biWidth, info->bmiHeader.biHeight, info->bmiHeader.biBitCount); - biSize = DIB_BitmapInfoSize(info, LOWORD(logbrush.lbColor)); + biSize = bitmap_info_size(info, LOWORD(logbrush.lbColor)); size = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + biSize + bmSize; emr = HeapAlloc( GetProcessHeap(), 0, size ); if(!emr) break; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index cbca896..5581576 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -408,7 +408,7 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ extern int DIB_GetDIBWidthBytes( int width, int depth ) DECLSPEC_HIDDEN; extern int DIB_GetDIBImageBytes( int width, int height, int depth ) DECLSPEC_HIDDEN; -extern int DIB_BitmapInfoSize( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; +extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; /* driver.c */ extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 57ace68..56404a0 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -889,7 +889,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT case META_STRETCHDIB: { LPBITMAPINFO info = (LPBITMAPINFO) &(mr->rdParm[11]); - LPSTR bits = (LPSTR)info + DIB_BitmapInfoSize( info, mr->rdParm[2] ); + LPSTR bits = (LPSTR)info + bitmap_info_size( info, mr->rdParm[2] ); StretchDIBits( hdc, (SHORT)mr->rdParm[10], (SHORT)mr->rdParm[9], (SHORT)mr->rdParm[8], (SHORT)mr->rdParm[7], (SHORT)mr->rdParm[6], (SHORT)mr->rdParm[5], (SHORT)mr->rdParm[4], (SHORT)mr->rdParm[3], bits, info, @@ -900,7 +900,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT case META_DIBSTRETCHBLT: { LPBITMAPINFO info = (LPBITMAPINFO) &(mr->rdParm[10]); - LPSTR bits = (LPSTR)info + DIB_BitmapInfoSize( info, mr->rdParm[2] ); + LPSTR bits = (LPSTR)info + bitmap_info_size( info, mr->rdParm[2] ); StretchDIBits( hdc, (SHORT)mr->rdParm[9], (SHORT)mr->rdParm[8], (SHORT)mr->rdParm[7], (SHORT)mr->rdParm[6], (SHORT)mr->rdParm[5], (SHORT)mr->rdParm[4], (SHORT)mr->rdParm[3], (SHORT)mr->rdParm[2], bits, info, @@ -997,7 +997,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT if (mr->rdSize > 12) { LPBITMAPINFO info = (LPBITMAPINFO) &(mr->rdParm[8]); - LPSTR bits = (LPSTR)info + DIB_BitmapInfoSize(info, mr->rdParm[0]); + LPSTR bits = (LPSTR)info + bitmap_info_size(info, mr->rdParm[0]); StretchDIBits(hdc, (SHORT)mr->rdParm[7], (SHORT)mr->rdParm[6], (SHORT)mr->rdParm[5], (SHORT)mr->rdParm[4], (SHORT)mr->rdParm[3], (SHORT)mr->rdParm[2], @@ -1027,7 +1027,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT case META_SETDIBTODEV: { BITMAPINFO *info = (BITMAPINFO *) &(mr->rdParm[9]); - char *bits = (char *)info + DIB_BitmapInfoSize( info, mr->rdParm[0] ); + char *bits = (char *)info + bitmap_info_size( info, mr->rdParm[0] ); SetDIBitsToDevice(hdc, (SHORT)mr->rdParm[8], (SHORT)mr->rdParm[7], (SHORT)mr->rdParm[6], (SHORT)mr->rdParm[5], (SHORT)mr->rdParm[4], (SHORT)mr->rdParm[3], diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index c1b443e..48d79d3 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -101,7 +101,7 @@ BOOL MFDRV_StretchBlt( PHYSDEV devDst, INT xDst, INT yDst, INT widthDst, len,rop,lpBMI->biYPelsPerMeter,GetDeviceCaps(physDevSrc->hdc, LOGPIXELSY)); if (GetDIBits(physDevSrc->hdc, hBitmap, 0, (UINT)lpBMI->biHeight, - (LPSTR)lpBMI + DIB_BitmapInfoSize( (BITMAPINFO *)lpBMI, + (LPSTR)lpBMI + bitmap_info_size( (BITMAPINFO *)lpBMI, DIB_RGB_COLORS ), (LPBITMAPINFO)lpBMI, DIB_RGB_COLORS)) #else @@ -149,7 +149,7 @@ INT MFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, DWORD len, infosize, imagesize; METARECORD *mr; - infosize = DIB_BitmapInfoSize(info, wUsage); + infosize = bitmap_info_size(info, wUsage); imagesize = DIB_GetDIBImageBytes( info->bmiHeader.biWidth, info->bmiHeader.biHeight, info->bmiHeader.biBitCount ); @@ -191,7 +191,7 @@ INT MFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDst, INT yDst, DWORD cx, DWORD len, infosize, imagesize; METARECORD *mr; - infosize = DIB_BitmapInfoSize(info, coloruse); + infosize = bitmap_info_size(info, coloruse); imagesize = DIB_GetDIBImageBytes( info->bmiHeader.biWidth, info->bmiHeader.biHeight, info->bmiHeader.biBitCount ); diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index c6dbb87..f5f2aeb 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -307,7 +307,7 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) bmSize = DIB_GetDIBImageBytes(info->bmiHeader.biWidth, info->bmiHeader.biHeight, info->bmiHeader.biBitCount); - biSize = DIB_BitmapInfoSize(info, LOWORD(logbrush.lbColor)); + biSize = bitmap_info_size(info, LOWORD(logbrush.lbColor)); size = sizeof(METARECORD) + biSize + bmSize + 2; mr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if(!mr) goto done;

1 0

Huw Davies : winex11.drv: Rename X11DRV_DIB_BitmapInfoSize to bitmap_info_size and fix to take into account bit field masks .
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: 80157c2fa6e914da7c27bc066c2d7343ce3b634a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80157c2fa6e914da7c27bc066… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 2 12:43:14 2008 +0100 winex11.drv: Rename X11DRV_DIB_BitmapInfoSize to bitmap_info_size and fix to take into account bit field masks. --- dlls/winex11.drv/brush.c | 2 +- dlls/winex11.drv/dib.c | 11 ++++++----- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 20f0e52..41e45cd 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -302,7 +302,7 @@ HBRUSH X11DRV_SelectBrush( X11DRV_PDEVICE *physDev, HBRUSH hbrush ) TRACE("BS_DIBPATTERN\n"); if ((bmpInfo = (BITMAPINFO *) GlobalLock16( (HGLOBAL16)logbrush.lbHatch ))) { - int size = X11DRV_DIB_BitmapInfoSize( bmpInfo, logbrush.lbColor ); + int size = bitmap_info_size( bmpInfo, logbrush.lbColor ); hBitmap = CreateDIBitmap( physDev->hdc, &bmpInfo->bmiHeader, CBM_INIT, ((char *)bmpInfo) + size, bmpInfo, diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 87bd9d1..81345a9 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -186,13 +186,13 @@ static int X11DRV_DIB_GetDIBImageBytes( int width, int height, int depth ) /*********************************************************************** - * X11DRV_DIB_BitmapInfoSize + * bitmap_info_size * * Return the size of the bitmap info structure including color table. */ -int X11DRV_DIB_BitmapInfoSize( const BITMAPINFO * info, WORD coloruse ) +int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) { - unsigned int colors; + unsigned int colors, masks = 0; if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { @@ -206,7 +206,8 @@ int X11DRV_DIB_BitmapInfoSize( const BITMAPINFO * info, WORD coloruse ) colors = info->bmiHeader.biClrUsed; if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; - return sizeof(BITMAPINFOHEADER) + colors * + if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; + return sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); } } @@ -4941,7 +4942,7 @@ Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc ) pbmi = GlobalLock(hPackedDIB); hBmp = CreateDIBitmap(hdc, &pbmi->bmiHeader, CBM_INIT, - (LPBYTE)pbmi + X11DRV_DIB_BitmapInfoSize( pbmi, DIB_RGB_COLORS ), + (LPBYTE)pbmi + bitmap_info_size( pbmi, DIB_RGB_COLORS ), pbmi, DIB_RGB_COLORS); GlobalUnlock(hPackedDIB); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0033a1f..527f9f5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -234,7 +234,7 @@ extern void X11DRV_Xcursor_Init(void); extern void X11DRV_BITMAP_Init(void); extern void X11DRV_FONT_Init( int log_pixels_x, int log_pixels_y ); -extern int X11DRV_DIB_BitmapInfoSize( const BITMAPINFO * info, WORD coloruse ); +extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ); extern XImage *X11DRV_DIB_CreateXImage( int width, int height, int depth ); extern HGLOBAL X11DRV_DIB_CreateDIBFromBitmap(HDC hdc, HBITMAP hBmp); extern HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc);

1 0

Huw Davies : user32: Fix bitmap_info_size to take into account bit field masks.
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: be900067b675ff8f80eb8f2b2f796f970f22f1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=be900067b675ff8f80eb8f2b2… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 2 12:20:24 2008 +0100 user32: Fix bitmap_info_size to take into account bit field masks. --- dlls/user32/cursoricon.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 5dbc1b9..c5d192d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -223,7 +223,7 @@ static int get_dib_width_bytes( int width, int depth ) */ static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) { - int colors; + int colors, masks = 0; if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { @@ -239,7 +239,8 @@ static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) colors = 256; if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; - return sizeof(BITMAPINFOHEADER) + colors * + if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; + return sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); } }

1 0

Gerald Pfeifer : widl: Fix syntax to also work with older versions of bison .
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: 652602f5c8130dce17064b213450e231fd35f647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=652602f5c8130dce17064b213… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 2 14:14:01 2008 +0200 widl: Fix syntax to also work with older versions of bison. --- tools/widl/parser.y | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ea8baf2..db0778a 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -747,6 +747,7 @@ field: m_attributes decl_spec declarator_list ';' ne_union_field: s_field ';' { $$ = $1; } | attributes ';' { $$ = make_var(NULL); $$->attrs = $1; } + ; ne_union_fields: { $$ = NULL; } | ne_union_fields ne_union_field { $$ = append_var( $1, $2 ); } @@ -755,6 +756,7 @@ ne_union_fields: { $$ = NULL; } union_field: s_field ';' { $$ = $1; } | ';' { $$ = NULL; } + ; s_field: m_attributes decl_spec declarator { $$ = $3->var; $$->attrs = check_field_attrs($$->name, $1);

1 0

Mathias Gottschlag : winecfg: Fix some errors in the German translation.
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: 652b63f279a07e0cc605bb8cecc557f81770210f URL: http://source.winehq.org/git/wine.git/?a=commit;h=652b63f279a07e0cc605bb8ce… Author: Mathias Gottschlag <mathias-go(a)web.de> Date: Fri May 2 13:14:15 2008 +0200 winecfg: Fix some errors in the German translation. --- programs/winecfg/De.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index fe051a1..290c069 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -64,7 +64,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Fenstereinstellungen ",IDC_STATIC,8,4,244,84 CONTROL "DirectX-Anwendungen k�nnen Maus einfangen",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 - CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 + CONTROL "Erlaube dem Fenstermanager die Fenster zu &dekorieren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Erlaube dem Fenstermanager die Fenster zu kontrollieren.",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emuliere einen virtuellen Bildschirm",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 @@ -78,7 +78,7 @@ BEGIN COMBOBOX IDC_D3D_VSHADER_MODE,100,108,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Pixel Shader aktivieren (wenn von Hardware unterst�tzt)", IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 - GROUPBOX " Screen &Resolution ",IDC_STATIC,8,151,244,93 + GROUPBOX " Bildschi&rmaufl�sung ",IDC_STATIC,8,151,244,93 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP LTEXT "dpi",IDC_STATIC,235,163,10,8 @@ -157,7 +157,7 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Treiber Auswahl ",IDC_STATIC,8,4,244,195 + GROUPBOX " Treiberauswahl ",IDC_STATIC,8,4,244,195 LTEXT "W�hlen Sie einen Sound-Treiber durch ankreuzen des gew�nschten Treibers. Ist kein Treiber ausgew�hlt, wird der Sound deaktiviert. Die Auswahl mehrerer Treiber ist nicht empfohlen. Ein Treiber kann durch Rechtsklicken konfiguriert werden.",IDC_STATIC,15,15,227,35 CONTROL "Ger�te",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,50,59,14

1 0

Mathias Gottschlag : taskmgr: Fix some German translation errors.
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: 93995fc6720c7ccfc993f43f95d2f2396b5f5b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93995fc6720c7ccfc993f43f9… Author: Mathias Gottschlag <mathias-go(a)web.de> Date: Fri May 2 13:44:02 2008 +0200 taskmgr: Fix some German translation errors. --- programs/taskmgr/De.rc | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc index 516f1ab..da94576 100644 --- a/programs/taskmgr/De.rc +++ b/programs/taskmgr/De.rc @@ -69,7 +69,7 @@ BEGIN MENUITEM "Ein Graph &pro CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU , CHECKED END - MENUITEM "&Zeige Kernel Zeiten an", ID_VIEW_SHOWKERNELTIMES + MENUITEM "&Zeige Kernelzeiten an", ID_VIEW_SHOWKERNELTIMES END POPUP "&Fenster" BEGIN @@ -124,7 +124,7 @@ BEGIN MENUITEM "Hinter&einander", ID_WINDOWS_CASCADE MENUITEM SEPARATOR MENUITEM "Task &beenden", ID_APPLICATION_PAGE_ENDTASK - MENUITEM "&Gehe zu Proze�", ID_APPLICATION_PAGE_GOTOPROCESS + MENUITEM "&Gehe zu Prozess", ID_APPLICATION_PAGE_GOTOPROCESS END END @@ -143,8 +143,8 @@ IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE BEGIN POPUP "DUMMY" BEGIN - MENUITEM "Proze� &beenden", ID_PROCESS_PAGE_ENDPROCESS - MENUITEM "Beende Proze�&baum", ID_PROCESS_PAGE_ENDPROCESSTREE + MENUITEM "Prozess &beenden", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "Beende Prozess&baum", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Debuggen", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR @@ -224,7 +224,7 @@ BEGIN GROUPBOX "Insgesamt",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Commit Charge (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Physikalischer Speicher (K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "Kernel Speicher (K)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Kernelspeicher (K)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT LTEXT "Handles",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 LTEXT "Threads",IDS_TOTALS_THREAD_COUNT,12,140,27,8 LTEXT "Prozesse",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 @@ -245,7 +245,7 @@ BEGIN ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Insgesamt",IDS_PHYSICAL_MEMORY_TOTAL,137,131,37,8 LTEXT "Durchschnittlich",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,60,8 - LTEXT "System Cache",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + LTEXT "Systemcache",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,205,140,28,8,ES_RIGHT | @@ -253,7 +253,7 @@ BEGIN EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Insgesamt",IDS_KERNEL_MEMORY_TOTAL,137,174,37,8 - LTEXT "Ausgelagert",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "Ausgelagert",IDS_KERNEL_MEMORY_PAGED,137,184,64,8 LTEXT "Nichtausgelagert",IDS_KERNEL_MEMORY_NONPAGED,137,193,64,8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER @@ -263,9 +263,9 @@ BEGIN ES_READONLY | ES_NUMBER | NOT WS_BORDER GROUPBOX "Verlauf der CPU-Auslastung",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT GROUPBOX "Verlauf der Speicherauslastung",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT - PUSHBUTTON "CPU-Auslastung Anzeige",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, + PUSHBUTTON "CPU-Auslastungsanzeige",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, WS_EX_CLIENTEDGE - PUSHBUTTON "Speicherauslastung Anzeige",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, + PUSHBUTTON "Speicherauslastunganzeige",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, WS_EX_CLIENTEDGE PUSHBUTTON "CPU-Auslastungsverlauf",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,0,WS_EX_CLIENTEDGE @@ -275,7 +275,7 @@ END IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug Kan�le" +CAPTION "Debugkan�le" FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | @@ -286,12 +286,12 @@ END IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Prozessor Affinit�t" +CAPTION "Prozessoraffinit�t" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,174,133,50,14 - LTEXT "Die Prozessor Affinit�t Einstellung kontrolliert, auf welchen CPU's der Proze�, die Erlaubnis hat, ausgef�hrt werden zu k�nnen.", + LTEXT "Die Prozessoraffinit�tseinstellung kontrolliert, auf welchen CPUs der Prozess die Erlaubnis hat, ausgef�hrt werden zu k�nnen.", IDC_STATIC,5,5,220,16 CONTROL "CPU 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 11,28,37,10 @@ -370,7 +370,7 @@ BEGIN IDC_STATIC,7,7,181,17 CONTROL "&Name",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,28,56,10 - CONTROL "&PID (Proze�-ID)",IDC_PID,"Button", + CONTROL "&PID (Prozess-ID)",IDC_PID,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 CONTROL "&CPU-Auslastung",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,90,10 @@ -468,12 +468,12 @@ END STRINGTABLE DISCARDABLE BEGIN ID_ENDTASK "Weist die ausgew�hlten Tasks an, sich zu beenden" - ID_GOTOPROCESS "Wechselt den Fokus zu dem Proze� des ausgew�hlten Tasks" + ID_GOTOPROCESS "Wechselt den Fokus zu dem Prozess des ausgew�hlten Tasks" ID_RESTORE "Stellt den Task Manager von seiner versteckten Status wieder her" - ID_PROCESS_PAGE_ENDPROCESS "Entfernt den Proze� vom System" - ID_PROCESS_PAGE_ENDPROCESSTREE "Entfernt den Proze� und all seine Kindprozesse vom System" - ID_PROCESS_PAGE_DEBUG "Heftet den Debugger an diesen Proze� an" - ID_PROCESS_PAGE_SETAFFINITY "Kontrolliert, auf welche Prozessoren ein Proze� ausgef�hrt werden darf" + ID_PROCESS_PAGE_ENDPROCESS "Entfernt den Prozess vom System" + ID_PROCESS_PAGE_ENDPROCESSTREE "Entfernt den Prozess und all seine Kindprozesse vom System" + ID_PROCESS_PAGE_DEBUG "Heftet den Debugger an diesen Prozess an" + ID_PROCESS_PAGE_SETAFFINITY "Kontrolliert, auf welche Prozessoren ein Prozess ausgef�hrt werden darf" ID_PROCESS_PAGE_SETPRIORITY_REALTIME "Setzt den Proze� in die ECHTZEIT-Priorit�tsklasse" ID_PROCESS_PAGE_SETPRIORITY_HIGH "Setzt den Proze� in die HOCH-Priorit�tsklasse" ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL "Setzt den Proze� in die H�HER ALS NORMAL-Priorit�tsklasse"

1 0

Alexandre Julliard : richedit: Avoid strlen in traces.
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: 13ab99b404d4253403a27dac7b6e3dd58e32fbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ab99b404d4253403a27dac7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 13:59:06 2008 +0200 richedit: Avoid strlen in traces. --- dlls/riched20/tests/editor.c | 12 ++++-------- dlls/riched32/tests/editor.c | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 0fe696f..0aa1148 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -829,8 +829,7 @@ static void test_EM_GETTEXTRANGE(void) textRange.chrg.cpMin = 4; textRange.chrg.cpMax = 11; result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); - ok(result == 7, "EM_GETTEXTRANGE returned %ld, expected %d\n", - result, strlen(expect)); + ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); @@ -839,8 +838,7 @@ static void test_EM_GETTEXTRANGE(void) textRange.chrg.cpMin = 4; textRange.chrg.cpMax = 11; result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); - ok(result == 7, "EM_GETTEXTRANGE returned %ld, expected %d\n", - result, strlen(expect)); + ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); DestroyWindow(hwndRichEdit); @@ -859,16 +857,14 @@ static void test_EM_GETSELTEXT(void) SendMessage(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessage(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld, expected %d\n", - result, strlen(expect)); + ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); SendMessage(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessage(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld, expected %d\n", - result, strlen(expect)); + ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); DestroyWindow(hwndRichEdit); diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 9b12ba8..ff82654 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -489,8 +489,7 @@ static void test_EM_GETTEXTRANGE(void) textRange.chrg.cpMin = 4; textRange.chrg.cpMax = 12; result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); - ok(result == 8, "EM_GETTEXTRANGE returned %ld, expected %d\n", - result, strlen(expect1)); + ok(result == 8, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect1, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); @@ -499,8 +498,7 @@ static void test_EM_GETTEXTRANGE(void) textRange.chrg.cpMin = 4; textRange.chrg.cpMax = 11; result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); - ok(result == 7, "EM_GETTEXTRANGE returned %ld, expected %d\n", - result, strlen(expect2)); + ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); @@ -522,16 +520,14 @@ static void test_EM_GETSELTEXT(void) SendMessage(hwndRichEdit, EM_SETSEL, 4, 12); result = SendMessage(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 8, "EM_GETTEXTRANGE returned %ld, expected %d\n", - result, strlen(expect1)); + ok(result == 8, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect1, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); SendMessage(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessage(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld, expected %d\n", - result, strlen(expect2)); + ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer);

1 0

Alexandre Julliard : urlmon: Avoid sizeof in traces.
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: a8007f0db17699baf2110661735ebe5d4bfc7d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8007f0db17699baf21106617… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 13:59:14 2008 +0200 urlmon: Avoid sizeof in traces. --- dlls/urlmon/tests/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 208dff8..6d3305e 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -793,7 +793,7 @@ static void test_SecurityManager(void) ok(hres == S_OK, "GetSecurityId failed: %08x, expected S_OK\n", hres); ok(size == sizeof(secid10) || size == sizeof(secid10_2), /* win2k3 */ - "size=%d, expected %d or %d\n", size, sizeof(secid10), sizeof(secid10_2)); + "size=%d\n", size); ok(!memcmp(buf, secid10, size) || !memcmp(buf, secid10_2, size), /* win2k3 */ "wrong secid\n");

1 0

ByeongSik Jeon : imm32: Implementation of the ImmRequestMessage{A|W}.
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: cedfd3f763deb34ec73b0c948134a26f37c1bb9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cedfd3f763deb34ec73b0c948… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri May 2 12:51:08 2008 +0900 imm32: Implementation of the ImmRequestMessage{A|W}. --- dlls/imm32/imm.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 8b539de..ce28f48 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1815,9 +1815,14 @@ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) */ LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) { - FIXME("(%p %ld %ld): stub\n", hIMC, wParam, wParam); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("%p %ld %ld\n", hIMC, wParam, wParam); + + if (data && IsWindow(data->IMC.hWnd)) + return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); + + return 0; } /*********************************************************************** @@ -1825,9 +1830,14 @@ LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) */ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) { - FIXME("(%p %ld %ld): stub\n", hIMC, wParam, wParam); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("%p %ld %ld\n", hIMC, wParam, wParam); + + if (data && IsWindow(data->IMC.hWnd)) + return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); + + return 0; } /***********************************************************************

1 0

Alexandre Julliard : user32: Add an exception handler around LB_GETTEXT to hide a Delphi bug.
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: f39d39e35f2d2c04bb3fecc48f27046d2ae502f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39d39e35f2d2c04bb3fecc48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 11:39:42 2008 +0200 user32: Add an exception handler around LB_GETTEXT to hide a Delphi bug. --- dlls/user32/listbox.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 80ff0ac..ee326c6 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -43,6 +43,7 @@ #include "wine/unicode.h" #include "user_private.h" #include "controls.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(listbox); @@ -799,6 +800,8 @@ static BOOL LISTBOX_SetTabStops( LB_DESCR *descr, INT count, LPINT tabs, BOOL sh */ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL unicode ) { + DWORD len; + if ((index < 0) || (index >= descr->nb_items)) { SetLastError(ERROR_INVALID_INDEX); @@ -808,7 +811,7 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL { if (!buffer) { - DWORD len = strlenW(descr->items[index].str); + len = strlenW(descr->items[index].str); if( unicode ) return len; return WideCharToMultiByte( CP_ACP, 0, descr->items[index].str, len, @@ -817,20 +820,32 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL TRACE("index %d (0x%04x) %s\n", index, index, debugstr_w(descr->items[index].str)); - if(unicode) + __TRY /* hide a Delphi bug that passes a read-only buffer */ { - strcpyW( buffer, descr->items[index].str ); - return strlenW(buffer); + if(unicode) + { + strcpyW( buffer, descr->items[index].str ); + len = strlenW(buffer); + } + else + { + len = WideCharToMultiByte(CP_ACP, 0, descr->items[index].str, -1, + (LPSTR)buffer, 0x7FFFFFFF, NULL, NULL) - 1; + } } - else + __EXCEPT_PAGE_FAULT { - return WideCharToMultiByte(CP_ACP, 0, descr->items[index].str, -1, (LPSTR)buffer, 0x7FFFFFFF, NULL, NULL) - 1; + WARN( "got an invalid buffer (Delphi bug?)\n" ); + SetLastError( ERROR_INVALID_PARAMETER ); + return LB_ERR; } + __ENDTRY } else { if (buffer) *((LPDWORD)buffer)=*(LPDWORD)(&descr->items[index].data); - return sizeof(DWORD); + len = sizeof(DWORD); } + return len; } static inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2 )

1 0