wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Alistair Leslie-Hughes : oledb32: Properties aren't case sensitive.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 57d0efa45994d8e8cb35720e3c76e1cfac6be420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d0efa45994d8e8cb35720e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 17 21:48:14 2013 +1000 oledb32: Properties aren't case sensitive. --- dlls/oledb32/datainit.c | 2 +- dlls/oledb32/tests/database.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 13d9f55..58bd812 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -368,7 +368,7 @@ static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset) n = (min+max)/2; - r = strcmpW(dbproperties[n].name, name); + r = strcmpiW(dbproperties[n].name, name); if (!r) break; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 518bba7..216adc6 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -97,6 +97,7 @@ static void test_database(void) 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', 'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o','=','F','a','l','s','e',';',0}; static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; + static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -111,6 +112,7 @@ static void test_database(void) test_GetDataSource(NULL); test_GetDataSource(initstring_jet); test_GetDataSource(initstring_default); + test_GetDataSource(initstring_lower); } START_TEST(database)

1 0

Dmitry Timoshkov : gdi32: Scale default GUI fonts to match screen resolution changes.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 705a0f023846fc113413a30d097b80860bd3d40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=705a0f023846fc113413a30d0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 17 19:02:25 2013 +0900 gdi32: Scale default GUI fonts to match screen resolution changes. --- dlls/gdi32/gdiobj.c | 49 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/font.c | 7 +++++- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 5375049..de64474 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -597,6 +597,49 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) return entry != NULL; } +/****************************************************************************** + * get_dpi (internal) + * + * get the dpi from the registry + */ +static int get_dpi( void ) +{ + static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; + static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; + static int dpi = -1; + HKEY hkey; + + if (dpi != -1) return dpi; + + if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS) + { + DWORD type, size; + int new_dpi; + + size = sizeof(new_dpi); + if (RegQueryValueExW(hkey, dpi_value_name, NULL, &type, (void *)&new_dpi, &size) == ERROR_SUCCESS) + { + if (type == REG_DWORD && new_dpi != 0) + dpi = new_dpi; + } + RegCloseKey(hkey); + } + if (dpi <= 0) dpi = 96; + return dpi; +} + + +static HFONT create_scaled_font( const LOGFONTW *deffont ) +{ + LOGFONTW lf; + LONG height; + + lf = *deffont; + height = abs(lf.lfHeight) * get_dpi() / 96; + lf.lfHeight = deffont->lfHeight < 0 ? -height : height; + + return CreateFontIndirectW( &lf ); +} /*********************************************************************** * DllMain @@ -636,10 +679,10 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) /* language-dependent stock fonts */ deffonts = get_default_fonts(get_default_charset()); - stock_objects[SYSTEM_FONT] = CreateFontIndirectW( &deffonts->SystemFont ); - stock_objects[DEVICE_DEFAULT_FONT] = CreateFontIndirectW( &deffonts->DeviceDefaultFont ); + stock_objects[SYSTEM_FONT] = create_scaled_font( &deffonts->SystemFont ); + stock_objects[DEVICE_DEFAULT_FONT] = create_scaled_font( &deffonts->DeviceDefaultFont ); stock_objects[SYSTEM_FIXED_FONT] = CreateFontIndirectW( &deffonts->SystemFixedFont ); - stock_objects[DEFAULT_GUI_FONT] = CreateFontIndirectW( &deffonts->DefaultGuiFont ); + stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); stock_objects[DC_BRUSH] = CreateBrushIndirect( &DCBrush ); stock_objects[DC_PEN] = CreatePenIndirect( &DCPen ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 2802f0e..9563da9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5012,7 +5012,12 @@ static void test_stock_fonts(void) } /* FIXME: Remove once Wine is fixed */ - if (td[i][j].dpi != 96) todo_wine + if (td[i][j].dpi != 96 && + /* MS Sans Serif for 120 dpi and higher should include 12 pixel bitmap set */ + ((!strcmp(td[i][j].face_name, "MS Sans Serif") && td[i][j].height == 12) || + /* System for 120 dpi and higher should include 20 pixel bitmap set */ + (!strcmp(td[i][j].face_name, "System") && td[i][j].height > 16))) + todo_wine ok(height == td[i][j].height_pixels, "%d(%d): expected height %d, got %d\n", i, j, td[i][j].height_pixels, height); else ok(height == td[i][j].height_pixels, "%d(%d): expected height %d, got %d\n", i, j, td[i][j].height_pixels, height);

