wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Henri Verbeet : wined3d: Don't clamp vertex depth values.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 708d94212b4a6419f15200c1c9c5b79c5264903d URL: http://source.winehq.org/git/wine.git/?a=commit;h=708d94212b4a6419f15200c1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 22:48:50 2011 +0200 wined3d: Don't clamp vertex depth values. Since we report D3DPMISCCAPS_CLIPTLVERTS. --- dlls/d3d8/tests/visual.c | 10 +++++----- dlls/d3d9/tests/visual.c | 10 +++++----- dlls/ddraw/tests/visual.c | 10 +++++----- dlls/wined3d/state.c | 19 +++---------------- 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1e48c03..ae8276d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1416,15 +1416,15 @@ static void depth_clamp_test(IDirect3DDevice8 *device) if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_CLIPTLVERTS) { color = getPixelColor(device, 75, 75); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 150, 150); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); } else { diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e6cab39..3773ad7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10613,15 +10613,15 @@ static void depth_clamp_test(IDirect3DDevice9 *device) if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_CLIPTLVERTS) { color = getPixelColor(device, 75, 75); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 150, 150); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); } else { diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 5eec1c8..b6c8006 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -2901,15 +2901,15 @@ static void depth_clamp_test(IDirect3DDevice7 *device) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); color = getPixelColor(device, 75, 75); - todo_wine ok(color_match(color, 0x00ffffff, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00ffffff, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 150, 150); - todo_wine ok(color_match(color, 0x00ffffff, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00ffffff, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00002b7f, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00002b7f, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x00f9e814, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00f9e814, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x00f9e814, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00f9e814, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); vp.dvMinZ = 0.0; vp.dvMaxZ = 1.0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a2c197b..6c6ae3a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -486,7 +486,6 @@ static void state_alpha(DWORD state, struct wined3d_stateblock *stateblock, stru static void state_clipping(DWORD state_id, struct wined3d_stateblock *stateblock, struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_state *state = &stateblock->state; DWORD enable = 0xFFFFFFFF; DWORD disable = 0x00000000; @@ -520,23 +519,11 @@ static void state_clipping(DWORD state_id, struct wined3d_stateblock *stateblock { enable = state->render_states[WINED3DRS_CLIPPLANEENABLE]; disable = ~state->render_states[WINED3DRS_CLIPPLANEENABLE]; - if (gl_info->supported[ARB_DEPTH_CLAMP]) - { - glDisable(GL_DEPTH_CLAMP); - checkGLcall("glDisable(GL_DEPTH_CLAMP)"); - } - } else { + } + else + { disable = 0xffffffff; enable = 0x00; - if (gl_info->supported[ARB_DEPTH_CLAMP]) - { - glEnable(GL_DEPTH_CLAMP); - checkGLcall("glEnable(GL_DEPTH_CLAMP)"); - } - else - { - FIXME("Clipping disabled, but ARB_depth_clamp isn't supported.\n"); - } } if (enable & WINED3DCLIPPLANE0) { glEnable(GL_CLIP_PLANE0); checkGLcall("glEnable(clip plane 0)"); }

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in imagelist tests.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 7399177f0bb408fa7fb84ec2b77a8f97bbb1ee2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7399177f0bb408fa7fb84ec2b… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sun Jun 5 15:35:32 2011 +0200 comctl32/tests: Removed sign comparison warning in imagelist tests. --- dlls/comctl32/tests/imagelist.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index cc98a17..46b3595 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -893,7 +893,8 @@ static void image_list_init(HIMAGELIST himl) { HBITMAP hbm; char comment[16]; - INT n = 1, i; + INT n = 1; + DWORD i; static const struct test_data { BYTE grey; @@ -1757,15 +1758,15 @@ static void test_iconsize(void) ok(!ret, "got %d\n", ret); /* doesn't touch return pointers */ - cx = 0xdeadbeef; + cx = 0x1abe11ed; ret = ImageList_GetIconSize(himl, &cx, NULL); ok(!ret, "got %d\n", ret); - ok(cx == 0xdeadbeef, "got %d\n", cx); + ok(cx == 0x1abe11ed, "got %d\n", cx); - cy = 0xdeadbeef; + cy = 0x1abe11ed; ret = ImageList_GetIconSize(himl, NULL, &cy); ok(!ret, "got %d\n", ret); - ok(cy == 0xdeadbeef, "got %d\n", cy); + ok(cy == 0x1abe11ed, "got %d\n", cy); ImageList_Destroy(himl); }

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in listview tests.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 38bf3a6bbd2461d0e3923b364e8253e8380bd406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38bf3a6bbd2461d0e3923b364… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sun Jun 5 01:36:55 2011 +0200 comctl32/tests: Removed sign comparison warning in listview tests. --- dlls/comctl32/tests/listview.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 949b214..e0dfd72 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -662,7 +662,7 @@ static void test_lvm_hittest_(HWND hwnd, INT x, INT y, INT item, UINT flags, UIN BOOL todo_item, BOOL todo_flags, int line) { LVHITTESTINFO lpht; - DWORD ret; + INT ret; lpht.pt.x = x; lpht.pt.y = y; @@ -705,7 +705,7 @@ static void test_lvm_subitemhittest_(HWND hwnd, INT x, INT y, INT item, INT subi BOOL todo_item, BOOL todo_subitem, BOOL todo_flags, int line) { LVHITTESTINFO lpht; - DWORD ret; + INT ret; lpht.pt.x = x; lpht.pt.y = y; @@ -748,7 +748,7 @@ static void test_lvm_subitemhittest_(HWND hwnd, INT x, INT y, INT item, INT subi static void test_images(void) { HWND hwnd; - DWORD r; + INT r; LVITEM item; HIMAGELIST himl; HBITMAP hbmp; @@ -1018,7 +1018,7 @@ static void test_checkboxes(void) static void insert_column(HWND hwnd, int idx) { LVCOLUMN column; - DWORD rc; + INT rc; memset(&column, 0xcc, sizeof(column)); column.mask = LVCF_SUBITEM; @@ -1033,7 +1033,7 @@ static void insert_item(HWND hwnd, int idx) static CHAR text[] = "foo"; LVITEMA item; - DWORD rc; + INT rc; memset(&item, 0xcc, sizeof (item)); item.mask = LVIF_TEXT; @@ -1701,7 +1701,7 @@ static void test_icon_spacing(void) HWND hwnd; WORD w, h; - DWORD r; + INT r; hwnd = create_listview_control(LVS_ICON); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -2017,7 +2017,7 @@ static void test_multiselect(void) } select_task; HWND hwnd; - DWORD r; + INT r; int i,j,item_count,selected_count; static const int items=5; BYTE kstate[256]; @@ -2393,7 +2393,7 @@ static void test_sorting(void) { HWND hwnd; LVITEMA item = {0}; - DWORD r; + INT r; LONG_PTR style; static CHAR names[][5] = {"A", "B", "C", "D", "0"}; CHAR buff[10]; @@ -3633,7 +3633,7 @@ static void test_editbox(void) static CHAR buffer[25]; HWND hwnd, hwndedit, hwndedit2, header; LVITEMA item; - DWORD r; + INT r; hwnd = create_listview_control(LVS_EDITLABELS | LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -4128,7 +4128,7 @@ static void test_canceleditlabel(void) static void test_mapidindex(void) { HWND hwnd; - DWORD ret; + INT ret; /* LVM_MAPINDEXTOID unsupported with LVS_OWNERDATA */ hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); @@ -4250,7 +4250,7 @@ todo_wine { static void test_getcolumnwidth(void) { HWND hwnd; - DWORD ret; + INT ret; DWORD_PTR style; LVCOLUMNA col; LVITEMA itema; @@ -4442,7 +4442,7 @@ static void test_finditem(void) LVFINDINFOA fi; static char f[5]; HWND hwnd; - DWORD r; + INT r; hwnd = create_listview_control(LVS_REPORT); insert_item(hwnd, 0);

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in monthcal tests.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 589d87f215d7b8c76b42a795e4b7d13d207e08b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589d87f215d7b8c76b42a795e… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sat Jun 4 23:27:33 2011 +0200 comctl32/tests: Removed sign comparison warning in monthcal tests. --- dlls/comctl32/tests/monthcal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index f585376..83b789d 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -581,9 +581,9 @@ static void test_color(void) /* invalid color index */ color = SendMessage(hwnd, MCM_GETCOLOR, MCSC_TRAILINGTEXT + 1, 0); - expect(-1, color); + expect(~0u, color); prev = SendMessage(hwnd, MCM_SETCOLOR, MCSC_TRAILINGTEXT + 1, RGB(255,255,255)); - expect(-1, prev); + expect(~0u, prev); color = SendMessage(hwnd, MCM_GETCOLOR, MCSC_BACKGROUND, 0); prev = SendMessage(hwnd, MCM_SETCOLOR, MCSC_BACKGROUND, RGB(0,0,0)); @@ -920,11 +920,11 @@ static void test_hittest(void) res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); expect(0, mchit.pt.x); expect(0, mchit.pt.y); - expect(-1, res); + expect(~0u, res); expect(0, mchit.uHit); /* test with invalid pointer */ res = SendMessage(hwnd, MCM_HITTEST, 0, 0); - expect(-1, res); + expect(~0u, res); /* resize control to display single Calendar */ res = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r); @@ -1655,7 +1655,7 @@ static void test_hittest_v6(void) mchit.iRow = -1; mchit.iCol = -1; ret = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); - if (ret == -1) + if (ret == ~0u) { win_skip("Only MCHITTESTINFO_V1 supported\n"); DestroyWindow(hwnd);

1 0

Alexandre Julliard : Update the WineConf rsvp for 2011.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: website Branch: master Commit: 709512b65e5ff2b33442c6c2d10d7adc288ed39c URL: http://source.winehq.org/git/website.git/?a=commit;h=709512b65e5ff2b33442c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 22:35:10 2011 +0200 Update the WineConf rsvp for 2011. --- templates/en/wineconf/rsvp.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index 3962af0..f07b9ac 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -1,9 +1,9 @@ - + <table width="100%"> <tr> <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"><center>November 20 - 21, 2010 Paris, France</center></td> + <td align="right"><center>October 1 - 2, 2011 Minneapolis, MN</center></td> </tr> </table>

1 0

Alexandre Julliard : Remove some obsolete WineConf information.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: website Branch: master Commit: ace6a002fedc9e8764c8c1717f99f998c7da2438 URL: http://source.winehq.org/git/website.git/?a=commit;h=ace6a002fedc9e8764c8c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 22:34:50 2011 +0200 Remove some obsolete WineConf information. --- templates/en/wineconf.template | 68 -------------- templates/en/wineconf/travel.template | 134 ---------------------------- templates/he/wineconf.template | 68 -------------- templates/he/wineconf/media.template | 33 ------- templates/he/wineconf/rsvp.template | 14 --- templates/he/wineconf/rsvp_done.template | 5 - templates/he/wineconf/rsvp_form.template | 30 ------ templates/he/wineconf/survey.template | 14 --- templates/he/wineconf/survey_done.template | 5 - templates/he/wineconf/survey_form.template | 103 --------------------- templates/he/wineconf/travel.template | 134 ---------------------------- 11 files changed, 0 insertions(+), 608 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=ace6a002fedc9e8764…

1 0

Piotr Caban : msvcrt: Improved tolower_l and toupper_l implementation.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: e398b93900c45cc5d1457ee4d33866c4e0116bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e398b93900c45cc5d1457ee4d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 3 15:28:56 2011 +0200 msvcrt: Improved tolower_l and toupper_l implementation. --- dlls/msvcrt/ctype.c | 4 +- dlls/msvcrt/string.c | 4 +- dlls/msvcrt/tests/string.c | 45 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 75c9b38..2805afb 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -345,7 +345,7 @@ int CDECL MSVCRT__toupper_l(int c, MSVCRT__locale_t locale) locinfo = locale->locinfo; if(c < 256) - return locinfo->pcumap[c]; + return locinfo->pcumap[(unsigned char)c]; if(locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE) { @@ -400,7 +400,7 @@ int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) locinfo = locale->locinfo; if(c < 256) - return locinfo->pclmap[c]; + return locinfo->pclmap[(unsigned char)c]; if(locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE) { diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 58d6150..31ba8d4 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -79,7 +79,7 @@ int CDECL _strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale) while (*str) { - *str = MSVCRT__tolower_l(*str, locale); + *str = MSVCRT__tolower_l((unsigned char)*str, locale); str++; } @@ -140,7 +140,7 @@ int CDECL _strupr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale) while (*str) { - *str = MSVCRT__toupper_l(*str, locale); + *str = MSVCRT__toupper_l((unsigned char)*str, locale); str++; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 06a4178..6eaa74a 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -80,6 +80,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static int (__cdecl *p_tolower)(int); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -1326,6 +1327,7 @@ static void test_mbstowcs(void) ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); if(!pmbstowcs_s || !pwcstombs_s) { + setlocale(LC_ALL, "C"); win_skip("mbstowcs_s or wcstombs_s not available\n"); return; } @@ -1359,6 +1361,7 @@ static void test_mbstowcs(void) ok(ret == 5, "wcstombs_s did not return 5\n"); if(!pwcsrtombs) { + setlocale(LC_ALL, "C"); win_skip("wcsrtombs not available\n"); return; } @@ -1376,6 +1379,8 @@ static void test_mbstowcs(void) ok(ret == 4, "wcsrtombs did not return 4\n"); ok(pwstr == NULL, "pwstr != NULL\n"); ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); + + setlocale(LC_ALL, "C"); } static void test_gcvt(void) @@ -1854,7 +1859,6 @@ static void test__mbslwr_s(void) ok(!memcmp(buffer, "abcdefgh\0IJKLMNOP", sizeof("abcdefgh\0IJKLMNOP")), "Expected the output buffer to be \"abcdefgh\\0IJKLMNOP\", got \"%s\"\n", buffer); - } static void test__ultoa_s(void) @@ -1969,6 +1973,41 @@ static void test_wctob(void) ok(ret == (int)(char)0xe0, "ret = %x\n", ret); } +static void test_tolower(void) +{ + int ret; + + ret = p_tolower(0x41); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_tolower(0xF4); + ok(ret == 0xF4, "ret = %x\n", ret); + + ret = p_tolower((char)0xF4); + ok(ret==0xF4/*Vista+*/ || ret==(char)0xF4, "ret = %x\n", ret); + + /* is it using different locale (CP_ACP) for negative values?? */ + /* current implementation matches msvcr90 behaviour */ + ret = p_tolower((char)0xD0); + todo_wine ok(ret==0xF0/*Vista+*/ || ret==(char)0xD0, "ret = %x\n", ret); + + ret = p_tolower(0xD0); + ok(ret == 0xD0, "ret = %x\n", ret); + + if(!setlocale(LC_ALL, "us")) { + win_skip("skipping tolower tests that depends on locale\n"); + return; + } + + ret = p_tolower((char)0xD0); + ok(ret == 0xF0, "ret = %x\n", ret); + + ret = p_tolower(0xD0); + ok(ret == 0xF0, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); +} + START_TEST(string) { char mem[100]; @@ -2005,6 +2044,7 @@ START_TEST(string) p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); + p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -2047,7 +2087,6 @@ START_TEST(string) test__wcslwr_s(); test__mbsupr_s(); test__mbslwr_s(); - - /* This test is changing locale */ test_wctob(); + test_tolower(); }

1 0

Piotr Caban : msvcrt: Fix pclmap and pcumap for "C" locale.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 2b9d946aeaf3223b36d9ff3f3cb02aa100ed64a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9d946aeaf3223b36d9ff3f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 3 15:28:46 2011 +0200 msvcrt: Fix pclmap and pcumap for "C" locale. --- dlls/msvcrt/locale.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 96a80c1..64960d9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -826,10 +826,17 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) } - LCMapStringA(lcid[MSVCRT_LC_CTYPE], LCMAP_LOWERCASE, buf, 256, - (char*)loc->locinfo->pclmap, 256); - LCMapStringA(lcid[MSVCRT_LC_CTYPE], LCMAP_UPPERCASE, buf, 256, - (char*)loc->locinfo->pcumap, 256); + if(lcid[MSVCRT_LC_CTYPE]) { + LCMapStringA(lcid[MSVCRT_LC_CTYPE], LCMAP_LOWERCASE, buf, 256, + (char*)loc->locinfo->pclmap, 256); + LCMapStringA(lcid[MSVCRT_LC_CTYPE], LCMAP_UPPERCASE, buf, 256, + (char*)loc->locinfo->pcumap, 256); + } else { + for(i=0; i<256; i++) { + loc->locinfo->pclmap[i] = (i>='A' && i<='Z' ? i-'A'+'a' : i); + loc->locinfo->pcumap[i] = (i>='a' && i<='z' ? i-'a'+'A' : i); + } + } loc->mbcinfo->refcount = 1; loc->mbcinfo->mbcodepage = loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage;

1 0

Piotr Caban : msvcrt: Fix mingw compilation issues.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: f9de4eef75ecfc074f726f39e54a77211eca2e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9de4eef75ecfc074f726f39e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 3 15:28:32 2011 +0200 msvcrt: Fix mingw compilation issues. --- dlls/msvcrt/ctype.c | 52 +++++++------- dlls/msvcrt/data.c | 6 +- dlls/msvcrt/dir.c | 42 ++++++------ dlls/msvcrt/environ.c | 6 +- dlls/msvcrt/errno.c | 6 +- dlls/msvcrt/file.c | 74 ++++++++++---------- dlls/msvcrt/locale.c | 10 ++-- dlls/msvcrt/math.c | 36 +++++----- dlls/msvcrt/misc.c | 4 +- dlls/msvcrt/msvcrt.h | 24 ++++---- dlls/msvcrt/msvcrt.spec | 168 +++++++++++++++++++++++----------------------- dlls/msvcrt/process.c | 16 ++-- dlls/msvcrt/string.c | 10 ++-- dlls/msvcrt/time.c | 16 ++-- dlls/msvcrt/wcs.c | 20 +++--- 15 files changed, 245 insertions(+), 245 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9de4eef75ecfc074f726…

1 0

Andrew Nguyen : ws2_32/tests: Fix some test thread procedure prototypes.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: a282c150fa14242b04482808e0a3344c00d6b082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a282c150fa14242b04482808e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 3 07:37:03 2011 -0500 ws2_32/tests: Fix some test thread procedure prototypes. --- dlls/ws2_32/tests/sock.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7853a8c..28d5db3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1550,7 +1550,7 @@ static void test_UDP(void) } } -static void WINAPI do_getservbyname( HANDLE *starttest ) +static DWORD WINAPI do_getservbyname( void *param ) { struct { const char *name; @@ -1558,6 +1558,7 @@ static void WINAPI do_getservbyname( HANDLE *starttest ) int port; } serv[2] = { {"domain", "udp", 53}, {"telnet", "tcp", 23} }; + HANDLE *starttest = param; int i, j; struct servent *pserv[2]; @@ -1579,6 +1580,8 @@ static void WINAPI do_getservbyname( HANDLE *starttest ) ok ( pserv[0] == pserv[1], "getservbyname: winsock resized servent buffer when not necessary\n" ); } + + return 0; } static void test_getservbyname(void) @@ -1591,7 +1594,7 @@ static void test_getservbyname(void) /* create threads */ for ( i = 0; i < NUM_THREADS; i++ ) { - thread[i] = CreateThread ( NULL, 0, (LPTHREAD_START_ROUTINE) &do_getservbyname, &starttest, 0, &thread_id[i] ); + thread[i] = CreateThread ( NULL, 0, do_getservbyname, &starttest, 0, &thread_id[i] ); } /* signal threads to start */ @@ -2235,8 +2238,9 @@ static void test_WSAStringToAddressW(void) } -static VOID WINAPI SelectReadThread(select_thread_params *par) +static DWORD WINAPI SelectReadThread(void *param) { + select_thread_params *par = param; fd_set readfds; int ret; struct sockaddr_in addr; @@ -2256,6 +2260,8 @@ static VOID WINAPI SelectReadThread(select_thread_params *par) SetEvent(server_ready); ret = select(par->s+1, &readfds, NULL, NULL, &select_timeout); par->ReadKilled = (ret == 1); + + return 0; } static void test_errors(void) @@ -2344,7 +2350,7 @@ static void test_select(void) thread_params.s = fdRead; thread_params.ReadKilled = FALSE; server_ready = CreateEventA(NULL, TRUE, FALSE, NULL); - thread_handle = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) &SelectReadThread, &thread_params, 0, &id ); + thread_handle = CreateThread (NULL, 0, SelectReadThread, &thread_params, 0, &id ); ok ( (thread_handle != NULL), "CreateThread failed unexpectedly: %d\n", GetLastError()); WaitForSingleObject (server_ready, INFINITE); @@ -2396,8 +2402,9 @@ static void test_select(void) ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); } -static DWORD WINAPI AcceptKillThread(select_thread_params *par) +static DWORD WINAPI AcceptKillThread(void *param) { + select_thread_params *par = param; struct sockaddr_in address; int len = sizeof(address); SOCKET client_socket; @@ -2482,8 +2489,7 @@ static void test_accept(void) thread_params.s = server_socket; thread_params.ReadKilled = FALSE; - thread_handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) AcceptKillThread, - &thread_params, 0, &id); + thread_handle = CreateThread(NULL, 0, AcceptKillThread, &thread_params, 0, &id); if (thread_handle == NULL) { trace("error creating thread: %d\n", GetLastError());

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
81
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 2011