wine-commits June 2014

wine-commits@winehq.org

4 participants
378 discussions

Henri Verbeet : ddraw: Don' t try to create surfaces for wined3d internal textures.
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: wine Branch: master Commit: d30720d825fc594559104c12f27858f89a8673ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30720d825fc594559104c12f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 13 10:01:18 2014 +0200 ddraw: Don't try to create surfaces for wined3d internal textures. --- dlls/ddraw/ddraw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index aa74a1e..062fe02 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4733,8 +4733,8 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", device_parent, container_parent, surface, parent, parent_ops); - /* We have a swapchain texture. */ - if (container_parent == ddraw) + /* We have a swapchain or wined3d internal texture. */ + if (!container_parent || container_parent == ddraw) { *parent = NULL; *parent_ops = &ddraw_null_wined3d_parent_ops;

1 0

Piotr Caban : msvcrt: Add _wcsxfrm_l implementation.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: b540277cc7b8dc5b8118ce948b485afe802ab79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b540277cc7b8dc5b8118ce948… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 12 17:52:56 2014 +0200 msvcrt: Add _wcsxfrm_l implementation. --- dlls/msvcr100/msvcr100.spec | 4 +-- dlls/msvcr110/msvcr110.spec | 4 +-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 +-- dlls/msvcr90/msvcr90.spec | 4 +-- dlls/msvcrt/msvcrt.spec | 4 +-- dlls/msvcrt/wcs.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 70 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ab71711..108fae5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1518,7 +1518,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -@ stub _wcsxfrm_l +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ stub _wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 @@ -1877,7 +1877,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c231de9..4f89b24 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1877,7 +1877,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -@ stub _wcsxfrm_l +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ stub _wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 @@ -2236,7 +2236,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 0168359..1a94ee2 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -870,7 +870,7 @@ @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctomb(ptr long) MSVCRT_wctomb @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wscanf(wstr) MSVCRT_wscanf diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f5ff608..127a440 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -866,7 +866,7 @@ @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctomb(ptr long) MSVCRT_wctomb @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wscanf(wstr) MSVCRT_wscanf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d4985bc..302abe5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1197,7 +1197,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -@ stub _wcsxfrm_l +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ stub _wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 @@ -1557,7 +1557,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c5ec79a..28d37d1 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1173,7 +1173,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -@ stub _wcsxfrm_l +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ stub _wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 @@ -1530,7 +1530,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 82d352d..2349580 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1134,7 +1134,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -# stub _wcsxfrm_l(ptr wstr long ptr) +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime32(ptr) MSVCRT__wctime32 # stub _wctime32_s(ptr long ptr) @@ -1509,7 +1509,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 7c299a7..c2b8f58 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2056,3 +2056,61 @@ int CDECL MSVCRT_wcsncmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, { return strncmpW(str1, str2, n); } + +/********************************************************************* + * _wcsxfrm_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__wcsxfrm_l(MSVCRT_wchar_t *dest, const MSVCRT_wchar_t *src, + MSVCRT_size_t len, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + int i, ret; + + if(!MSVCRT_CHECK_PMT(src)) return INT_MAX; + if(!MSVCRT_CHECK_PMT(dest || !len)) return INT_MAX; + + if(len > INT_MAX) { + FIXME("len > INT_MAX not supported\n"); + len = INT_MAX; + } + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) { + MSVCRT_wcsncpy(dest, src, len); + return strlenW(src); + } + + ret = LCMapStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, NULL, 0); + if(!ret) { + if(len) dest[0] = 0; + *MSVCRT__errno() = MSVCRT_EILSEQ; + return INT_MAX; + } + if(!len) return ret-1; + + if(ret > len) { + dest[0] = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return ret-1; + } + + ret = LCMapStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, dest, len) - 1; + for(i=ret; i>=0; i--) + dest[i] = ((unsigned char*)dest)[i]; + return ret; +} + +/********************************************************************* + * wcsxfrm (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_wcsxfrm(MSVCRT_wchar_t *dest, + const MSVCRT_wchar_t *src, MSVCRT_size_t len) +{ + return MSVCRT__wcsxfrm_l(dest, src, len, NULL); +}