1 0

Dmitry Timoshkov : gdi32/tests: Add a test for default font height scaling with screen resolution changes.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 6834a44dc4c3c7e8c377a2fd56d11e93edd37b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6834a44dc4c3c7e8c377a2fd5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 17 19:01:39 2013 +0900 gdi32/tests: Add a test for default font height scaling with screen resolution changes. --- dlls/gdi32/tests/font.c | 67 ++++++++++++++++++++++++++--------------------- 1 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 63fe909..2802f0e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4900,7 +4900,7 @@ static void test_east_asian_font_selection(void) ReleaseDC(NULL, hdc); } -static int get_font_dpi(const LOGFONT *lf) +static int get_font_dpi(const LOGFONT *lf, int *height) { HDC hdc = CreateCompatibleDC(0); HFONT hfont; @@ -4914,6 +4914,7 @@ static int get_font_dpi(const LOGFONT *lf) ret = GetTextMetrics(hdc, &tm); ok(ret, "GetTextMetrics failed\n"); ret = tm.tmDigitizedAspectX; + if (height) *height = tm.tmHeight; DeleteDC(hdc); DeleteObject(hfont); @@ -4930,49 +4931,49 @@ static void test_stock_fonts(void) }; static const struct test_data { - int charset, weight, height, dpi; + int charset, weight, height, height_pixels, dpi; const char face_name[LF_FACESIZE]; } td[][11] = { { /* ANSI_FIXED_FONT */ - { DEFAULT_CHARSET, FW_NORMAL, 12, 96, "Courier" }, - { DEFAULT_CHARSET, FW_NORMAL, 12, 120, "Courier" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 96, "Courier" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 120, "Courier" }, { 0 } }, { /* ANSI_VAR_FONT */ - { DEFAULT_CHARSET, FW_NORMAL, 12, 96, "MS Sans Serif" }, - { DEFAULT_CHARSET, FW_NORMAL, 12, 120, "MS Sans Serif" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 96, "MS Sans Serif" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 120, "MS Sans Serif" }, { 0 } }, { /* SYSTEM_FONT */ - { SHIFTJIS_CHARSET, FW_NORMAL, 18, 96, "System" }, - { SHIFTJIS_CHARSET, FW_NORMAL, 22, 120, "System" }, - { HANGEUL_CHARSET, FW_NORMAL, 16, 96, "System" }, - { HANGEUL_CHARSET, FW_NORMAL, 20, 120, "System" }, - { DEFAULT_CHARSET, FW_BOLD, 16, 96, "System" }, - { DEFAULT_CHARSET, FW_BOLD, 20, 120, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 18, 18, 96, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 22, 22, 120, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 16, 16, 96, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 20, 20, 120, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 16, 16, 96, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 20, 20, 120, "System" }, { 0 } }, { /* DEVICE_DEFAULT_FONT */ - { SHIFTJIS_CHARSET, FW_NORMAL, 18, 96, "System" }, - { SHIFTJIS_CHARSET, FW_NORMAL, 22, 120, "System" }, - { HANGEUL_CHARSET, FW_NORMAL, 16, 96, "System" }, - { HANGEUL_CHARSET, FW_NORMAL, 20, 120, "System" }, - { DEFAULT_CHARSET, FW_BOLD, 16, 96, "System" }, - { DEFAULT_CHARSET, FW_BOLD, 20, 120, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 18, 18, 96, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 22, 22, 120, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 16, 16, 96, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 20, 20, 120, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 16, 16, 96, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 20, 20, 120, "System" }, { 0 } }, { /* DEFAULT_GUI_FONT */ - { SHIFTJIS_CHARSET, FW_NORMAL, -12, 96, "?MS UI Gothic" }, - { SHIFTJIS_CHARSET, FW_NORMAL, -15, 120, "?MS UI Gothic" }, - { HANGEUL_CHARSET, FW_NORMAL, -12, 96, "?Gulim" }, - { HANGEUL_CHARSET, FW_NORMAL, -15, 120, "?Gulim" }, - { GB2312_CHARSET, FW_NORMAL, -12, 96, "?SimHei" }, - { GB2312_CHARSET, FW_NORMAL, -15, 120, "?SimHei" }, - { CHINESEBIG5_CHARSET, FW_NORMAL, -12, 96, "?MingLiU" }, - { CHINESEBIG5_CHARSET, FW_NORMAL, -15, 120, "?MingLiU" }, - { DEFAULT_CHARSET, FW_NORMAL, -11, 96, "MS Shell Dlg" }, - { DEFAULT_CHARSET, FW_NORMAL, -13, 120, "MS Shell Dlg" }, + { SHIFTJIS_CHARSET, FW_NORMAL, -12, 15, 96, "?MS UI Gothic" }, + { SHIFTJIS_CHARSET, FW_NORMAL, -15, 18, 120, "?MS UI Gothic" }, + { HANGEUL_CHARSET, FW_NORMAL, -12, 15, 96, "?Gulim" }, + { HANGEUL_CHARSET, FW_NORMAL, -15, 18, 120, "?Gulim" }, + { GB2312_CHARSET, FW_NORMAL, -12, 15, 96, "?SimHei" }, + { GB2312_CHARSET, FW_NORMAL, -15, 18, 120, "?SimHei" }, + { CHINESEBIG5_CHARSET, FW_NORMAL, -12, 15, 96, "?MingLiU" }, + { CHINESEBIG5_CHARSET, FW_NORMAL, -15, 18, 120, "?MingLiU" }, + { DEFAULT_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" }, + { DEFAULT_CHARSET, FW_NORMAL, -13, 16, 120, "MS Shell Dlg" }, { 0 } } }; @@ -4982,7 +4983,7 @@ static void test_stock_fonts(void) { HFONT hfont; LOGFONT lf; - int ret; + int ret, height; hfont = GetStockObject(font[i]); ok(hfont != 0, "%d: GetStockObject(%d) failed\n", i, font[i]); @@ -5002,7 +5003,7 @@ static void test_stock_fonts(void) continue; } - ret = get_font_dpi(&lf); + ret = get_font_dpi(&lf, &height); if (ret != td[i][j].dpi) { trace("%d(%d): font %s %d dpi doesn't match test data %d\n", @@ -5010,6 +5011,12 @@ static void test_stock_fonts(void) continue; } + /* FIXME: Remove once Wine is fixed */ + if (td[i][j].dpi != 96) todo_wine + ok(height == td[i][j].height_pixels, "%d(%d): expected height %d, got %d\n", i, j, td[i][j].height_pixels, height); + else + ok(height == td[i][j].height_pixels, "%d(%d): expected height %d, got %d\n", i, j, td[i][j].height_pixels, height); + ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight); ok(td[i][j].height == lf.lfHeight, "%d(%d): expected lfHeight %d, got %d\n", i, j, td[i][j].height, lf.lfHeight); if (td[i][j].face_name[0] == '?')

1 0

Dmitry Timoshkov : gdi32/tests: Skip the bitmap font max width test on not 96 dpi resolutions.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 288f3be439a75a47377791cf84fa7d649989a298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288f3be439a75a47377791cf8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 17 19:00:53 2013 +0900 gdi32/tests: Skip the bitmap font max width test on not 96 dpi resolutions. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 087d572..63fe909 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -976,7 +976,7 @@ static void test_bitmap_font_metrics(void) /* Don't run the max char width test on System/ANSI_CHARSET. We have extra characters in our font that make the max width bigger */ - if(strcmp(lf.lfFaceName, "System") || lf.lfCharSet != ANSI_CHARSET) + if ((strcmp(lf.lfFaceName, "System") || lf.lfCharSet != ANSI_CHARSET) && tm.tmDigitizedAspectX == 96) ok(tm.tmMaxCharWidth == fd[i].max_char_width, "%s(%d): tm.tmMaxCharWidth %d != %d\n", fd[i].face_name, height, tm.tmMaxCharWidth, fd[i].max_char_width); } else

1 0

Alexandre Julliard : user32: Center the icon in the caption bar.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 094251496ccb02c0cccca4301e4464e33e423a21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094251496ccb02c0cccca4301… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 19:30:32 2013 +0200 user32: Center the icon in the caption bar. --- dlls/user32/nonclient.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index bc7fcc0..050af90 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -697,11 +697,14 @@ BOOL NC_DrawSysButton (HWND hwnd, HDC hdc, BOOL down) if (hIcon) { RECT rect; + POINT pt; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); DWORD ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); NC_GetInsideRect( hwnd, COORDS_WINDOW, &rect, style, ex_style ); - DrawIconEx (hdc, rect.left + 2, rect.top + 1, hIcon, + pt.x = rect.left + 2; + pt.y = (rect.top + GetSystemMetrics(SM_CYCAPTION) - GetSystemMetrics(SM_CYSMICON)) / 2; + DrawIconEx (hdc, pt.x, pt.y, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, 0, DI_NORMAL); }

1 0

Alexandre Julliard : user32: Make the default non-client metrics scalable with the resolution.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: a657e5f6efa160110867d3a19ed886a9b40ceb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a657e5f6efa160110867d3a19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 14:35:47 2013 +0200 user32: Make the default non-client metrics scalable with the resolution. --- dlls/user32/sysparams.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 175753c..7c05d00 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1181,18 +1181,18 @@ static BOOL_ENTRY_MIRROR( ICONTITLEWRAP, TRUE ); static YESNO_ENTRY( BEEP, TRUE ); -static TWIPS_ENTRY( BORDER, 1 ); -static TWIPS_ENTRY( CAPTIONHEIGHT, 18 ); -static TWIPS_ENTRY( CAPTIONWIDTH, 18 ); -static TWIPS_ENTRY( ICONHORIZONTALSPACING, 75 ); -static TWIPS_ENTRY( ICONVERTICALSPACING, 75 ); -static TWIPS_ENTRY( MENUHEIGHT, 18 ); -static TWIPS_ENTRY( MENUWIDTH, 18 ); +static TWIPS_ENTRY( BORDER, -15 ); +static TWIPS_ENTRY( CAPTIONHEIGHT, -270 ); +static TWIPS_ENTRY( CAPTIONWIDTH, -270 ); +static TWIPS_ENTRY( ICONHORIZONTALSPACING, -1125 ); +static TWIPS_ENTRY( ICONVERTICALSPACING, -1125 ); +static TWIPS_ENTRY( MENUHEIGHT, -270 ); +static TWIPS_ENTRY( MENUWIDTH, -270 ); static TWIPS_ENTRY( PADDEDBORDERWIDTH, 0 ); -static TWIPS_ENTRY( SCROLLHEIGHT, 16 ); -static TWIPS_ENTRY( SCROLLWIDTH, 16 ); -static TWIPS_ENTRY( SMCAPTIONHEIGHT, 15 ); -static TWIPS_ENTRY( SMCAPTIONWIDTH, 13 ); +static TWIPS_ENTRY( SCROLLHEIGHT, -240 ); +static TWIPS_ENTRY( SCROLLWIDTH, -240 ); +static TWIPS_ENTRY( SMCAPTIONHEIGHT, -225 ); +static TWIPS_ENTRY( SMCAPTIONWIDTH, -225 ); static DWORD_ENTRY( ACTIVEWINDOWTRACKING, 0 ); static DWORD_ENTRY( ACTIVEWNDTRKTIMEOUT, 0 );

1 0

Alexandre Julliard : user32: Check the correct id for the close button when setting the font.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 9ac7cc83111e55f008120a4e7d7f1a7340408a64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac7cc83111e55f008120a4e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 13:22:23 2013 +0200 user32: Check the correct id for the close button when setting the font. --- dlls/user32/msgbox.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 9328cd0..8b3cb4d 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -88,7 +88,7 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* set button font */ for (i = IDOK; i <= IDCONTINUE; i++) /* no close button */ - if (i != IDCANCEL) + if (i != IDCLOSE) SendDlgItemMessageW (hwnd, i, WM_SETFONT, (WPARAM)hFont, 0); /* set text font */

1 0

Alexandre Julliard : windowscodecs/tests: Pass the correct constant to IWICImagingFactory_CreateBitmapFromHBITMAP.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 0fc73914e262f6ee4dc99d03bdf327a6d89a5f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc73914e262f6ee4dc99d03b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 12:47:43 2013 +0200 windowscodecs/tests: Pass the correct constant to IWICImagingFactory_CreateBitmapFromHBITMAP. --- dlls/windowscodecs/tests/bitmap.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 742f45f..5b78bf9 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -651,15 +651,15 @@ static void test_CreateBitmapFromHBITMAP(void) hbmp = create_dib(3, 3, 8, NULL, data_8bpp_rgb_dib); ok(hbmp != 0, "failed to create bitmap\n"); - hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, 0, 0, WICBitmapCacheOnLoad, &bitmap); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, 0, 0, WICBitmapIgnoreAlpha, &bitmap); todo_wine ok(hr == WINCODEC_ERR_WIN32ERROR || hr == 0x88980003 /*XP*/, "expected WINCODEC_ERR_WIN32ERROR, got %#x\n", hr); - hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapCacheOnLoad, NULL); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapIgnoreAlpha, NULL); todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); - hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapCacheOnLoad, &bitmap); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapIgnoreAlpha, &bitmap); todo_wine ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); if (hr != S_OK) return; @@ -691,7 +691,7 @@ todo_wine ok(hpal != 0, "CreatePalette failed\n"); hbmp = create_dib(3, 3, 8, pal, data_8bpp_pal_dib); - hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapCacheOnLoad, &bitmap); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapIgnoreAlpha, &bitmap); ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); IWICBitmap_GetPixelFormat(bitmap, &format); @@ -731,7 +731,7 @@ todo_wine ok(hpal != 0, "CreatePalette failed\n"); hbmp = create_dib(3, 3, 8, pal, data_8bpp_pal_dib); - hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapCacheOnLoad, &bitmap); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapIgnoreAlpha, &bitmap); ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); IWICBitmap_GetPixelFormat(bitmap, &format);

