wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Nikolay Sivov : dwrite: Trace GetPaletteEntries() failure (Coverity).
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: a8a6f0bd8602ce13de60acf01d9c63f491635777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a6f0bd8602ce13de60acf01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 20 10:51:04 2016 +0300 dwrite: Trace GetPaletteEntries() failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 292866e..05b5f55 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4792,11 +4792,14 @@ static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphen if (!got_palette_index) { colorrun->paletteIndex = glyphenum->glyphs[g].palette_index; /* use foreground color or request one from the font */ - if (colorrun->paletteIndex == 0xffff) - memset(&colorrun->runColor, 0, sizeof(colorrun->runColor)); - else - IDWriteFontFace2_GetPaletteEntries(glyphenum->fontface, glyphenum->palette, colorrun->paletteIndex, + memset(&colorrun->runColor, 0, sizeof(colorrun->runColor)); + if (colorrun->paletteIndex != 0xffff) { + HRESULT hr = IDWriteFontFace2_GetPaletteEntries(glyphenum->fontface, glyphenum->palette, colorrun->paletteIndex, 1, &colorrun->runColor); + if (FAILED(hr)) + WARN("failed to get palette entry, fontface %p, palette %u, index %u, 0x%08x\n", glyphenum->fontface, + glyphenum->palette, colorrun->paletteIndex, hr); + } /* found a glyph position new color run starts from, origin is "original origin + distance to this glyph" */ colorrun->baselineOriginX = glyphenum->origin_x + get_glyph_origin(glyphenum, g); colorrun->baselineOriginY = glyphenum->origin_y;

1 0

Alexandre Julliard : quartz: Remove forward declaration of removed variable.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: f9b91b5a6b21856d6b8937bc33b19476d7001b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b91b5a6b21856d6b8937bc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 16:31:56 2016 +0900 quartz: Remove forward declaration of removed variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/pin.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 7212807..a2651fd 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -static const IPinVtbl PullPin_Vtbl; - #define ALIGNDOWN(value,boundary) ((value)/(boundary)*(boundary)) #define ALIGNUP(value,boundary) (ALIGNDOWN((value)+(boundary)-1, (boundary)))

1 0

Charles Davis : kernel32: Use setprogname(3) to set the program name if available.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 5a4576ee09cff4a886c2d502bde7d1d6418a0ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a4576ee09cff4a886c2d502b… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 19 15:33:33 2016 -0700 kernel32: Use setprogname(3) to set the program name if available. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/kernel32/process.c | 17 ++++++++++++++--- include/config.h.in | 3 +++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 8529306..8200927 100755 --- a/configure +++ b/configure @@ -15047,6 +15047,7 @@ for ac_func in \ sched_yield \ select \ setproctitle \ + setprogname \ setrlimit \ settimeofday \ sigaltstack \ diff --git a/configure.ac b/configure.ac index c9445e7..2ebbb10 100644 --- a/configure.ac +++ b/configure.ac @@ -2026,6 +2026,7 @@ AC_CHECK_FUNCS(\ sched_yield \ select \ setproctitle \ + setprogname \ setrlimit \ settimeofday \ sigaltstack \ diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 86333be..4771108 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1118,9 +1118,20 @@ static void set_process_name( int argc, char *argv[] ) { #ifdef HAVE_SETPROCTITLE setproctitle("-%s", argv[1]); -#endif + /* remove argv[0] */ + memmove( argv, argv + 1, argc * sizeof(argv[0]) ); +#elif defined(HAVE_SETPROGNAME) + int i, offset; + char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; -#ifdef HAVE_PRCTL + offset = argv[1] - argv[0]; + memmove( argv[1] - offset, argv[1], end - argv[1] ); + memset( end - offset, 0, offset ); + for (i = 1; i < argc; i++) argv[i-1] = argv[i] - offset; + argv[i-1] = NULL; + + setprogname( argv[0] ); +#elif defined(HAVE_PRCTL) int i, offset; char *p, *prctl_name = argv[1]; char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; @@ -1141,11 +1152,11 @@ static void set_process_name( int argc, char *argv[] ) argv[i-1] = NULL; } else -#endif /* HAVE_PRCTL */ { /* remove argv[0] */ memmove( argv, argv + 1, argc * sizeof(argv[0]) ); } +#endif /* HAVE_PRCTL */ } diff --git a/include/config.h.in b/include/config.h.in index 86318c5..86da1a5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -774,6 +774,9 @@ /* Define to 1 if you have the `setproctitle' function. */ #undef HAVE_SETPROCTITLE +/* Define to 1 if you have the `setprogname' function. */ +#undef HAVE_SETPROGNAME + /* Define to 1 if you have the `setrlimit' function. */ #undef HAVE_SETRLIMIT

1 0

André Hentschel : kernel32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 82debc093f0852f44d02b27abe9850cabadb9164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82debc093f0852f44d02b27ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:12:29 2016 +0100 kernel32/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 77249fa..63c5b47 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3754,17 +3754,13 @@ static void test_CreateFile(void) if (i == 0 || i == 5) { /* FIXME: remove once Wine is fixed */ -if (i == 5) todo_wine - ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); -else +todo_wine_if (i == 5) ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); } else { /* FIXME: remove once Wine is fixed */ -if (i == 1) todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); -else +todo_wine_if (i == 1) ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); } @@ -3776,9 +3772,7 @@ else else { /* FIXME: remove once Wine is fixed */ -if (i == 1) todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); -else +todo_wine_if (i == 1) ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); } }