1 0

Piotr Caban : msvcrt: Add _strxfrm_l implementation.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 00bce25143b09a17c628dfded47ce2506b90aba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bce25143b09a17c628dfded… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 12 17:52:40 2014 +0200 msvcrt: Add _strxfrm_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 49 +++++++++++++++++++++++++++++-- dlls/msvcrt/tests/string.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 120 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ed40b65..ab71711 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1367,7 +1367,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ stub _strxfrm_l +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ stub _swprintf_c diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8af410c..c231de9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1725,7 +1725,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ stub _strxfrm_l +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ stub _swprintf_c diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1898d11..d4985bc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1047,7 +1047,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ stub _strxfrm_l +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ stub _swprintf_c diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b4ea4b8..c5ec79a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1022,7 +1022,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ stub _strxfrm_l +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ stub _swprintf_c diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 69020f6..82d352d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -988,7 +988,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -# stub _strxfrm_l(ptr str long ptr) +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf # stub _swprintf_c(ptr long str) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e1a14ac..60e00c9 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -701,12 +701,57 @@ char* __cdecl MSVCRT_strncat(char *dst, const char *src, MSVCRT_size_t len) } /********************************************************************* + * _strxfrm_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__strxfrm_l( char *dest, const char *src, + MSVCRT_size_t len, MSVCRT__locale_t locale ) +{ + MSVCRT_pthreadlocinfo locinfo; + int ret; + + if(!MSVCRT_CHECK_PMT(src)) return INT_MAX; + if(!MSVCRT_CHECK_PMT(dest || !len)) return INT_MAX; + + if(len > INT_MAX) { + FIXME("len > INT_MAX not supported\n"); + len = INT_MAX; + } + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) { + MSVCRT_strncpy(dest, src, len); + return strlen(src); + } + + ret = LCMapStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, NULL, 0); + if(!ret) { + if(len) dest[0] = 0; + *MSVCRT__errno() = MSVCRT_EILSEQ; + return INT_MAX; + } + if(!len) return ret-1; + + if(ret > len) { + dest[0] = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return ret-1; + } + + return LCMapStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, dest, len) - 1; +} + +/********************************************************************* * strxfrm (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_strxfrm( char *dest, const char *src, MSVCRT_size_t len ) { - /* FIXME: handle Windows locale */ - return strxfrm( dest, src, len ); + return MSVCRT__strxfrm_l(dest, src, len, NULL); } /******************************************************************** diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 822c952..6604819 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2649,6 +2649,73 @@ static void test_strncpy(void) ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); } +static void test_strxfrm(void) +{ + char dest[256]; + size_t ret; + + /* crashes on old version of msvcrt */ + if(p__atodbl_l) { + errno = 0xdeadbeef; + ret = strxfrm(NULL, "src", 1); + ok(ret == INT_MAX, "ret = %d\n", (int)ret); + ok(errno == EINVAL, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = strxfrm(dest, NULL, 100); + ok(ret == INT_MAX, "ret = %d\n", (int)ret); + ok(errno == EINVAL, "errno = %d\n", errno); + } + + ret = strxfrm(NULL, "src", 0); + ok(ret == 3, "ret = %d\n", (int)ret); + dest[0] = 'a'; + ret = strxfrm(dest, "src", 0); + ok(ret == 3, "ret = %d\n", (int)ret); + ok(dest[0] == 'a', "dest[0] = %d\n", dest[0]); + + dest[3] = 'a'; + ret = strxfrm(dest, "src", 5); + ok(ret == 3, "ret = %d\n", (int)ret); + ok(!strcmp(dest, "src"), "dest = %s\n", dest); + + errno = 0xdeadbeef; + dest[1] = 'a'; + ret = strxfrm(dest, "src", 1); + ok(ret == 3, "ret = %d\n", (int)ret); + ok(dest[0] == 's', "dest[0] = %d\n", dest[0]); + ok(dest[1] == 'a', "dest[1] = %d\n", dest[1]); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ret = strxfrm(dest, "", 5); + ok(ret == 0, "ret = %d\n", (int)ret); + ok(!dest[0], "dest[0] = %d\n", dest[0]); + + if(!setlocale(LC_ALL, "polish")) { + win_skip("stxfrm tests\n"); + return; + } + + ret = strxfrm(NULL, "src", 0); + ok(ret < sizeof(dest)-1, "ret = %d\n", (int)ret); + dest[0] = 'a'; + ret = strxfrm(dest, "src", 0); + ok(ret < sizeof(dest)-1, "ret = %d\n", (int)ret); + ok(dest[0] == 'a', "dest[0] = %d\n", dest[0]); + + ret = strxfrm(dest, "src", ret+1); + ok(ret < sizeof(dest)-1, "ret = %d\n", (int)ret); + ok(dest[0], "dest[0] = 0\n"); + + errno = 0xdeadbeef; + dest[0] = 'a'; + ret = strxfrm(dest, "src", 5); + ok(ret>5 && ret<sizeof(dest)-1, "ret = %d\n", (int)ret); + ok(!dest[0] || broken(!p__atodbl_l && dest[0]=='a'), "dest[0] = %d\n", dest[0]); + + setlocale(LC_ALL, "C"); +} + START_TEST(string) { char mem[100]; @@ -2748,4 +2815,5 @@ START_TEST(string) test__wcstoi64(); test_atoi(); test_strncpy(); + test_strxfrm(); }

