March 2013 - Wine-commits - list.winehq.org

Francois Gouget : d3dx9_34: Add a space between the spec entry name and the implementation function.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 8f6497c7823c3a3070653e950d69b44aec7afed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6497c7823c3a3070653e950… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 9 07:42:35 2013 +0100 d3dx9_34: Add a space between the spec entry name and the implementation function. --- dlls/d3dx9_34/d3dx9_34.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index bbf36d8..1cd744c 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -272,7 +272,7 @@ @ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW @ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd @ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot -@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)d3dx9_36.D3DXSHEvalConeLight +@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight @ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection @ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight @ stdcall D3DXSHEvalHemisphereLight(long ptr long long ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight

1 0

Daniel Jelinski : comctl32/listview: Fix overwriting of item values.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 6ad51d509cc70e42e985f780b4ce7783d480b85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad51d509cc70e42e985f780b… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Mar 9 06:52:53 2013 +0100 comctl32/listview: Fix overwriting of item values. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b084e5e..52717e9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8290,10 +8290,10 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) lvItem.mask = LVIF_TEXT; lvItem.iItem = 0; lvItem.iSubItem = nColumn; - lvItem.pszText = szDispText; lvItem.cchTextMax = DISP_TEXT_SIZE; for (; lvItem.iItem < infoPtr->nItemCount; lvItem.iItem++) { + lvItem.pszText = szDispText; if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) continue; nLabelWidth = LISTVIEW_GetStringWidthT(infoPtr, lvItem.pszText, TRUE); if (max_cx < nLabelWidth) max_cx = nLabelWidth;

1 0

Akihiro Sagawa : msvcrt/tests: Add _wcstoi64/_wcstoui64 tests.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 564b68244702031299d99d5354e7b573620f40e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=564b68244702031299d99d535… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Mar 9 16:56:38 2013 +0900 msvcrt/tests: Add _wcstoi64/_wcstoui64 tests. --- dlls/msvcrt/tests/string.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 43fe7c5..98d79c4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -71,6 +71,8 @@ static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); +static __int64 (__cdecl *p_wcstoi64)(const wchar_t *, wchar_t **, int); +static unsigned __int64 (__cdecl *p_wcstoui64)(const wchar_t *, wchar_t **, int); static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static size_t (__cdecl *p_mbsrtowcs)(wchar_t*, const char**, size_t, mbstate_t*); @@ -2468,6 +2470,57 @@ static void test__stricmp(void) setlocale(LC_ALL, "C"); } +static void test__wcstoi64(void) +{ + static const WCHAR digit[] = { '9', 0 }; + static const WCHAR stock[] = { 0x3231, 0 }; /* PARENTHESIZED IDEOGRAPH STOCK */ + static const WCHAR tamil[] = { 0x0bef, 0 }; /* TAMIL DIGIT NINE */ + static const WCHAR thai[] = { 0x0e59, 0 }; /* THAI DIGIT NINE */ + static const WCHAR fullwidth[] = { 0xff19, 0 }; /* FULLWIDTH DIGIT NINE */ + static const WCHAR hex[] = { 0xff19, 'f', 0x0e59, 0xff46, 0 }; + + __int64 res; + unsigned __int64 ures; + WCHAR *endpos; + + if (!p_wcstoi64 || !p_wcstoui64) { + win_skip("_wcstoi64 or _wcstoui64 not found\n"); + return; + } + + res = p_wcstoi64(digit, NULL, 10); + ok(res == 9, "res != 9\n"); + res = p_wcstoi64(stock, &endpos, 10); + todo_wine ok(res == 0, "res != 0\n"); + todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + res = p_wcstoi64(tamil, &endpos, 10); + ok(res == 0, "res != 0\n"); + ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); + res = p_wcstoi64(thai, NULL, 10); + todo_wine ok(res == 9, "res != 9\n"); + res = p_wcstoi64(fullwidth, NULL, 10); + todo_wine ok(res == 9, "res != 9\n"); + res = p_wcstoi64(hex, NULL, 16); + todo_wine ok(res == 0x9f9, "res != 0x9f9\n"); + + ures = p_wcstoui64(digit, NULL, 10); + ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(stock, &endpos, 10); + todo_wine ok(ures == 0, "ures != 0\n"); + todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ures = p_wcstoui64(tamil, &endpos, 10); + ok(ures == 0, "ures != 0\n"); + ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); + ures = p_wcstoui64(thai, NULL, 10); + todo_wine ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(fullwidth, NULL, 10); + todo_wine ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(hex, NULL, 16); + todo_wine ok(ures == 0x9f9, "ures != 0x9f9\n"); + + return; +} + START_TEST(string) { char mem[100]; @@ -2495,6 +2548,8 @@ START_TEST(string) p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); p_strtoi64 = (void *)GetProcAddress(hMsvcrt, "_strtoi64"); p_strtoui64 = (void *)GetProcAddress(hMsvcrt, "_strtoui64"); + p_wcstoi64 = (void *)GetProcAddress(hMsvcrt, "_wcstoi64"); + p_wcstoui64 = (void *)GetProcAddress(hMsvcrt, "_wcstoui64"); pmbstowcs_s = (void *)GetProcAddress(hMsvcrt, "mbstowcs_s"); pwcstombs_s = (void *)GetProcAddress(hMsvcrt, "wcstombs_s"); pwcsrtombs = (void *)GetProcAddress(hMsvcrt, "wcsrtombs"); @@ -2564,4 +2619,5 @@ START_TEST(string) test_tolower(); test__atodbl(); test__stricmp(); + test__wcstoi64(); }

