October 2013 - Wine-commits

Henri Verbeet : d3dcompiler: Get rid of the BWRITERVS_RASTOUT_OFFSETS typedef.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: f67af28261e5680a755b5b930b209f94d74b040e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f67af28261e5680a755b5b930… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 2 09:55:27 2013 +0200 d3dcompiler: Get rid of the BWRITERVS_RASTOUT_OFFSETS typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 284bf8f..5767e8b 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -481,12 +481,12 @@ enum bwritershader_param_register_type BWRITERSPR_PREDICATE }; -typedef enum _BWRITERVS_RASTOUT_OFFSETS +enum bwritervs_rastout_offsets { BWRITERSRO_POSITION, BWRITERSRO_FOG, BWRITERSRO_POINT_SIZE -} BWRITERVS_RASTOUT_OFFSETS; +}; #define BWRITERSP_WRITEMASK_0 0x1 /* .x r */ #define BWRITERSP_WRITEMASK_1 0x2 /* .y g */

1 0

Henri Verbeet : d3dcompiler: Get rid of the BWRITERSHADER_PARAM_DSTMOD_TYPE typedef.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 48a6375dfc545aa5cb5c418441e5113a12369eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a6375dfc545aa5cb5c41844… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 2 09:55:28 2013 +0200 d3dcompiler: Get rid of the BWRITERSHADER_PARAM_DSTMOD_TYPE typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5767e8b..0d40664 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -494,12 +494,13 @@ enum bwritervs_rastout_offsets #define BWRITERSP_WRITEMASK_3 0x8 /* .w a */ #define BWRITERSP_WRITEMASK_ALL 0xf /* all */ -typedef enum _BWRITERSHADER_PARAM_DSTMOD_TYPE { +enum bwritershader_param_dstmod_type +{ BWRITERSPDM_NONE = 0, BWRITERSPDM_SATURATE = 1, BWRITERSPDM_PARTIALPRECISION = 2, BWRITERSPDM_MSAMPCENTROID = 4, -} BWRITERSHADER_PARAM_DSTMOD_TYPE; +}; typedef enum _BWRITERSAMPLER_TEXTURE_TYPE { BWRITERSTT_UNKNOWN = 0,

1 0

Frédéric Delanoy : propsys: Use BOOL type where appropriate.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 0ab0384047ecde32614110bcb909c1f07ba51fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab0384047ecde32614110bcb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 1 23:33:51 2013 +0200 propsys: Use BOOL type where appropriate. --- dlls/propsys/propsys_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index ce9131b..8d05ad0 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -315,7 +315,7 @@ static BOOL string_to_guid(LPCWSTR s, LPGUID id) HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) { - int has_minus = 0, has_comma = 0; + BOOL has_minus = FALSE, has_comma = FALSE; TRACE("(%s, %p)\n", debugstr_w(pszString), pkey); @@ -341,7 +341,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) if (has_comma) return S_OK; else - has_comma = 1; + has_comma = TRUE; } pszString++; } @@ -357,7 +357,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) { if (*pszString == '-') { - has_minus = 1; + has_minus = TRUE; pszString++; } } @@ -372,7 +372,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) if (*pszString == '-') { - has_minus = 1; + has_minus = TRUE; pszString++; }

1 0