1 0

Akihiro Sagawa : kernel32: Return correct buffer size when returning DBCS characters.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 80695cde4f475903f355821fec0d9c978c9aa29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=80695cde4f475903f355821fe… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 12 22:51:24 2014 +0900 kernel32: Return correct buffer size when returning DBCS characters. --- dlls/kernel32/tests/time.c | 17 ++++++++++++++++- dlls/kernel32/time.c | 13 +++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 0cc4485..55d4be9 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -667,7 +667,7 @@ static void test_GetCalendarInfo(void) char bufferA[20]; WCHAR bufferW[20]; DWORD val1, val2; - int ret; + int ret, ret2; if (!pGetCalendarInfoA || !pGetCalendarInfoW) { @@ -716,6 +716,21 @@ static void test_GetCalendarInfo(void) ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, NULL, 0, NULL ); ok( ret, "GetCalendarInfoW failed err %u\n", GetLastError() ); ok( ret == 5, "wrong size %u\n", ret ); + + ret = pGetCalendarInfoA( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, + bufferA, sizeof(bufferA), NULL); + ok( ret, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ret2 = pGetCalendarInfoA( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, + bufferA, 0, NULL); + ok( ret2, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ok( ret == ret2, "got %d, expected %d\n", ret2, ret ); + + ret2 = pGetCalendarInfoW( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, + bufferW, sizeof(bufferW), NULL); + ok( ret2, "GetCalendarInfoW failed err %u\n", GetLastError() ); + ret2 = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); + ok( ret == ret2, "got %d, expected %d\n", ret, ret2 ); + } START_TEST(time) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 11df7ff..21ac120 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -614,7 +614,7 @@ BOOL WINAPI GetProcessTimes( HANDLE hprocess, LPFILETIME lpCreationTime, int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, LPSTR lpCalData, int cchData, LPDWORD lpValue) { - int ret; + int ret, cchDataW = cchData; LPWSTR lpCalDataW = NULL; if (NLS_IsUnicodeOnlyLcid(lcid)) @@ -623,13 +623,14 @@ int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, return 0; } - if (cchData && - !(lpCalDataW = HeapAlloc(GetProcessHeap(), 0, cchData*sizeof(WCHAR)))) - return 0; + if (!cchData && !(CalType & CAL_RETURN_NUMBER)) + cchDataW = GetCalendarInfoW(lcid, Calendar, CalType, NULL, 0, NULL); + if (!(lpCalDataW = HeapAlloc(GetProcessHeap(), 0, cchDataW*sizeof(WCHAR)))) + return 0; - ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchData, lpValue); + ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchDataW, lpValue); if(ret && lpCalDataW && lpCalData) - WideCharToMultiByte(CP_ACP, 0, lpCalDataW, -1, lpCalData, cchData, NULL, NULL); + ret = WideCharToMultiByte(CP_ACP, 0, lpCalDataW, -1, lpCalData, cchData, NULL, NULL); else if (CalType & CAL_RETURN_NUMBER) ret *= sizeof(WCHAR); HeapFree(GetProcessHeap(), 0, lpCalDataW);

