August 2012 - Wine-commits - list.winehq.org

Francois Gouget : msvcp100: VTBL_WRAPPER(60) is unused so remove it.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: e83e05734b3a9ffaa47cb6996f6bbd4ed3b26c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e83e05734b3a9ffaa47cb6996… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 21 13:31:55 2012 +0200 msvcp100: VTBL_WRAPPER(60) is unused so remove it. --- dlls/msvcp100/msvcp100.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp100/msvcp100.c b/dlls/msvcp100/msvcp100.c index 17253c5..60c2c8d 100644 --- a/dlls/msvcp100/msvcp100.c +++ b/dlls/msvcp100/msvcp100.c @@ -55,7 +55,6 @@ DEFINE_VTBL_WRAPPER(44); DEFINE_VTBL_WRAPPER(48); DEFINE_VTBL_WRAPPER(52); DEFINE_VTBL_WRAPPER(56); -DEFINE_VTBL_WRAPPER(60); #endif

1 0

Francois Gouget : dssenh/tests: add a trailing '\n' to a couple of ok() calls.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: b37c3d840d138cc741d7fb81caaae1b2641c2175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37c3d840d138cc741d7fb81c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 21 13:32:14 2012 +0200 dssenh/tests: add a trailing '\n' to a couple of ok() calls. --- dlls/dssenh/tests/dssenh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 6576f4d..a0ba903 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -861,7 +861,7 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t ok(result, "Failed to return hash value.\n"); /* Compare hashes to ensure they are the same */ - ok(hashLen1 == hashLen2, "Hash lengths were not the same."); + ok(hashLen1 == hashLen2, "Hash lengths were not the same.\n"); ok(!memcmp(hashValue1, hashValue2, hashLen2), "Hashes were not identical.\n"); /* Sign hash 1 */ @@ -883,7 +883,7 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Compare signatures to ensure they are both different, because every DSS signature should be different even if the input hash data is identical */ ok(memcmp(signValue1, signValue2, signLen2), "Expected two different signatures from " - "the same hash input."); + "the same hash input.\n"); result = CryptExportKey(privKey, 0, PUBLICKEYBLOB, 0, NULL, &pubKeyLen); ok(result, "Failed to acquire public key length, got %x\n", GetLastError());

1 0

Francois Gouget : po: A couple of British spelling fixes for the start usage message.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 160c85aefdd8b4ed3821f8f0ce8f3d1f4a3d4900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=160c85aefdd8b4ed3821f8f0c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 21 13:36:55 2012 +0200 po: A couple of British spelling fixes for the start usage message. --- po/en.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/en.po b/po/en.po index c424a54..a655a16 100644 --- a/po/en.po +++ b/po/en.po @@ -9673,8 +9673,8 @@ msgstr "" "/d directory Start the program in the specified directory.\n" "/b Don't create a new console for the program.\n" "/i Start the program with fresh environment variables.\n" -"/min Start the program minimized.\n" -"/max Start the program maximized.\n" +"/min Start the program minimised.\n" +"/max Start the program maximised.\n" "/low Start the program in the idle priority class.\n" "/normal Start the program in the normal priority class.\n" "/high Start the program in the high priority class.\n"

1 0

Nikolay Sivov : winecoreaudio: Fix variable types so pointer is not truncated on 64bit.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: d05757d29ae76f7b63898738c68b4efbf5e742b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05757d29ae76f7b63898738c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 21 07:54:50 2012 +0400 winecoreaudio: Fix variable types so pointer is not truncated on 64bit. --- dlls/winecoreaudio.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index e7b78a7..e84e6de 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -225,10 +225,10 @@ LONG CoreAudio_MIDIRelease(void) */ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - DWORD dwCallBack; + DWORD_PTR dwCallBack; UINT uFlags; HANDLE hDev; - DWORD dwInstance; + DWORD_PTR dwInstance; TRACE("wDevID=%d wMsg=%d dwParm1=%04lX dwParam2=%04lX\n", wDevID, wMsg, dwParam1, dwParam2);

1 0

Nikolay Sivov : wineoss: Fix variable types so pointer is not truncated on 64bit.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: d96cd05efe8bbdd7a97a88fdc4be1139a65760c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d96cd05efe8bbdd7a97a88fdc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 21 07:55:45 2012 +0400 wineoss: Fix variable types so pointer is not truncated on 64bit. --- dlls/wineoss.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 318af94..1c28a76 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -401,10 +401,10 @@ static LRESULT OSS_MidiExit(void) static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - DWORD dwCallBack; + DWORD_PTR dwCallBack; UINT uFlags; HANDLE hDev; - DWORD dwInstance; + DWORD_PTR dwInstance; TRACE("wDevID = %04X wMsg = %d dwParm1 = %04lX dwParam2 = %04lX\n", wDevID, wMsg, dwParam1, dwParam2);