Frédéric Delanoy : wldap32: Use BOOL type where appropriate.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 8610acde5cac236d9612b912ee24e60249770008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8610acde5cac236d9612b912e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 1 23:33:52 2013 +0200 wldap32: Use BOOL type where appropriate. --- dlls/wldap32/init.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index b5aed58..2c3ff7c 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -113,13 +113,12 @@ oom: } /* Determine if a URL starts with a known LDAP scheme */ -static int has_ldap_scheme( char *url ) +static BOOL has_ldap_scheme( char *url ) { - if (!strncasecmp( url, "ldap://", 7 ) || - !strncasecmp( url, "ldaps://", 8 ) || - !strncasecmp( url, "ldapi://", 8 ) || - !strncasecmp( url, "cldap://", 8 )) return 1; - return 0; + return !strncasecmp( url, "ldap://", 7 ) || + !strncasecmp( url, "ldaps://", 8 ) || + !strncasecmp( url, "ldapi://", 8 ) || + !strncasecmp( url, "cldap://", 8 ); } /* Flatten an array of hostnames into a space separated string of URLs.

1 0

Frédéric Delanoy : winex11.drv: Use BOOL type where appropriate.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: ff7fc1fd45e2a05f9ac3203c246f240888da3706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7fc1fd45e2a05f9ac3203c2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 1 23:33:53 2013 +0200 winex11.drv: Use BOOL type where appropriate. --- dlls/winex11.drv/mouse.c | 6 ++++-- dlls/winex11.drv/window.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 168914f..b33827b 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -623,7 +623,8 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA { XcursorImage *image, *ret = NULL; DWORD delay_jiffies, num_steps; - int x, y, i, has_alpha = FALSE; + int x, y, i; + BOOL has_alpha = FALSE; XcursorPixel *ptr; image = pXcursorImageCreate( width, height ); @@ -1137,7 +1138,8 @@ static Cursor create_xlib_color_cursor( HDC hdc, const ICONINFOEXW *icon, int wi struct gdi_image_bits bits; unsigned int *color_bits = NULL, *ptr; unsigned char *mask_bits = NULL, *xor_bits = NULL; - int i, x, y, has_alpha = 0; + int i, x, y; + BOOL has_alpha = FALSE; int rfg, gfg, bfg, rbg, gbg, bbg, fgBits, bgBits; unsigned int width_bytes = (width + 31) / 32 * 4; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 741a303..d9265e3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -472,7 +472,8 @@ static unsigned long *get_bitmap_argb( HDC hdc, HBITMAP color, HBITMAP mask, uns BITMAP bm; unsigned int *ptr, *bits = NULL; unsigned char *mask_bits = NULL; - int i, j, has_alpha = 0; + int i, j; + BOOL has_alpha = FALSE; if (!GetObjectW( color, sizeof(bm), &bm )) return NULL; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

1 0

Frédéric Delanoy : taskkill: Use BOOL type where appropriate.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 39a9604e25dadff87d3e1df1d7581e1028aea13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a9604e25dadff87d3e1df1d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 1 23:33:54 2013 +0200 taskkill: Use BOOL type where appropriate. --- programs/taskkill/taskkill.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 53b56ff..18edec3 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskkill); -static int force_termination; +static BOOL force_termination = FALSE; static WCHAR **task_list; static unsigned int task_count; @@ -456,7 +456,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) if (argc > 1) { int i; - BOOL has_im = 0, has_pid = 0; + BOOL has_im = FALSE, has_pid = FALSE; /* Only the lone help option is recognized. */ if (argc == 2 && !strcmpW(slashHelp, argv[1])) @@ -472,7 +472,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) if (!strcmpiW(slashTerminateChildren, argv[i])) WINE_FIXME("/T not supported\n"); if (!strcmpiW(slashForceTerminate, argv[i])) - force_termination = 1; + force_termination = TRUE; /* Options /IM and /PID appear to behave identically, except for * the fact that they cannot be specified at the same time. */ else if ((got_im = !strcmpiW(slashImage, argv[i])) || @@ -485,8 +485,8 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) return FALSE; } - if (got_im) has_im = 1; - if (got_pid) has_pid = 1; + if (got_im) has_im = TRUE; + if (got_pid) has_pid = TRUE; if (has_im && has_pid) {

1 0

Frédéric Delanoy : oleaut32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: dba4e004edfcdc783c943593474cb4144f7c3f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba4e004edfcdc783c9435934… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 2 07:28:35 2013 +0200 oleaut32/tests: Use BOOL type where appropriate. --- dlls/oleaut32/tests/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 7f92051..4068f4a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1258,7 +1258,7 @@ static void test_inheritance(void) CHAR pathA[MAX_PATH]; static const WCHAR tl_path[] = {'.','\\','m','i','d','l','_','t','m','a','r','s','h','a','l','.','t','l','b',0}; - BOOL use_midl_tlb = 0; + BOOL use_midl_tlb = FALSE; GetModuleFileNameA(NULL, pathA, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH);

1 0

Francois Gouget : cmd: Mention that the % must be doubled for FOR variables in batch files.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: b151052be4f783b1475face85a42ff96fe3f1816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b151052be4f783b1475face85… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 1 17:14:39 2013 +0200 cmd: Mention that the % must be doubled for FOR variables in batch files. Also standardize on the 'Usage:' prefix for usage messages. --- po/ar.po | 169 ++++++++++++++++++++++++++------------------------ po/bg.po | 164 ++++++++++++++++++++++++------------------------ po/ca.po | 169 ++++++++++++++++++++++++++------------------------ po/cs.po | 169 ++++++++++++++++++++++++++------------------------ po/da.po | 169 ++++++++++++++++++++++++++------------------------ po/de.po | 169 ++++++++++++++++++++++++++------------------------ po/el.po | 164 ++++++++++++++++++++++++------------------------ po/en.po | 168 +++++++++++++++++++++++++------------------------ po/en_US.po | 168 +++++++++++++++++++++++++------------------------ po/eo.po | 164 ++++++++++++++++++++++++------------------------ po/es.po | 169 ++++++++++++++++++++++++++------------------------ po/fa.po | 164 ++++++++++++++++++++++++------------------------ po/fi.po | 169 ++++++++++++++++++++++++++------------------------ po/fr.po | 169 ++++++++++++++++++++++++++------------------------ po/he.po | 169 ++++++++++++++++++++++++++------------------------ po/hi.po | 164 ++++++++++++++++++++++++------------------------ po/hr.po | 164 ++++++++++++++++++++++++------------------------ po/hu.po | 169 ++++++++++++++++++++++++++------------------------ po/it.po | 169 ++++++++++++++++++++++++++------------------------ po/ja.po | 169 ++++++++++++++++++++++++++------------------------ po/ko.po | 169 ++++++++++++++++++++++++++------------------------ po/lt.po | 169 ++++++++++++++++++++++++++------------------------ po/ml.po | 164 ++++++++++++++++++++++++------------------------ po/nb_NO.po | 169 ++++++++++++++++++++++++++------------------------ po/nl.po | 169 ++++++++++++++++++++++++++------------------------ po/or.po | 164 ++++++++++++++++++++++++------------------------ po/pa.po | 164 ++++++++++++++++++++++++------------------------ po/pl.po | 169 ++++++++++++++++++++++++++------------------------ po/pt_BR.po | 169 ++++++++++++++++++++++++++------------------------ po/pt_PT.po | 169 ++++++++++++++++++++++++++------------------------ po/rm.po | 164 ++++++++++++++++++++++++------------------------ po/ro.po | 169 ++++++++++++++++++++++++++------------------------ po/ru.po | 169 ++++++++++++++++++++++++++------------------------ po/sk.po | 164 ++++++++++++++++++++++++------------------------ po/sl.po | 169 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 164 ++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 164 ++++++++++++++++++++++++------------------------ po/sv.po | 169 ++++++++++++++++++++++++++------------------------ po/te.po | 164 ++++++++++++++++++++++++------------------------ po/th.po | 164 ++++++++++++++++++++++++------------------------ po/tr.po | 169 ++++++++++++++++++++++++++------------------------ po/uk.po | 169 ++++++++++++++++++++++++++------------------------ po/wa.po | 164 ++++++++++++++++++++++++------------------------ po/wine.pot | 164 ++++++++++++++++++++++++------------------------ po/zh_CN.po | 164 ++++++++++++++++++++++++------------------------ po/zh_TW.po | 169 ++++++++++++++++++++++++++------------------------ programs/cmd/cmd.rc | 4 +- 47 files changed, 3957 insertions(+), 3729 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b151052be4f783b1475fa…

1 0

Francois Gouget : cmd: Standardize the references to directories in the builtin command usage messages .
by Alexandre Julliard 01 Oct '13

01 Oct '13

1 0

Akihiro Sagawa : gdi32/tests: Fix copy&paste issues related to gmBlackBoxY.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 24e0e4d1509d7370649e44532feaa08ab3ae3fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e0e4d1509d7370649e44532… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 1 22:03:14 2013 +0900 gdi32/tests: Fix copy&paste issues related to gmBlackBoxY. --- dlls/gdi32/tests/font.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9f8d970..a6f439b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4122,7 +4122,7 @@ static void test_GetGlyphOutline(void) ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); todo_wine { ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } } @@ -4137,7 +4137,7 @@ static void test_GetGlyphOutline(void) ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); todo_wine { ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } } @@ -4152,7 +4152,7 @@ static void test_GetGlyphOutline(void) ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); todo_wine { ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } } @@ -4165,7 +4165,7 @@ static void test_GetGlyphOutline(void) ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); todo_wine { ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } } else

1 0