1 0

Akihiro Sagawa : kernel32: Avoid uninitialised value read in GetCalendarInfoA.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 89a558fe8f0b9034b53c0443431dab3739c6ddff URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a558fe8f0b9034b53c04434… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 12 22:51:22 2014 +0900 kernel32: Avoid uninitialised value read in GetCalendarInfoA. --- dlls/kernel32/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 01d38fc..11df7ff 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -629,7 +629,7 @@ int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchData, lpValue); if(ret && lpCalDataW && lpCalData) - WideCharToMultiByte(CP_ACP, 0, lpCalDataW, cchData, lpCalData, cchData, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, lpCalDataW, -1, lpCalData, cchData, NULL, NULL); else if (CalType & CAL_RETURN_NUMBER) ret *= sizeof(WCHAR); HeapFree(GetProcessHeap(), 0, lpCalDataW);

1 0

Nikolay Sivov : services: Defer service delete until all handles are closed.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 6a4c14696266aef22f3bfe890dd3e9955d87bdc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a4c14696266aef22f3bfe890… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 4 23:54:17 2014 +0400 services: Defer service delete until all handles are closed. --- dlls/advapi32/service.c | 2 ++ dlls/advapi32/tests/service.c | 17 ++++++----------- programs/services/rpc.c | 13 +++++++------ programs/services/services.c | 9 ++++++++- programs/services/services.h | 10 ++++++++-- 5 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 0047031..6bfdda6 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1087,6 +1087,8 @@ BOOL WINAPI DeleteService( SC_HANDLE hService ) { DWORD err; + TRACE("%p\n", hService); + __TRY { err = svcctl_DeleteService(hService); diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4ebae1c..beb589d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -187,7 +187,7 @@ static void test_open_svc(void) static void test_create_delete_svc(void) { - SC_HANDLE scm_handle, svc_handle1; + SC_HANDLE scm_handle, svc_handle1, svc_handle2; CHAR username[UNLEN + 1], domain[MAX_PATH]; DWORD user_size = UNLEN + 1; CHAR account[UNLEN + 3]; @@ -412,6 +412,11 @@ static void test_create_delete_svc(void) ret = DeleteService(svc_handle1); ok(ret, "Expected success, got error %u\n", GetLastError()); + /* Service is marked for delete, but handle is still open. Try to open service again. */ + svc_handle2 = OpenServiceA(scm_handle, servicename, GENERIC_READ); + ok(svc_handle2 != NULL, "got %p, error %u\n", svc_handle2, GetLastError()); + CloseServiceHandle(svc_handle2); + CloseServiceHandle(svc_handle1); CloseServiceHandle(scm_handle); @@ -2341,19 +2346,9 @@ static void test_refcount(void) svc_handle5 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - todo_wine - { ok(!svc_handle5, "Expected failure\n"); ok(GetLastError() == ERROR_SERVICE_MARKED_FOR_DELETE, "Expected ERROR_SERVICE_MARKED_FOR_DELETE, got %d\n", GetLastError()); - } - - /* FIXME: Remove this when Wine is fixed */ - if (svc_handle5) - { - DeleteService(svc_handle5); - CloseServiceHandle(svc_handle5); - } /* Close all the handles to the service and try again */ ret = CloseServiceHandle(svc_handle4); diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 166e2b7..3955e09 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -481,8 +481,8 @@ DWORD __cdecl svcctl_CreateServiceW( DWORD dwPasswordSize, SC_RPC_HANDLE *phService) { + struct service_entry *entry, *found; struct sc_manager_handle *manager; - struct service_entry *entry; DWORD err; WINE_TRACE("(%s, %s, 0x%x, %s)\n", wine_dbgstr_w(lpServiceName), wine_dbgstr_w(lpDisplayName), dwDesiredAccess, wine_dbgstr_w(lpBinaryPathName)); @@ -533,11 +533,14 @@ DWORD __cdecl svcctl_CreateServiceW( scmdatabase_lock_exclusive(manager->db); - if (scmdatabase_find_service(manager->db, lpServiceName)) + if ((found = scmdatabase_find_service(manager->db, lpServiceName))) { + service_lock_exclusive(found); + err = is_marked_for_delete(found) ? ERROR_SERVICE_MARKED_FOR_DELETE : ERROR_SERVICE_EXISTS; + service_unlock(found); scmdatabase_unlock(manager->db); free_service_entry(entry); - return ERROR_SERVICE_EXISTS; + return err; } if (scmdatabase_find_service_by_displayname(manager->db, get_display_name(entry))) @@ -568,16 +571,14 @@ DWORD __cdecl svcctl_DeleteService( if ((err = validate_service_handle(hService, DELETE, &service)) != ERROR_SUCCESS) return err; - scmdatabase_lock_exclusive(service->service_entry->db); service_lock_exclusive(service->service_entry); if (!is_marked_for_delete(service->service_entry)) - err = scmdatabase_remove_service(service->service_entry->db, service->service_entry); + err = mark_for_delete(service->service_entry); else err = ERROR_SERVICE_MARKED_FOR_DELETE; service_unlock(service->service_entry); - scmdatabase_unlock(service->service_entry->db); return err; } diff --git a/programs/services/services.c b/programs/services/services.c index 2fe3806..632d92a 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -245,7 +245,7 @@ DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *serv return ERROR_SUCCESS; } -DWORD scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *service) +static DWORD scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *service) { int err; @@ -422,7 +422,14 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase void release_service(struct service_entry *service) { if (InterlockedDecrement(&service->ref_count) == 0 && is_marked_for_delete(service)) + { + scmdatabase_lock_exclusive(service->db); + service_lock_exclusive(service); + scmdatabase_remove_service(service->db, service); + service_unlock(service); + scmdatabase_unlock(service->db); free_service_entry(service); + } } static DWORD scmdatabase_create(struct scmdatabase **db) diff --git a/programs/services/services.h b/programs/services/services.h index 3e36141..88a84ad 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -48,6 +48,7 @@ struct service_entry HANDLE control_pipe; HANDLE overlapped_event; HANDLE status_changed_event; + BOOL marked_for_delete; }; extern struct scmdatabase *active_database; @@ -57,7 +58,6 @@ extern struct scmdatabase *active_database; struct service_entry *scmdatabase_find_service(struct scmdatabase *db, LPCWSTR name); struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase *db, LPCWSTR name); DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *entry); -DWORD scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *entry); DWORD scmdatabase_lock_startup(struct scmdatabase *db); void scmdatabase_unlock_startup(struct scmdatabase *db); @@ -106,7 +106,13 @@ static inline LPCWSTR get_display_name(struct service_entry *service) static inline BOOL is_marked_for_delete(struct service_entry *service) { - return service->entry.next == NULL; + return service->marked_for_delete; +} + +static inline DWORD mark_for_delete(struct service_entry *service) +{ + service->marked_for_delete = TRUE; + return ERROR_SUCCESS; } #endif /*WINE_PROGRAMS_UTILS_H_*/