1 0

André Hentschel : shlwapi/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: dbc043c3d8eff2be3e1509b72cbb5089f7a47c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc043c3d8eff2be3e1509b72… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:12:24 2016 +0100 shlwapi/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/path.c | 12 +++--------- dlls/shlwapi/tests/url.c | 5 +---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 03079a3..f780a78 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -286,9 +286,7 @@ static void test_PathCreateFromUrl(void) for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) { len = INTERNET_MAX_URL_LENGTH; ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); - if (!(TEST_PATHFROMURL[i].todo & 0x1)) - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); - else todo_wine + todo_wine_if (TEST_PATHFROMURL[i].todo & 0x1) ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { if(!(TEST_PATHFROMURL[i].todo & 0x2)) { @@ -305,9 +303,7 @@ static void test_PathCreateFromUrl(void) urlW = GetWideString(TEST_PATHFROMURL[i].url); ret = pPathCreateFromUrlW(urlW, ret_pathW, &len, 0); WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),NULL,NULL); - if (!(TEST_PATHFROMURL[i].todo & 0x1)) - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); - else todo_wine + todo_wine_if (TEST_PATHFROMURL[i].todo & 0x1) ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { if(!(TEST_PATHFROMURL[i].todo & 0x2)) { @@ -326,9 +322,7 @@ static void test_PathCreateFromUrl(void) len2 = 2; ret = pPathCreateFromUrlW(urlW, ret_pathW, &len2, 0); ok(ret == E_POINTER, "ret %08x, expected E_POINTER from url %s\n", ret, TEST_PATHFROMURL[i].url); - if(!(TEST_PATHFROMURL[i].todo & 0x4)) - ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); - else todo_wine + todo_wine_if (TEST_PATHFROMURL[i].todo & 0x4) ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); } diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 85da922..c89b044 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -838,10 +838,7 @@ static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, H ok(ret == dwExpectReturn || ret == dwExpectReturnAlt, "UrlCanonicalizeA failed: expected=0x%08x or 0x%08x, got=0x%08x, index %d\n", dwExpectReturn, dwExpectReturnAlt, ret, index); - if (todo) - todo_wine - ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected \"%s\", but got \"%s\", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index); - else + todo_wine_if (todo) ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected \"%s\", but got \"%s\", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index); if (pUrlCanonicalizeW) {

1 0