1 0

Akihiro Sagawa : msvcrt: Fix incorrect casts in _wcstoi64_l and _wcstoui64_l.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 0010ee021a6c79eb766b805f5fa1485f13bb51f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0010ee021a6c79eb766b805f5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Mar 9 16:56:40 2013 +0900 msvcrt: Fix incorrect casts in _wcstoi64_l and _wcstoui64_l. --- dlls/msvcrt/tests/string.c | 8 ++++---- dlls/msvcrt/wcs.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 98d79c4..31314fd 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2491,8 +2491,8 @@ static void test__wcstoi64(void) res = p_wcstoi64(digit, NULL, 10); ok(res == 9, "res != 9\n"); res = p_wcstoi64(stock, &endpos, 10); - todo_wine ok(res == 0, "res != 0\n"); - todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ok(res == 0, "res != 0\n"); + ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); res = p_wcstoi64(tamil, &endpos, 10); ok(res == 0, "res != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); @@ -2506,8 +2506,8 @@ static void test__wcstoi64(void) ures = p_wcstoui64(digit, NULL, 10); ok(ures == 9, "ures != 9\n"); ures = p_wcstoui64(stock, &endpos, 10); - todo_wine ok(ures == 0, "ures != 0\n"); - todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ok(ures == 0, "ures != 0\n"); + ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); ures = p_wcstoui64(tamil, &endpos, 10); ok(ures == 0, "ures != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a0b1cb6..ba53084 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1395,7 +1395,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, } while(*nptr) { - char cur = tolowerW(*nptr); + MSVCRT_wchar_t cur = tolowerW(*nptr); int v; if(isdigitW(cur)) { @@ -1493,10 +1493,10 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, } while(*nptr) { - char cur = tolowerW(*nptr); + MSVCRT_wchar_t cur = tolowerW(*nptr); int v; - if(isdigit(cur)) { + if(isdigitW(cur)) { if(cur >= '0'+base) break; v = *nptr-'0';

1 0

Filip Navara : iphlpapi: Use prefixed WS_ structures to avoid misalignment on OS X builds.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 7ca40003d2101c73e97acb5c1f1643c8ef1674c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca40003d2101c73e97acb5c1… Author: Filip Navara <xnavara(a)volny.cz> Date: Sat Mar 9 12:04:17 2013 +0100 iphlpapi: Use prefixed WS_ structures to avoid misalignment on OS X builds. Thanks to Hans Leidekker for diagnosing the problem. --- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 600bf8c..aeb91c1 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -848,7 +848,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index if (num_v4addrs) { IP_ADAPTER_UNICAST_ADDRESS *ua; - struct sockaddr_in *sa; + struct WS_sockaddr_in *sa; aa->Flags |= IP_ADAPTER_IPV4_ENABLED; ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; for (i = 0; i < num_v4addrs; i++) @@ -860,12 +860,12 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); - sa = (struct sockaddr_in *)ua->Address.lpSockaddr; - sa->sin_family = AF_INET; - sa->sin_addr.s_addr = v4addrs[i]; - sa->sin_port = 0; + sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; + sa->sin_family = WS_AF_INET; + sa->sin_addr.S_un.S_addr = v4addrs[i]; + sa->sin_port = 0; TRACE("IPv4 %d/%d: %s\n", i + 1, num_v4addrs, - debugstr_ipv4(&sa->sin_addr.s_addr, addr_buf)); + debugstr_ipv4(&sa->sin_addr.S_un.S_addr, addr_buf)); ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v4addrs - 1)

1 0

Hans Leidekker : dnsapi: Increase maximum packet size.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 8981bbd464c1b1dc0704c9624c8955168d2e35db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8981bbd464c1b1dc0704c9624… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Mar 9 12:37:59 2013 +0100 dnsapi: Increase maximum packet size. --- dlls/dnsapi/query.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 2116b11..b1d80dd 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -578,13 +578,13 @@ static DNS_STATUS dns_get_serverlist( PIP4_ARRAY addrs, PDWORD len ) return ERROR_SUCCESS; } -static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, - PDNS_RECORDA *result ) +#define DNS_MAX_PACKET_SIZE 4096 +static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, PDNS_RECORDA *result ) { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; unsigned int i, num; - unsigned char answer[NS_PACKETSZ]; + unsigned char answer[DNS_MAX_PACKET_SIZE]; ns_sect sections[] = { ns_s_an, ns_s_ar }; ns_msg msg;