1 0

Guillaume Charifi : pdh: Implement PdhExpandCounterPathA/W.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: f823b6abe3265f0ed45796f6064a66fde453cb5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f823b6abe3265f0ed45796f60… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Wed Jun 4 19:00:50 2014 +0200 pdh: Implement PdhExpandCounterPathA/W. --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index b475d53..fc1aa4f 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -36,8 +36,8 @@ @ stub PdhEnumObjectsHA @ stub PdhEnumObjectsHW @ stub PdhEnumObjectsW -@ stub PdhExpandCounterPathA -@ stub PdhExpandCounterPathW +@ stdcall PdhExpandCounterPathA(str ptr ptr) +@ stdcall PdhExpandCounterPathW(wstr ptr ptr) @ stdcall PdhExpandWildCardPathA(str str ptr ptr long) @ stub PdhExpandWildCardPathHA @ stub PdhExpandWildCardPathHW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 25bd858..f197095 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -636,6 +636,24 @@ PDH_STATUS WINAPI PdhExpandWildCardPathW( LPCWSTR szDataSource, LPCWSTR szWildCa } /*********************************************************************** + * PdhExpandCounterPathA (PDH.@) + */ +PDH_STATUS WINAPI PdhExpandCounterPathA( LPCSTR szWildCardPath, LPSTR mszExpandedPathList, LPDWORD pcchPathListLength ) +{ + FIXME("%s, %p, %p: stub\n", debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength); + return PdhExpandWildCardPathA(NULL, szWildCardPath, mszExpandedPathList, pcchPathListLength, 0); +} + +/*********************************************************************** + * PdhExpandCounterPathW (PDH.@) + */ +PDH_STATUS WINAPI PdhExpandCounterPathW( LPCWSTR szWildCardPath, LPWSTR mszExpandedPathList, LPDWORD pcchPathListLength ) +{ + FIXME("%s, %p, %p: stub\n", debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength); + return PdhExpandWildCardPathW(NULL, szWildCardPath, mszExpandedPathList, pcchPathListLength, 0); +} + +/*********************************************************************** * PdhGetCounterInfoA (PDH.@) */ PDH_STATUS WINAPI PdhGetCounterInfoA( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD size, PPDH_COUNTER_INFO_A info )

