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

Stefan Dösinger : wined3d: Don' t use GL_ARB_map_buffer_range for now.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 481aca47ad649297e5435d0f4c7466fd70aa702f URL: http://source.winehq.org/git/wine.git/?a=commit;h=481aca47ad649297e5435d0f4… Author: Stefan Dösinger <stefan(a)e195-194.eduroam.tuwien.ac.at> Date: Wed May 5 13:02:07 2010 +0200 wined3d: Don't use GL_ARB_map_buffer_range for now. There are numerous problems with this extension, and there are no visible upsides. In the best case dynamic VBOs are just as fast as no VBO at all. --- dlls/wined3d/buffer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b56895b..8372b7a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1474,7 +1474,8 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format_desc->format), buffer->resource.allocatedMemory, buffer); - dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; + /* GL_ARB_map_buffer_range is disabled for now due to numerous bugs and no gains */ + dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2 and others).

1 0

Michael Stefaniuc : oleaut32: Avoid using long.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 0f82f68734c7e7f1f783252845e3aab432ac1bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f82f68734c7e7f1f78325284… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 10 10:38:45 2010 +0200 oleaut32: Avoid using long. --- dlls/oleaut32/typelib.c | 20 ++++++++++---------- dlls/oleaut32/vartype.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5792cc5..7a56e93 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1519,7 +1519,7 @@ static inline unsigned int MSFT_Tell(const TLBContext *pcx) return pcx->pos; } -static inline void MSFT_Seek(TLBContext *pcx, long where) +static inline void MSFT_Seek(TLBContext *pcx, LONG where) { if (where != DO_NOT_SEEK) { @@ -1527,7 +1527,7 @@ static inline void MSFT_Seek(TLBContext *pcx, long where) if (where > pcx->length) { /* FIXME */ - ERR("seek beyond end (%ld/%d)\n", where, pcx->length ); + ERR("seek beyond end (%d/%d)\n", where, pcx->length ); TLB_abort(); } pcx->pos = where; @@ -1535,9 +1535,9 @@ static inline void MSFT_Seek(TLBContext *pcx, long where) } /* read function */ -static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, long where ) +static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, LONG where ) { - TRACE_(typelib)("pos=0x%08x len=0x%08x 0x%08x 0x%08x 0x%08lx\n", + TRACE_(typelib)("pos=0x%08x len=0x%08x 0x%08x 0x%08x 0x%08x\n", pcx->pos, count, pcx->oStart, pcx->length, where); MSFT_Seek(pcx, where); @@ -1548,7 +1548,7 @@ static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, long where ) } static DWORD MSFT_ReadLEDWords(void *buffer, DWORD count, TLBContext *pcx, - long where ) + LONG where ) { DWORD ret; @@ -1559,7 +1559,7 @@ static DWORD MSFT_ReadLEDWords(void *buffer, DWORD count, TLBContext *pcx, } static DWORD MSFT_ReadLEWords(void *buffer, DWORD count, TLBContext *pcx, - long where ) + LONG where ) { DWORD ret; @@ -2714,7 +2714,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath if(index_str && *++index_str != '\0') { LPWSTR end_ptr; - long idx = strtolW(index_str, &end_ptr, 10); + LONG idx = strtolW(index_str, &end_ptr, 10); if(*end_ptr == '\0') { int str_len = index_str - pszFileName - 1; @@ -2834,7 +2834,7 @@ static ITypeLibImpl* TypeLibImpl_Constructor(void) static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) { TLBContext cx; - long lPSegDir; + LONG lPSegDir; MSFT_Header tlbHeader; MSFT_SegDir tlbSegDir; ITypeLibImpl * pTypeLibImpl; @@ -2867,14 +2867,14 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) lPSegDir = sizeof(tlbHeader) + (tlbHeader.nrtypeinfos)*4 + ((tlbHeader.varflags & HELPDLLFLAG)? 4 :0); /* now read the segment directory */ - TRACE("read segment directory (at %ld)\n",lPSegDir); + TRACE("read segment directory (at %d)\n",lPSegDir); MSFT_ReadLEDWords(&tlbSegDir, sizeof(tlbSegDir), &cx, lPSegDir); cx.pTblDir = &tlbSegDir; /* just check two entries */ if ( tlbSegDir.pTypeInfoTab.res0c != 0x0F || tlbSegDir.pImpInfo.res0c != 0x0F) { - ERR("cannot find the table directory, ptr=0x%lx\n",lPSegDir); + ERR("cannot find the table directory, ptr=0x%x\n",lPSegDir); HeapFree(GetProcessHeap(),0,pTypeLibImpl); return NULL; } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 33f6f90..1aa71fb 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5368,7 +5368,7 @@ typedef union { struct { - unsigned long m : 23; + unsigned int m : 23; unsigned int exp_bias : 8; unsigned int sign : 1; } i; @@ -5427,7 +5427,7 @@ typedef union { struct { - unsigned long m_lo : 32; /* 52 bits of precision */ + unsigned int m_lo : 32; /* 52 bits of precision */ unsigned int m_hi : 20; unsigned int exp_bias : 11; /* bias == 1023 */ unsigned int sign : 1;

1 0

Alexandre Julliard : comctl32: Apply the imagelist mask when alpha blending .
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 8ea1f3385a8035477c14997ac37ac511e5c9c7da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea1f3385a8035477c14997ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 17:46:05 2010 +0200 comctl32: Apply the imagelist mask when alpha blending. --- dlls/comctl32/imagelist.c | 78 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 66 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 63f0ea0..a4dc2a9 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -815,10 +815,7 @@ ImageList_InternalDragDraw (HDC hdc, INT x, INT y) imldp.rgbFg = CLR_DEFAULT; imldp.fStyle = ILD_NORMAL; imldp.fState = ILS_ALPHA; - imldp.Frame = 128; - - /* FIXME: instead of using the alpha blending, we should - * create a 50% mask, and draw it semitransparantly that way */ + imldp.Frame = 192; ImageList_DrawIndirect (&imldp); } @@ -1064,6 +1061,68 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, } +static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, + int src_x, int src_y, int cx, int cy, int alpha ) +{ + BLENDFUNCTION func; + BOOL ret = FALSE; + HDC hdc; + HBITMAP bmp = 0, mask = 0; + BITMAPINFO *info; + void *bits, *mask_bits; + unsigned int *ptr; + int i, j, has_alpha = 0; + + if (!(hdc = CreateCompatibleDC( 0 ))) return FALSE; + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = cx; + info->bmiHeader.biHeight = cy; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = cx * cy * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + if (!(bmp = CreateDIBSection( himl->hdcImage, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done; + SelectObject( hdc, bmp ); + BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY ); + + for (i = 0, ptr = bits; i < cx * cy; i++) if ((has_alpha = (ptr[i] & 0xff000000) != 0)) break; + + if (himl->hbmMask) + { + unsigned int width_bytes = (cx + 31) / 32 * 4; + /* generate alpha channel from the mask */ + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biSizeImage = width_bytes * cy; + if (!(mask = CreateDIBSection( himl->hdcMask, info, DIB_RGB_COLORS, &mask_bits, 0, 0 ))) + goto done; + SelectObject( hdc, mask ); + BitBlt( hdc, 0, 0, cx, cy, himl->hdcMask, src_x, src_y, SRCCOPY ); + SelectObject( hdc, bmp ); + for (i = 0, ptr = bits; i < cy; i++) + for (j = 0; j < cx; j++, ptr++) + if ((((BYTE *)mask_bits)[i * width_bytes + j / 8] << (j % 8)) & 0x80) *ptr = 0; + else if (!has_alpha) *ptr |= 0xff000000; + } + + func.BlendOp = AC_SRC_OVER; + func.BlendFlags = 0; + func.SourceConstantAlpha = alpha; + func.AlphaFormat = AC_SRC_ALPHA; + ret = GdiAlphaBlend( dest_dc, dest_x, dest_y, cx, cy, hdc, 0, 0, cx, cy, func ); + +done: + DeleteDC( hdc ); + if (bmp) DeleteObject( bmp ); + if (mask) DeleteObject( mask ); + HeapFree( GetProcessHeap(), 0, info ); + return ret; +} + /************************************************************************* * ImageList_DrawIndirect [COMCTL32.@] * @@ -1141,17 +1200,12 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (fState & ILS_ALPHA) { - BLENDFUNCTION func; COLORREF colour; - func.BlendOp = AC_SRC_OVER; - func.BlendFlags = 0; - func.SourceConstantAlpha = pimldp->Frame; - func.AlphaFormat = AC_SRC_ALPHA; if (bIsTransparent) { - bResult = GdiAlphaBlend( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, - hImageListDC, pt.x, pt.y, cx, cy, func ); + bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, + pt.x, pt.y, cx, cy, pimldp->Frame ); goto end; } colour = pimldp->rgbBk; @@ -1160,7 +1214,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - GdiAlphaBlend( hImageDC, 0, 0, cx, cy, hImageListDC, pt.x, pt.y, cx, cy, func ); + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, pimldp->Frame ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end;

1 0

Wolfram Sang : user32: Honor bfOffBits in BITMAP_Load.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: f76a3b965c5c5440e2302b86e6b705d590cd23d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76a3b965c5c5440e2302b86e… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Mon May 10 03:36:27 2010 +0200 user32: Honor bfOffBits in BITMAP_Load. --- dlls/user32/cursoricon.c | 5 ++- dlls/user32/tests/cursoricon.c | 61 ++++++++++++++++++++++++++++----------- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 9d7788d..96827c2 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2394,7 +2394,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, char *bits; LONG width, height, new_width, new_height; WORD bpp_dummy; - DWORD compr_dummy; + DWORD compr_dummy, offbits = 0; INT bm_type; HDC screen_mem_dc = NULL; @@ -2424,6 +2424,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, UnmapViewOfFile( ptr ); return 0; } + offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); } size = bitmap_info_size(info, DIB_RGB_COLORS); @@ -2466,7 +2467,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); if (!(screen_mem_dc = CreateCompatibleDC( screen_dc ))) goto end; - bits = (char *)info + size; + bits = (char *)info + (offbits ? offbits : size); if (loadflags & LR_CREATEDIBSECTION) { diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 21e0dca..e68eaac 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -225,6 +225,14 @@ static void test_child_process(void) SendMessage(child, WM_USER+1, 0, (LPARAM) cursor); } +static BOOL color_match(COLORREF a, COLORREF b) +{ + /* 5-bit accuracy is a sufficient test. This will match as long as + * colors are never truncated to less that 3x5-bit accuracy i.e. + * palettized. */ + return (a & 0x00F8F8F8) == (b & 0x00F8F8F8); +} + static void test_CopyImage_Check(HBITMAP bitmap, UINT flags, INT copyWidth, INT copyHeight, INT expectedWidth, INT expectedHeight, WORD expectedDepth, BOOL dibExpected) { @@ -698,13 +706,14 @@ static const unsigned char pngimage[285] = { 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,0xDE,0xAD,0xBE,0xEF,0x3e,0x00,0x00,0x00,0x28,0x00, +/* 1x1 pixel bmp with gap between palette and bitmap. Correct bitmap contains only + zeroes, gap is 0xFF. */ +static const unsigned char bmpimage[70] = { +0x42,0x4d,0x46,0x00,0x00,0x00,0xDE,0xAD,0xBE,0xEF,0x42,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 +0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0x55,0x55,0x55,0x00,0xFF,0xFF, +0xFF,0xFF,0x00,0x00,0x00,0x00 }; /* 2x2 pixel gif */ @@ -714,6 +723,29 @@ static const unsigned char gif4pixel[42] = { 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b }; +static void test_LoadImageBitmap(HBITMAP hbm) +{ + BITMAP bm; + BITMAPINFO bmi; + DWORD ret, pixel = 0; + HDC hdc = GetDC(NULL); + + ret = GetObject(hbm, sizeof(bm), &bm); + ok(ret == sizeof(bm), "GetObject returned %d\n", ret); + + memset(&bmi, 0, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount= 24; + bmi.bmiHeader.biCompression= BI_RGB; + ret = GetDIBits(hdc, hbm, 0, bm.bmHeight, &pixel, &bmi, DIB_RGB_COLORS); + ok(ret == bm.bmHeight, "%d lines were converted, not %d\n", ret, bm.bmHeight); + + ok(color_match(pixel, 0x00ffffff), "Pixel is 0x%08x\n", pixel); +} + static void test_LoadImageFile(const unsigned char * image_data, unsigned int image_size, const char * ext, BOOL expect_success) { @@ -758,15 +790,18 @@ static void test_LoadImageFile(const unsigned char * image_data, /* 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 || error == 0xdeadbeef, /* Win9x, WinMe */ "Last error: %u\n", error); - if (handle != NULL) DeleteObject(handle); + if (expect_success) { + ok(handle != NULL, "LoadImage(%s) as IMAGE_BITMAP failed.\n", ext); + if (handle != NULL) test_LoadImageBitmap(handle); + } + else ok(handle == NULL, "LoadImage(%s) as IMAGE_BITMAP succeeded incorrectly.\n", ext); + + if (handle != NULL) DeleteObject(handle); DeleteFileA(filename); } @@ -994,14 +1029,6 @@ static HICON create_test_icon(HDC hdc, int width, int height, int bpp, return CreateIconIndirect(&iconInfo); } -static BOOL color_match(COLORREF a, COLORREF b) -{ - /* 5-bit accuracy is a sufficient test. This will match, so long as - * colors are never truncated to less that 3x5-bit accuracy i.e. - * paletized. */ - return (a & 0x00F8F8F8) == (b & 0x00F8F8F8); -} - static void check_alpha_draw(HDC hdc, BOOL drawiconex, BOOL alpha, int bpp, int line) { HICON hicon;

1 0

Huw Davies : oleaut32: Set the font to dirty when loading a new data.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 9d6a10a43aa10e21c53123935d6bd12c654546a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6a10a43aa10e21c53123935… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 10 15:01:03 2010 +0100 oleaut32: Set the font to dirty when loading a new data. --- dlls/oleaut32/olefont.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index df7de87..3c8c91f 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1836,9 +1836,10 @@ static HRESULT WINAPI OLEFontImpl_Load( MultiByteToWideChar( CP_ACP, 0, readBuffer, bStringSize, this->description.lpstrName, len ); this->description.lpstrName[len] = 0; - /* Ensure use of this font causes a new one to be created @@@@ */ + /* Ensure use of this font causes a new one to be created */ dec_int_ref(this->gdiFont); this->gdiFont = 0; + this->dirty = TRUE; return S_OK; }

1 0

Gerald Pfeifer : winecfg: Remove variable drive which is not really used from DriveDlgProc.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: cd958391e6894942419638804adbc5e6d30c0a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd958391e6894942419638804… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 12:57:01 2010 +0200 winecfg: Remove variable drive which is not really used from DriveDlgProc. --- programs/winecfg/driveui.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 87af06c..dced874 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -736,7 +736,6 @@ INT_PTR CALLBACK DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) { int item; - struct drive *drive; switch (msg) { @@ -813,7 +812,7 @@ DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) case IDC_BUTTON_EDIT: if (HIWORD(wParam) != BN_CLICKED) break; item = SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETCURSEL, 0, 0); - drive = (struct drive *) SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETITEMDATA, item, 0); + SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETITEMDATA, item, 0); break; case IDC_BUTTON_AUTODETECT:

1 0

Gerald Pfeifer : d3dx9_36/tests: Remove variable scaling which is not really used from D3DXMatrixTest.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: c45c226de4559687f993187fb44b4ef79bf19681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c45c226de4559687f993187fb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 01:06:30 2010 +0200 d3dx9_36/tests: Remove variable scaling which is not really used from D3DXMatrixTest. --- dlls/d3dx9_36/tests/math.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 832798f..6d192f9 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -236,7 +236,7 @@ static void D3DXMatrixTest(void) LPD3DXMATRIX funcpointer; D3DXPLANE plane; D3DXQUATERNION q, r; - D3DXVECTOR3 at, axis, eye, last, scaling; + D3DXVECTOR3 at, axis, eye, last; D3DXVECTOR4 light; BOOL expected, got; FLOAT angle, determinant, expectedfloat, gotfloat; @@ -264,7 +264,6 @@ static void D3DXMatrixTest(void) axis.x = 1.0f; axis.y = -3.0f; axis.z = 7.0f; eye.x = 8.0f; eye.y = -5.0f; eye.z = 5.75f; last.x = 9.7f; last.y = -8.6; last.z = 1.3f; - scaling.x = 0.03f; scaling.y =0.05f; scaling.z = 0.06f; light.x = 9.6f; light.y = 8.5f; light.z = 7.4; light.w = 6.3;

1 0

Gerald Pfeifer : mountmgr.sys: Remove variable result which is not really used from update_symlink.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 0c2fbbe7f04e774afc56a1e09b81847688b92997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2fbbe7f04e774afc56a1e09… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 19:44:22 2010 +0200 mountmgr.sys: Remove variable result which is not really used from update_symlink. --- dlls/mountmgr.sys/device.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index ba5a02b..6c182e8 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -175,7 +175,6 @@ static void update_symlink( const char *path, const char *dest, const char *orig /* send notification about a change to a given drive */ static void send_notify( int drive, int code ) { - DWORD_PTR result; DEV_BROADCAST_VOLUME info; info.dbcv_size = sizeof(info); @@ -183,8 +182,8 @@ static void send_notify( int drive, int code ) info.dbcv_reserved = 0; info.dbcv_unitmask = 1 << drive; info.dbcv_flags = DBTF_MEDIA; - result = BroadcastSystemMessageW( BSF_FORCEIFHUNG|BSF_QUERY, NULL, - WM_DEVICECHANGE, code, (LPARAM)&info ); + BroadcastSystemMessageW( BSF_FORCEIFHUNG|BSF_QUERY, NULL, + WM_DEVICECHANGE, code, (LPARAM)&info ); } /* create the disk device for a given volume */

1 0

Gerald Pfeifer : user32/tests: Remove SetShellWindowEx from test_shell_window.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 612df7ee228c9f2312f2b82ce23818d7fa047779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=612df7ee228c9f2312f2b82ce… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 20:14:52 2010 +0200 user32/tests: Remove SetShellWindowEx from test_shell_window. --- dlls/user32/tests/win.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a295850..eab16e7 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1040,7 +1040,6 @@ static void test_shell_window(void) DWORD error; HMODULE hinst, hUser32; BOOL (WINAPI*SetShellWindow)(HWND); - BOOL (WINAPI*SetShellWindowEx)(HWND, HWND); HWND hwnd1, hwnd2, hwnd3, hwnd4, hwnd5; HWND shellWindow, nextWnd; @@ -1055,7 +1054,6 @@ static void test_shell_window(void) hUser32 = GetModuleHandleA("user32"); SetShellWindow = (void *)GetProcAddress(hUser32, "SetShellWindow"); - SetShellWindowEx = (void *)GetProcAddress(hUser32, "SetShellWindowEx"); trace("previous shell window: %p\n", shellWindow);

1 0

Alexandre Julliard : user32: Fix checking of show count in ShowCursor.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: eeda373f6ff1989b61a256dfb66d6381930b2cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeda373f6ff1989b61a256dfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 11:53:37 2010 +0200 user32: Fix checking of show count in ShowCursor. --- dlls/user32/cursoricon.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 856d900..9d7788d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1701,7 +1701,7 @@ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) { HCURSOR cursor; int increment = bShow ? 1 : -1; - int prev_count; + int count; SERVER_START_REQ( set_cursor ) { @@ -1709,15 +1709,16 @@ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) req->show_count = increment; wine_server_call( req ); cursor = wine_server_ptr_handle( reply->prev_handle ); - prev_count = reply->prev_count; + count = reply->prev_count + increment; } SERVER_END_REQ; - TRACE("%d, count=%d\n", bShow, prev_count + increment ); + TRACE("%d, count=%d\n", bShow, count ); - if (!prev_count) USER_Driver->pSetCursor( bShow ? cursor : 0 ); + if (bShow && !count) USER_Driver->pSetCursor( cursor ); + else if (!bShow && count == -1) USER_Driver->pSetCursor( 0 ); - return prev_count + increment; + return count; } /***********************************************************************

1 0