André Hentschel : urlmon/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 8b064d69e13a191f181abb51cde4262682f1ab41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b064d69e13a191f181abb51c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:12:23 2016 +0100 urlmon/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 22 ++++------------- dlls/urlmon/tests/sec_mgr.c | 57 ++++++--------------------------------------- 2 files changed, 11 insertions(+), 68 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index d63f1fe..dcf0970 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1724,14 +1724,9 @@ static void test_internet_feature_defaults(void) { for(i = 0; i < sizeof(default_feature_tests)/sizeof(default_feature_tests[0]); ++i) { hres = pCoInternetIsFeatureEnabled(default_feature_tests[i].feature, default_feature_tests[i].get_flags); - if(default_feature_tests[i].todo) { - todo_wine + todo_wine_if (default_feature_tests[i].todo) ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", hres, default_feature_tests[i].expected, i); - } else { - ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, default_feature_tests[i].expected, i); - } } } @@ -1877,24 +1872,15 @@ static void test_CoInternetSetFeatureEnabled(void) { for(i = 0; i < sizeof(internet_feature_tests)/sizeof(internet_feature_tests[0]); ++i) { hres = pCoInternetSetFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags, internet_feature_tests[i].enable); - if(internet_feature_tests[i].set_todo) { - todo_wine - ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, internet_feature_tests[i].set_expected, i); - } else { + todo_wine_if (internet_feature_tests[i].set_todo) ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", hres, internet_feature_tests[i].set_expected, i); - } hres = pCoInternetIsFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags); - if(internet_feature_tests[i].get_todo) { - todo_wine - ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, internet_feature_tests[i].get_expected, i); - } else { + todo_wine_if (internet_feature_tests[i].get_todo) ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", hres, internet_feature_tests[i].get_expected, i); - } + } } diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 4092842..ad0fcf6 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -940,11 +940,7 @@ static void test_zone_domain_mappings(void) hres = IInternetSecurityManager_MapUrlToZone(secmgr, urlW, &zone, 0); ok(hres == S_OK, "MapUrlToZone failed: %08x\n", hres); - if(test->todo) - todo_wine - ok(zone == test->zone || broken(test->broken_zone == zone), - "Expected %d, but got %d on test %d\n", test->zone, zone, i); - else + todo_wine_if (test->todo) ok(zone == test->zone || broken(test->broken_zone == zone), "Expected %d, but got %d on test %d\n", test->zone, zone, i); @@ -1636,12 +1632,7 @@ static void test_InternetGetSecurityUrlEx(void) result = NULL; hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_DEFAULT, 0); - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(hr == sec_url_ex_tests[i].default_hres, - "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", - hr, sec_url_ex_tests[i].default_hres, i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(hr == sec_url_ex_tests[i].default_hres, "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", hr, sec_url_ex_tests[i].default_hres, i); @@ -1652,12 +1643,7 @@ static void test_InternetGetSecurityUrlEx(void) hr = IUri_GetDisplayUri(result, &received); ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, wine_dbgstr_w(received), i); @@ -1669,12 +1655,7 @@ static void test_InternetGetSecurityUrlEx(void) result = NULL; hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_SECURITY_URL_ONLY, 0); - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(hr == sec_url_ex_tests[i].default_hres, - "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", - hr, sec_url_ex_tests[i].default_hres, i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(hr == sec_url_ex_tests[i].default_hres, "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", hr, sec_url_ex_tests[i].default_hres, i); @@ -1685,12 +1666,7 @@ static void test_InternetGetSecurityUrlEx(void) hr = IUri_GetDisplayUri(result, &received); ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, wine_dbgstr_w(received), i); @@ -1858,14 +1834,7 @@ static void test_SecurityManagerEx2(void) ok(hres == S_OK, "CreateUri returned %08x for '%s'\n", hres, sec_mgr_ex2_tests[i].uri); hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, &zone, 0, NULL, NULL); - if(sec_mgr_ex2_tests[i].map_todo) { - todo_wine - ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlZoneToEx2 returned %08x, expected %08x for '%s'\n", - hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); - todo_wine - ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, - zone, sec_mgr_ex2_tests[i].uri); - } else { + todo_wine_if (sec_mgr_ex2_tests[i].map_todo) { ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned %08x, expected %08x for '%s'\n", hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, @@ -1876,19 +1845,7 @@ static void test_SecurityManagerEx2(void) memset(buf, 0xf0, buf_size); hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, uri, buf, &buf_size, 0); - if(sec_mgr_ex2_tests[i].secid_todo) { - todo_wine - ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n", - hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri); - if(sec_mgr_ex2_tests[i].secid) { - todo_wine { - ok(buf_size == sec_mgr_ex2_tests[i].secid_size, "Got wrong security id size=%d, expected %d on test '%s'\n", - buf_size, sec_mgr_ex2_tests[i].secid_size, sec_mgr_ex2_tests[i].uri); - ok(!memcmp(buf, sec_mgr_ex2_tests[i].secid, sec_mgr_ex2_tests[i].secid_size), "Got wrong security id on test '%s'\n", - sec_mgr_ex2_tests[i].uri); - } - } - } else { + todo_wine_if (sec_mgr_ex2_tests[i].secid_todo) { ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n", hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri); if(sec_mgr_ex2_tests[i].secid) {

1 0

Frédéric Delanoy : ole32/tests: Use todo_wine_if () in tests.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 6936bbb1980f19fbdb61fefc41eb1cdac210f822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6936bbb1980f19fbdb61fefc4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 20 00:43:01 2016 +0100 ole32/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 3845ec2..2167f66 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -156,12 +156,7 @@ typedef struct PresentationDataHeader while (expected_method_list->flags & TEST_OPTIONAL && \ strcmp(expected_method_list->method, method_name) != 0) \ expected_method_list++; \ - if (expected_method_list->flags & TEST_TODO) \ - todo_wine \ - ok(!strcmp(expected_method_list->method, method_name), \ - "Expected %s to be called instead of %s\n", \ - expected_method_list->method, method_name); \ - else \ + todo_wine_if (expected_method_list->flags & TEST_TODO) \ ok(!strcmp(expected_method_list->method, method_name), \ "Expected %s to be called instead of %s\n", \ expected_method_list->method, method_name); \

1 0

Frédéric Delanoy : ntdll/tests: Use todo_wine_if () in tests.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 06b39c982d86777f408805967992a57a6811be2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b39c982d86777f408805967… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 19 22:10:55 2016 +0100 ntdll/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 7b1002a..f93c623 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -148,12 +148,8 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info) if (namelen != len || memcmp(nameW, testfiles[i].nameW, len*sizeof(WCHAR))) continue; if (!testfiles[i].attr_done) { - if (testfiles[i].todo) { - todo_wine + todo_wine_if (testfiles[i].todo) ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); - } else { - ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); - } testfiles[i].attr_done = TRUE; } testfiles[i].nfound++;