1 0

Jacek Caban : wininet: Skip test_open_url_async on IEs older than 7.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 3157534347d29b2830b3e691764bc5036dcd8663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3157534347d29b2830b3e6917… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 9 17:52:02 2013 +0100 wininet: Skip test_open_url_async on IEs older than 7. --- dlls/wininet/tests/http.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7988de4..c2607dc 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3662,6 +3662,16 @@ static void test_open_url_async(void) ret = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); ok(ret, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + /* + * Some versions of IE6 fail those tests. They pass some notification data as UNICODE string, while + * other versions never do. They also hang of following tests. We disable it for everything older + * than IE7. + */ + if(!pInternetGetSecurityInfoByURLA) { + win_skip("Skipping async open on too old wininet version.\n"); + return; + } + ctx.req = NULL; ctx.event = CreateEvent(NULL, TRUE, FALSE, "Z:_home_hans_jaman-installer.exe_ev1");

1 0

Vincent Povirk : gdiplus: Fix GdipCreateBitmapFromGraphics implementation.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 636e60b6e020a8e37e6dac03481bedcb20f3edca URL: http://source.winehq.org/git/wine.git/?a=commit;h=636e60b6e020a8e37e6dac034… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 9 12:08:27 2013 -0600 gdiplus: Fix GdipCreateBitmapFromGraphics implementation. --- dlls/gdiplus/image.c | 14 +++++----- dlls/gdiplus/tests/graphics.c | 53 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ff27334..98c0bd0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1595,12 +1595,9 @@ GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref, return NotImplemented; } -/* FIXME: this should create a bitmap in the given size with the attributes - * (resolution etc.) of the graphics object */ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, GpGraphics* target, GpBitmap** bitmap) { - static int calls; GpStatus ret; TRACE("(%d, %d, %p, %p)\n", width, height, target, bitmap); @@ -1608,12 +1605,15 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, if(!target || !bitmap) return InvalidParameter; - if(!(calls++)) - FIXME("hacked stub\n"); - - ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat24bppRGB, + ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppPARGB, NULL, bitmap); + if (ret == Ok) + { + GdipGetDpiX(target, &(*bitmap)->image.xres); + GdipGetDpiY(target, &(*bitmap)->image.yres); + } + return ret; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 08b2465..e41751a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4282,6 +4282,58 @@ static void test_alpha_hdc(void) DeleteDC(hdc); } +static void test_bitmapfromgraphics(void) +{ + GpStatus stat; + GpGraphics *graphics = NULL; + HDC hdc = GetDC( hwnd ); + GpBitmap *bitmap = NULL; + PixelFormat format; + REAL imageres, graphicsres; + UINT width, height; + + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, NULL, &bitmap); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, graphics, NULL); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, graphics, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); + expect(Ok, stat); + expect(PixelFormat32bppPARGB, format); + + stat = GdipGetDpiX(graphics, &graphicsres); + expect(Ok, stat); + + stat = GdipGetImageHorizontalResolution((GpImage*)bitmap, &imageres); + expect(Ok, stat); + expectf(graphicsres, imageres); + + stat = GdipGetDpiY(graphics, &graphicsres); + expect(Ok, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)bitmap, &imageres); + expect(Ok, stat); + expectf(graphicsres, imageres); + + stat = GdipGetImageWidth((GpImage*)bitmap, &width); + expect(Ok, stat); + expect(12, width); + + stat = GdipGetImageHeight((GpImage*)bitmap, &height); + expect(Ok, stat); + expect(13, height); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4349,6 +4401,7 @@ START_TEST(graphics) test_get_set_textrenderinghint(); test_getdc_scaled(); test_alpha_hdc(); + test_bitmapfromgraphics(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Andrew Talbot : msvcp60: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 956219b5d9801189fa18be8243dd6277410e5a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956219b5d9801189fa18be824… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 9 21:48:53 2013 +0000 msvcp60: Avoid signed-unsigned integer comparisons. --- dlls/msvcp60/ios.c | 2 +- dlls/msvcp60/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index f68bcde..64b3271 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2456,7 +2456,7 @@ static FILE* _Fiopen_wchar(const wchar_t *name, int mode, int prot) }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); - int mode_idx; + unsigned int mode_idx; FILE *f = NULL; TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 98eb9cf..a54fd28 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -80,7 +80,7 @@ unsigned short __cdecl wctype(const char *property) { "upper", _UPPER }, { "xdigit", _HEX } }; - int i; + unsigned int i; for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) if(!strcmp(property, properties[i].name))

1 0

Andrew Talbot : joy.cpl: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 3e2c44af7dc0c4a55c14aa4b46923dc86cf67d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2c44af7dc0c4a55c14aa4b4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 9 21:48:51 2013 +0000 joy.cpl: Avoid signed-unsigned integer comparisons. --- dlls/joy.cpl/main.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index dec83ff..857cb69 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -233,7 +233,7 @@ static void initialize_disabled_joysticks_list(HWND hwnd) HKEY hkey, appkey; DWORD values = 0; HRESULT hr; - int i; + DWORD i; SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0); @@ -394,6 +394,8 @@ static DWORD WINAPI input_thread(void *param) while (!data->stop) { int i; + unsigned int j; + poll_input(&data->joysticks[data->chosen_joystick], &state); dump_joy_state(&state, data->joysticks[data->chosen_joystick].num_buttons); @@ -412,12 +414,12 @@ static DWORD WINAPI input_thread(void *param) axes_pos[2][1] = state.lRz; /* Set pov values */ - for (i = 0; i < sizeof(pov_val)/sizeof(pov_val[0]); i++) + for (j = 0; i < sizeof(pov_val)/sizeof(pov_val[0]); j++) { - if (state.rgdwPOV[0] == pov_val[i]) + if (state.rgdwPOV[0] == pov_val[j]) { - axes_pos[3][0] = pov_pos[i][0]; - axes_pos[3][1] = pov_pos[i][1]; + axes_pos[3][0] = pov_pos[j][0]; + axes_pos[3][1] = pov_pos[j][1]; } }

1 0