1 0

Dmitry Timoshkov : gdiplus: Rename roundr() to gdip_round() to make it clearer that it's an internal helper.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 10c84dfe3ba9bb2d0057d05d615397be6076b7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c84dfe3ba9bb2d0057d05d6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 21 11:02:06 2012 +0900 gdiplus: Rename roundr() to gdip_round() to make it clearer that it's an internal helper. --- dlls/gdiplus/brush.c | 20 +++++++++--------- dlls/gdiplus/gdiplus.c | 6 ++-- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 42 ++++++++++++++++++++-------------------- dlls/gdiplus/graphicspath.c | 14 ++++++------ dlls/gdiplus/image.c | 8 +++--- dlls/gdiplus/matrix.c | 8 +++--- dlls/gdiplus/region.c | 10 ++++---- 8 files changed, 55 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10c84dfe3ba9bb2d0057d…

1 0

Dmitry Timoshkov : gdiplus: Use set_rect_empty() helper to make the code slightly more compact and readable.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: acc4623fd07e2f9e2a72184b62f9b59b3b2734a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc4623fd07e2f9e2a72184b6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 21 11:02:13 2012 +0900 gdiplus: Use set_rect_empty() helper to make the code slightly more compact and readable. --- dlls/gdiplus/tests/graphics.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 8c55abe..b007ddf 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3445,7 +3445,7 @@ static void test_GdipMeasureString(void) GpFontFamily *family; GpFont *font; GpStringFormat *format; - RectF bounds, rc, empty_rc = { 0.0, 0.0, 0.0, 0.0 }; + RectF bounds, rc; REAL base_cx = 0, base_cy = 0, height; INT chars, lines; LOGFONTW lf; @@ -3492,8 +3492,8 @@ static void test_GdipMeasureString(void) height = font_size * font_to_pixel_scale; - rc = empty_rc; - bounds = empty_rc; + set_rect_empty(&rc); + set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rc, format, &bounds, &chars, &lines); expect(Ok, status); @@ -3516,7 +3516,7 @@ static void test_GdipMeasureString(void) rc = bounds; rc.X = 50.0; rc.Y = 50.0; - bounds = empty_rc; + set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rc, format, &bounds, &chars, &lines); expect(Ok, status); expectf(50.0, bounds.X); @@ -3574,8 +3574,8 @@ static void test_GdipMeasureString(void) height /= td[i].page_scale; /*trace("%u: %.1f font units = %f units with %.1f dpi, page_scale %.1f\n", i, font_size, height, td[i].res_y, td[i].page_scale);*/ - rc = empty_rc; - bounds = empty_rc; + set_rect_empty(&rc); + set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rc, format, &bounds, &chars, &lines); expect(Ok, status); @@ -3598,7 +3598,7 @@ static void test_GdipMeasureString(void) rc = bounds; rc.X = 50.0; rc.Y = 50.0; - bounds = empty_rc; + set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rc, format, &bounds, &chars, &lines); expect(Ok, status); expectf(50.0, bounds.X); @@ -3749,14 +3749,8 @@ static void test_font_height_scaling(void) status = GdipSetPageUnit(graphics, gfx_unit); expect(Ok, status); - rect.X = 0.0; - rect.Y = 0.0; - rect.Width = 0; - rect.Height = 0; - bounds.X = 0.0; - bounds.Y = 0.0; - bounds.Width = 0; - bounds.Height = 0; + set_rect_empty(&rect); + set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); expect(Ok, status);

1 0