1 0

Alexandre Julliard : sfnt2fon: Remove no longer needed use of libwine_static.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 3712d9fdff1a56b1707df0ebfe72cdde35f38433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3712d9fdff1a56b1707df0ebf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:34:50 2016 +0900 sfnt2fon: Remove no longer needed use of libwine_static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/sfnt2fon/Makefile.in | 2 +- tools/sfnt2fon/sfnt2fon.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/sfnt2fon/Makefile.in b/tools/sfnt2fon/Makefile.in index 5a92d85..c6d289f 100644 --- a/tools/sfnt2fon/Makefile.in +++ b/tools/sfnt2fon/Makefile.in @@ -3,4 +3,4 @@ PROGRAMS = sfnt2fon C_SRCS = sfnt2fon.c EXTRAINCL = $(FREETYPE_CFLAGS) -EXTRALIBS = $(FREETYPE_LIBS) $(LIBWINE_STATIC) +EXTRALIBS = $(FREETYPE_LIBS) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 7612bc2..ea915da 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -41,7 +41,6 @@ #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H -#define WINE_UNICODE_API /* nothing */ #include "wine/unicode.h" #include "wingdi.h" #include "basetsd.h"

1 0

Alexandre Julliard : wmc: Remove no longer needed use of libwine_static.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 8f4ee97092e7be6cc95313c259c5eac807ff18b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f4ee97092e7be6cc95313c25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:34:40 2016 +0900 wmc: Remove no longer needed use of libwine_static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/Makefile.in | 2 +- tools/wmc/lang.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 41b7236..a97da85 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -11,6 +11,6 @@ C_SRCS = \ BISON_SRCS = mcy.y -EXTRALIBS = $(GETTEXTPO_LIBS) $(LIBWINE_STATIC) +EXTRALIBS = $(GETTEXTPO_LIBS) INSTALL_DEV = $(PROGRAMS) diff --git a/tools/wmc/lang.h b/tools/wmc/lang.h index 337d661..5a11c5b 100644 --- a/tools/wmc/lang.h +++ b/tools/wmc/lang.h @@ -21,7 +21,6 @@ #ifndef __WMC_LANG_H #define __WMC_LANG_H -#define WINE_UNICODE_API /* nothing */ #include "wine/unicode.h" typedef struct language {

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
76
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 February 2016