1 0

Alexandre Julliard : inetcomm: Only set the command type when the command expects a reply.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: 1020a7b00fabc42968de65990c5a36af81f1b3b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1020a7b00fabc42968de65990… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 12:47:18 2013 +0200 inetcomm: Only set the command type when the command expects a reply. --- dlls/inetcomm/pop3transport.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index bdae830..d275f21 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -311,11 +311,10 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) } } -static void init_parser(POP3Transport *This, POP3COMMAND command, POP3CMDTYPE type) +static void init_parser(POP3Transport *This, POP3COMMAND command) { This->state = STATE_NONE; This->command = command; - This->type = type; } static HRESULT POP3Transport_ParseResponse(POP3Transport *This, char *pszResponse, POP3RESPONSE *pResponse) @@ -659,7 +658,7 @@ static void POP3Transport_CallbackProcessUSERResp(IInternetTransport *iface, cha strcat(command, This->InetTransport.ServerInfo.szPassword); strcat(command, "\r\n"); - init_parser(This, POP3_PASS, POP3_NONE); + init_parser(This, POP3_PASS); InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvPASSResp); HeapFree(GetProcessHeap(), 0, command); @@ -800,7 +799,7 @@ static HRESULT WINAPI POP3Transport_Connect(IPOP3Transport *iface, if (FAILED(hr)) return hr; - init_parser(This, POP3_USER, POP3_NONE); + init_parser(This, POP3_USER); return InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackSendUSERCmd); } @@ -885,7 +884,7 @@ static HRESULT WINAPI POP3Transport_CommandUSER(IPOP3Transport *iface, LPSTR use strcat(command, username); strcat(command, "\r\n"); - init_parser(This, POP3_USER, POP3_NONE); + init_parser(This, POP3_USER); InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvUSERResp); HeapFree(GetProcessHeap(), 0, command); @@ -908,7 +907,7 @@ static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR pas strcat(command, password); strcat(command, "\r\n"); - init_parser(This, POP3_PASS, POP3_NONE); + init_parser(This, POP3_PASS); InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvPASSResp); HeapFree(GetProcessHeap(), 0, command); @@ -934,7 +933,8 @@ static HRESULT WINAPI POP3Transport_CommandLIST( } else command = list_all; - init_parser(This, POP3_LIST, cmdtype); + init_parser(This, POP3_LIST); + This->type = cmdtype; InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvLISTResp); if (dwPopId) HeapFree(GetProcessHeap(), 0, command); @@ -956,7 +956,8 @@ static HRESULT WINAPI POP3Transport_CommandTOP( sprintf(command, top, dwPopId, cPreviewLines); This->preview_lines = cPreviewLines; - init_parser(This, POP3_TOP, cmdtype); + init_parser(This, POP3_TOP); + This->type = cmdtype; InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvTOPResp); HeapFree(GetProcessHeap(), 0, command); @@ -972,7 +973,7 @@ static HRESULT WINAPI POP3Transport_CommandQUIT(IPOP3Transport *iface) InternetTransport_ChangeStatus(&This->InetTransport, IXP_DISCONNECTING); - init_parser(This, POP3_QUIT, POP3_NONE); + init_parser(This, POP3_QUIT); return InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvQUITResp); } @@ -983,7 +984,7 @@ static HRESULT WINAPI POP3Transport_CommandSTAT(IPOP3Transport *iface) TRACE("\n"); - init_parser(This, POP3_STAT, POP3_NONE); + init_parser(This, POP3_STAT); InternetTransport_DoCommand(&This->InetTransport, stat, POP3Transport_CallbackRecvSTATResp); return S_OK; } @@ -995,7 +996,7 @@ static HRESULT WINAPI POP3Transport_CommandNOOP(IPOP3Transport *iface) TRACE("\n"); - init_parser(This, POP3_NOOP, POP3_NONE); + init_parser(This, POP3_NOOP); InternetTransport_DoCommand(&This->InetTransport, noop, POP3Transport_CallbackRecvNOOPResp); return S_OK; } @@ -1007,7 +1008,7 @@ static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface) TRACE("\n"); - init_parser(This, POP3_RSET, POP3_NONE); + init_parser(This, POP3_RSET); InternetTransport_DoCommand(&This->InetTransport, rset, POP3Transport_CallbackRecvRSETResp); return S_OK; } @@ -1031,7 +1032,8 @@ static HRESULT WINAPI POP3Transport_CommandUIDL( } else command = uidl_all; - init_parser(This, POP3_UIDL, cmdtype); + init_parser(This, POP3_UIDL); + This->type = cmdtype; InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvUIDLResp); if (dwPopId) HeapFree(GetProcessHeap(), 0, command); @@ -1052,7 +1054,8 @@ static HRESULT WINAPI POP3Transport_CommandDELE( if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; sprintf(command, dele, dwPopId); - init_parser(This, POP3_DELE, cmdtype); + init_parser(This, POP3_DELE); + This->type = cmdtype; InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvDELEResp); HeapFree(GetProcessHeap(), 0, command); @@ -1073,7 +1076,8 @@ static HRESULT WINAPI POP3Transport_CommandRETR( if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; sprintf(command, retr, dwPopId); - init_parser(This, POP3_RETR, cmdtype); + init_parser(This, POP3_RETR); + This->type = cmdtype; InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvRETRResp); HeapFree(GetProcessHeap(), 0, command);