1 0

Guillaume Charifi : ole32: CoCreateGuid returns E_INVALIDARG on null-GUID.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 216b24527dc2b465a87ea72b848f4ca51708f903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=216b24527dc2b465a87ea72b8… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Sat Jun 7 19:24:28 2014 +0200 ole32: CoCreateGuid returns E_INVALIDARG on null-GUID. --- dlls/ole32/compobj.c | 6 +++++- dlls/ole32/tests/compobj.c | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 250c0f9..d117c02 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2051,7 +2051,11 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) */ HRESULT WINAPI CoCreateGuid(GUID *pguid) { - DWORD status = UuidCreate(pguid); + DWORD status; + + if(!pguid) return E_INVALIDARG; + + status = UuidCreate(pguid); if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) return S_OK; return HRESULT_FROM_WIN32( status ); } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b85842b..16ae501 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1977,6 +1977,14 @@ static void test_OleRegGetMiscStatus(void) } } +static void test_CoCreateGuid(void) +{ + HRESULT hr; + + hr = CoCreateGuid(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -2033,4 +2041,5 @@ START_TEST(compobj) test_CoGetTreatAsClass(); test_CoInitializeEx(); test_OleRegGetMiscStatus(); + test_CoCreateGuid(); }

1 0

Austin English : msasn1: Add stub dll.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: d13d296c2784c42a73d1e44295988166a79caf2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13d296c2784c42a73d1e4429… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 1 17:22:16 2014 -0700 msasn1: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/msasn1/Makefile.in | 5 + dlls/msasn1/main.c | 39 +++++++ dlls/msasn1/msasn1.spec | 266 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 313 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d13d296c2784c42a73d1e…

1 0

Michael Müller : ntdll: Stub TokenAppContainerSid in NtQueryInformationToken.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 97c3bb040e7811fcd506fb5c29f5bdbec4ffead5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c3bb040e7811fcd506fb5c2… Author: Michael Müller <michael(a)fds-team.de> Date: Sat May 31 02:08:45 2014 +0200 ntdll: Stub TokenAppContainerSid in NtQueryInformationToken. --- dlls/ntdll/nt.c | 22 +++++++++++++++++++++- include/winnt.h | 17 +++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ce648de..73d9383 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -279,7 +279,20 @@ NTSTATUS WINAPI NtQueryInformationToken( sizeof(TOKEN_MANDATORY_LABEL) + sizeof(SID), /* TokenIntegrityLevel [sizeof(SID) includes one SubAuthority] */ 0, /* TokenUIAccess */ 0, /* TokenMandatoryPolicy */ - 0 /* TokenLogonSid */ + 0, /* TokenLogonSid */ + 0, /* TokenIsAppContainer */ + 0, /* TokenCapabilities */ + sizeof(TOKEN_APPCONTAINER_INFORMATION) + sizeof(SID), /* TokenAppContainerSid */ + 0, /* TokenAppContainerNumber */ + 0, /* TokenUserClaimAttributes*/ + 0, /* TokenDeviceClaimAttributes */ + 0, /* TokenRestrictedUserClaimAttributes */ + 0, /* TokenRestrictedDeviceClaimAttributes */ + 0, /* TokenDeviceGroups */ + 0, /* TokenRestrictedDeviceGroups */ + 0, /* TokenSecurityAttributes */ + 0, /* TokenIsRestricted */ + 0 /* TokenProcessTrustLevel */ }; ULONG len = 0; @@ -521,6 +534,13 @@ NTSTATUS WINAPI NtQueryInformationToken( memcpy(psid, &high_level, sizeof(SID)); } break; + case TokenAppContainerSid: + { + TOKEN_APPCONTAINER_INFORMATION *container = tokeninfo; + FIXME("QueryInformationToken( ..., TokenAppContainerSid, ...) semi-stub\n"); + container->TokenAppContainer = NULL; + } + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass); diff --git a/include/winnt.h b/include/winnt.h index bae8aed..280cba0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3685,6 +3685,19 @@ typedef enum _TOKEN_INFORMATION_CLASS { TokenUIAccess, TokenMandatoryPolicy, TokenLogonSid, + TokenIsAppContainer, + TokenCapabilities, + TokenAppContainerSid, + TokenAppContainerNumber, + TokenUserClaimAttributes, + TokenDeviceClaimAttributes, + TokenRestrictedUserClaimAttributes, + TokenRestrictedDeviceClaimAttributes, + TokenDeviceGroups, + TokenRestrictedDeviceGroups, + TokenSecurityAttributes, + TokenIsRestricted, + TokenProcessTrustLevel, MaxTokenInfoClass } TOKEN_INFORMATION_CLASS; @@ -4410,6 +4423,10 @@ typedef struct _TOKEN_MANDATORY_LABEL { SID_AND_ATTRIBUTES Label; } TOKEN_MANDATORY_LABEL, * PTOKEN_MANDATORY_LABEL; +typedef struct _TOKEN_APPCONTAINER_INFORMATION { + PSID TokenAppContainer; +} TOKEN_APPCONTAINER_INFORMATION, * PTOKEN_APPCONTAINER_INFORMATION; + /* * ACLs of NT */

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
38
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 2014