André Hentschel : ntdll: Add support for Windows 8 version.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 8b774cb7a8c1120c405374220a81b6800e01be10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b774cb7a8c1120c405374220… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 20 20:37:53 2012 +0200 ntdll: Add support for Windows 8 version. --- dlls/ntdll/version.c | 8 ++++++++ programs/winecfg/appdefaults.c | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 745ee5d..86637fc 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -55,6 +55,7 @@ typedef enum WIN2K8, /* Windows 2008 */ WIN2K8R2,/* Windows 2008 R2 */ WIN7, /* Windows 7 */ + WIN8, /* Windows 8 */ NB_WINDOWS_VERSIONS } WINDOWS_VERSION; @@ -163,6 +164,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 }, + /* WIN8 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 6, 2, 0x23F0, VER_PLATFORM_WIN32_NT, + {' ',0}, + 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, }; @@ -183,6 +190,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "win2008,win2k8", /* WIN2K8 */ "win2008r2,win2k8r2", /* WIN2K8R2 */ "win7", /* WIN7 */ + "win8", /* WIN8 */ }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 80df90c..c8940a6 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -49,6 +49,7 @@ static const struct const char *szProductType; } win_versions[] = { + { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, { "win2008", "Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"},

1 0

Dan Kegel : advapi32: RegSetValueExW should not crash when passed 1 instead of L"1".
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 2cd062831dd4c1b8d59fd0f8be505b1348c1cbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd062831dd4c1b8d59fd0f8b… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Aug 20 09:12:18 2012 -0700 advapi32: RegSetValueExW should not crash when passed 1 instead of L"1". --- dlls/advapi32/registry.c | 3 +++ dlls/advapi32/tests/registry.c | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index bf2e98a..d3b8edf 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1177,6 +1177,9 @@ LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, UNICODE_STRING nameW; /* no need for version check, not implemented on win9x anyway */ + + if (data && ((ULONG_PTR)data >> 16) == 0) return ERROR_NOACCESS; + if (count && is_string(type)) { LPCWSTR str = (LPCWSTR)data; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c0a7ebf..870275e 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -346,6 +346,9 @@ static void test_set_value(void) /* Crashes on NT4, Windows 2000 and XP SP1 */ ret = RegSetValueW(hkey_main, NULL, REG_SZ, NULL, 0); ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); + + RegSetValueExA(hkey_main, name2A, 0, REG_SZ, (const BYTE *)1, 1); + RegSetValueExA(hkey_main, name2A, 0, REG_DWORD, (const BYTE *)1, 1); } ret = RegSetValueW(hkey_main, NULL, REG_SZ, string1W, sizeof(string1W)); @@ -395,6 +398,12 @@ static void test_set_value(void) ok(ret == ERROR_SUCCESS, "RegSetValueExW failed: %d, GLE=%d\n", ret, GetLastError()); test_hkey_main_Value_A(name2A, string2A, sizeof(string2A)); test_hkey_main_Value_W(name2W, string2W, sizeof(string2W)); + + /* test RegSetValueExW with data = 1 */ + ret = RegSetValueExW(hkey_main, name2W, 0, REG_SZ, (const BYTE *)1, 1); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + ret = RegSetValueExW(hkey_main, name2W, 0, REG_DWORD, (const BYTE *)1, 1); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); } static void create_test_entries(void)

1 0

Alexandre Julliard : gdi32: Add a helper function to find a specific driver in the DC stack.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 0f5cc668bada79e38e8751bcf796f5b348ed3805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f5cc668bada79e38e8751bcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 21 12:54:01 2012 +0200 gdi32: Add a helper function to find a specific driver in the DC stack. --- dlls/gdi32/gdi_private.h | 8 ++++++++ dlls/gdi32/path.c | 9 +++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 44d5798..78ff1a7 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -179,6 +179,14 @@ static inline PHYSDEV pop_dc_driver( DC *dc, PHYSDEV dev ) return dev; } +static inline PHYSDEV find_dc_driver( DC *dc, const struct gdi_dc_funcs *funcs ) +{ + PHYSDEV dev; + + for (dev = dc->physDev; dev; dev = dev->next) if (dev->funcs == funcs) return dev; + return NULL; +} + /* bitmap object */ typedef struct tagBITMAPOBJ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 0a591af..a58f4e6 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -856,14 +856,15 @@ static BOOL pathdrv_DeleteDC( PHYSDEV dev ) BOOL PATH_SavePath( DC *dst, DC *src ) { - struct path_physdev *physdev; + PHYSDEV dev; if (src->path) { if (!(dst->path = copy_gdi_path( src->path ))) return FALSE; } - else if ((physdev = find_path_physdev( src ))) + else if ((dev = find_dc_driver( src, &path_driver ))) { + struct path_physdev *physdev = get_path_physdev( dev ); if (!(dst->path = copy_gdi_path( physdev->path ))) return FALSE; dst->path_open = TRUE; } @@ -880,7 +881,7 @@ BOOL PATH_RestorePath( DC *dst, DC *src ) if (!physdev) { if (!path_driver.pCreateDC( &dst->physDev, NULL, NULL, NULL, NULL )) return FALSE; - physdev = get_path_physdev( dst->physDev ); + physdev = get_path_physdev( find_dc_driver( dst, &path_driver )); } else free_gdi_path( physdev->path ); @@ -2101,7 +2102,7 @@ BOOL nulldrv_BeginPath( PHYSDEV dev ) free_gdi_path( path ); return FALSE; } - physdev = get_path_physdev( dc->physDev ); + physdev = get_path_physdev( find_dc_driver( dc, &path_driver )); physdev->path = path; if (dc->path) free_gdi_path( dc->path ); dc->path = NULL;

1 0