1 0

Rico Schüller : d3dx9: Apply rotationcenter only when a rotation is done.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: ee664704772f4392625f09fd246535b343120863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee664704772f4392625f09fd2… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 17 09:56:20 2013 +0200 d3dx9: Apply rotationcenter only when a rotation is done. --- dlls/d3dx9_36/math.c | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 43911e9..e0cab9e 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -102,13 +102,6 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin D3DXMatrixIdentity(out); - if (rotationcenter) - { - out->u.m[3][0] = -rotationcenter->x; - out->u.m[3][1] = -rotationcenter->y; - out->u.m[3][2] = -rotationcenter->z; - } - if (rotation) { FLOAT temp00, temp01, temp02, temp10, temp11, temp12, temp20, temp21, temp22; @@ -135,15 +128,12 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin if (rotationcenter) { - FLOAT x, y, z; - - x = out->u.m[3][0]; - y = out->u.m[3][1]; - z = out->u.m[3][2]; - - out->u.m[3][0] = x * temp00 + y * temp10 + z * temp20; - out->u.m[3][1] = x * temp01 + y * temp11 + z * temp21; - out->u.m[3][2] = x * temp02 + y * temp12 + z * temp22; + out->u.m[3][0] = rotationcenter->x * (1.0f - temp00) - rotationcenter->y * temp10 + - rotationcenter->z * temp20; + out->u.m[3][1] = rotationcenter->y * (1.0f - temp11) - rotationcenter->x * temp01 + - rotationcenter->z * temp21; + out->u.m[3][2] = rotationcenter->z * (1.0f - temp22) - rotationcenter->x * temp02 + - rotationcenter->y * temp12; } } else @@ -153,13 +143,6 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin out->u.m[2][2] = scaling; } - if (rotationcenter) - { - out->u.m[3][0] += rotationcenter->x; - out->u.m[3][1] += rotationcenter->y; - out->u.m[3][2] += rotationcenter->z; - } - if (translation) { out->u.m[3][0] += translation->x;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
42
Older →

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 June 2013