October 2013 - Wine-commits

Ken Thomases : winemac: Rename some confusingly-named variables.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 49197e811bb1f1cbf5f0a669db464060a1bcec91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49197e811bb1f1cbf5f0a669d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:00 2013 -0500 winemac: Rename some confusingly-named variables. --- dlls/winemac.drv/clipboard.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 9cfe283..73c4dfa 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -918,25 +918,25 @@ static HANDLE import_utf8_to_text(CFDataRef data) static HANDLE import_utf8_to_unicodetext(CFDataRef data) { const BYTE *src; - unsigned long data_len; + unsigned long src_len; unsigned long new_lines = 0; LPSTR dst; unsigned long i, j; HANDLE unicode_handle = NULL; src = CFDataGetBytePtr(data); - data_len = CFDataGetLength(data); - for (i = 0; i < data_len; i++) + src_len = CFDataGetLength(data); + for (i = 0; i < src_len; i++) { if (src[i] == '\n') new_lines++; } - if ((dst = HeapAlloc(GetProcessHeap(), 0, data_len + new_lines + 1))) + if ((dst = HeapAlloc(GetProcessHeap(), 0, src_len + new_lines + 1))) { UINT count; - for (i = 0, j = 0; i < data_len; i++) + for (i = 0, j = 0; i < src_len; i++) { if (src[i] == '\n') dst[j++] = '\r'; @@ -1000,25 +1000,25 @@ static HANDLE import_utf16_to_text(CFDataRef data) static HANDLE import_utf16_to_unicodetext(CFDataRef data) { const WCHAR *src; - unsigned long data_len; + unsigned long src_len; unsigned long new_lines = 0; LPWSTR dst; unsigned long i, j; HANDLE unicode_handle; src = (const WCHAR *)CFDataGetBytePtr(data); - data_len = CFDataGetLength(data) / sizeof(WCHAR); - for (i = 0; i < data_len; i++) + src_len = CFDataGetLength(data) / sizeof(WCHAR); + for (i = 0; i < src_len; i++) { if (src[i] == '\n') new_lines++; } - if ((unicode_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (data_len + new_lines + 1) * sizeof(WCHAR)))) + if ((unicode_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (src_len + new_lines + 1) * sizeof(WCHAR)))) { dst = GlobalLock(unicode_handle); - for (i = 0, j = 0; i < data_len; i++) + for (i = 0, j = 0; i < src_len; i++) { if (src[i] == '\n') dst[j++] = '\r'; @@ -1351,27 +1351,27 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) { CFMutableDataRef ret; const WCHAR *src; - INT dst_len; + INT src_len; src = GlobalLock(data); if (!src) return NULL; - dst_len = GlobalSize(data) / sizeof(WCHAR); - if (dst_len) dst_len--; /* Leave off null terminator. */ - ret = CFDataCreateMutable(NULL, dst_len * sizeof(WCHAR)); + src_len = GlobalSize(data) / sizeof(WCHAR); + if (src_len) src_len--; /* Leave off null terminator. */ + ret = CFDataCreateMutable(NULL, src_len * sizeof(WCHAR)); if (ret) { LPWSTR dst; int i, j; - CFDataSetLength(ret, dst_len * sizeof(WCHAR)); + CFDataSetLength(ret, src_len * sizeof(WCHAR)); dst = (LPWSTR)CFDataGetMutableBytePtr(ret); /* Remove carriage returns */ - for (i = 0, j = 0; i < dst_len; i++) + for (i = 0, j = 0; i < src_len; i++) { if (src[i] == '\r' && - (i + 1 >= dst_len || src[i + 1] == '\n' || src[i + 1] == '\0')) + (i + 1 >= src_len || src[i + 1] == '\n' || src[i + 1] == '\0')) continue; dst[j++] = src[i]; }

1 0

Ken Thomases : winemac: Fix a leak in macdrv_CountClipboardFormats(). ( Clang).
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 3ececfd2a5dd5d183511425f24cfbd0aeb9e58f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ececfd2a5dd5d183511425f2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:21 2013 -0500 winemac: Fix a leak in macdrv_CountClipboardFormats(). (Clang). --- dlls/winemac.drv/clipboard.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 73c4dfa..ee63c10 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1716,6 +1716,7 @@ INT CDECL macdrv_CountClipboardFormats(void) } } + CFRelease(types); CFRelease(seen_formats); TRACE(" -> %d\n", ret); return ret;

1 0

Ken Thomases : winecoreaudio: Fix a potential leak. (Clang).
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 9a7993045e968ce33fdc51cccef0b3fa5bff1a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7993045e968ce33fdc51ccc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:39 2013 -0500 winecoreaudio: Fix a potential leak. (Clang). --- dlls/winecoreaudio.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 491fc7e..8593e9c 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -810,8 +810,8 @@ void MIDIIn_SendMessage(MIDIMessage msg) { CFMessagePortSendRequest(messagePort, 0, data, 0.0, 0.0, NULL, NULL); CFRelease(data); - CFRelease(messagePort); } + CFRelease(messagePort); } static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFDataRef data, void *info)

1 0

Ken Thomases : libwine: Fix a potential write through a null pointer. ( Clang).
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: e577e4b3e646b0a296ce9bbd73f728cc3f92c20e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e577e4b3e646b0a296ce9bbd7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:47 2013 -0500 libwine: Fix a potential write through a null pointer. (Clang). --- libs/wine/loader.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index f59942d..5c0192d 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -985,10 +985,13 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize { if (pread( fd, magic, 2, 0 ) == 2 && magic[0] == 'M' && magic[1] == 'Z') { - static const char msg[] = "MZ format"; - size_t len = min( errorsize, sizeof(msg) ); - memcpy( error, msg, len ); - error[len - 1] = 0; + if (error && errorsize) + { + static const char msg[] = "MZ format"; + size_t len = min( errorsize, sizeof(msg) ); + memcpy( error, msg, len ); + error[len - 1] = 0; + } close( fd ); return NULL; }

1 0

Alexandre Julliard : winemac: Only register the IME class when needed.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 5435dad997cee166f47ca7681b61b4472841bab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5435dad997cee166f47ca7681… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 11:31:10 2013 +0200 winemac: Only register the IME class when needed. --- dlls/winemac.drv/ime.c | 1 + dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 5fca8fe..53a10f3 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -566,6 +566,7 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable) BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) { TRACE("\n"); + IME_RegisterClasses( macdrv_module ); lpIMEInfo->dwPrivateDataSize = sizeof(IMEPRIVATE); lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 860d29d..24c3f65 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -38,6 +38,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; +extern HMODULE macdrv_module DECLSPEC_HIDDEN; extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 5317c8b..b86c8ae 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -52,6 +52,7 @@ BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; +HMODULE macdrv_module = 0; /************************************************************************** @@ -183,7 +184,7 @@ static void setup_options(void) /*********************************************************************** * process_attach */ -static BOOL process_attach( HINSTANCE instance ) +static BOOL process_attach(void) { SessionAttributeBits attributes; OSStatus status; @@ -205,7 +206,6 @@ static BOOL process_attach( HINSTANCE instance ) set_app_icon(); macdrv_clipboard_process_attach(); - IME_RegisterClasses( instance ); return TRUE; } @@ -301,7 +301,8 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) switch(reason) { case DLL_PROCESS_ATTACH: - ret = process_attach( hinst ); + macdrv_module = hinst; + ret = process_attach(); break; case DLL_THREAD_DETACH: thread_detach();

1 0

Jacek Caban : crypt32: Use empty_store for new CTL contexts.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: eae8f4eda125693ec6467ffaca1be051845b6881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae8f4eda125693ec6467ffac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 10:51:05 2013 +0200 crypt32: Use empty_store for new CTL contexts. --- dlls/crypt32/ctl.c | 2 +- dlls/crypt32/tests/store.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index ef5410a..7a8c21f 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -453,7 +453,7 @@ PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, ctl->pbCtlEncoded = data; ctl->cbCtlEncoded = cbCtlEncoded; ctl->pCtlInfo = ctlInfo; - ctl->hCertStore = NULL; + ctl->hCertStore = &empty_store; ctl->hCryptMsg = msg; ctl->pbCtlContext = content; ctl->cbCtlContext = contentSize; diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index ea85dbf..1fa3ffa 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2531,6 +2531,7 @@ static void testEmptyStore(void) { const CERT_CONTEXT *cert, *cert2, *cert3; const CRL_CONTEXT *crl; + const CTL_CONTEXT *ctl; HCERTSTORE store; BOOL res; @@ -2594,6 +2595,12 @@ static void testEmptyStore(void) CertFreeCRLContext(crl); + ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent)); + ok(ctl != NULL, "CertCreateCTLContext failed\n"); + ok(ctl->hCertStore == cert->hCertStore, "unexpected hCertStore\n"); + + CertFreeCTLContext(ctl); + CertFreeCertificateContext(cert); }

1 0

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

18 Oct '13

Module: wine Branch: master Commit: f4dc64918e6629b877adf41f8153bdb50f4c72ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4dc64918e6629b877adf41f8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 18 11:25:00 2013 +0200 oleaut32: Use BOOL type where appropriate. --- dlls/oleaut32/olefont.c | 6 +++--- dlls/oleaut32/typelib.c | 9 +++++---- dlls/oleaut32/vartype.c | 28 ++++++++++++++-------------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index b5c0cb4..c0925a2 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -353,9 +353,9 @@ HRESULT WINAPI OleCreateFontIndirect( fd.cySize.s.Hi = 0; fd.sWeight = 0; fd.sCharset = 0; - fd.fItalic = 0; - fd.fUnderline = 0; - fd.fStrikethrough = 0; + fd.fItalic = FALSE; + fd.fUnderline = FALSE; + fd.fStrikethrough = FALSE; lpFontDesc = &fd; } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a807eb3..07da928 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2407,7 +2407,7 @@ static void MSFT_GetTdesc(TLBContext *pcx, INT type, TYPEDESC *pTd) TRACE_(typelib)("vt type = %X\n", pTd->vt); } -static int TLB_is_propgetput(INVOKEKIND invkind) +static BOOL TLB_is_propgetput(INVOKEKIND invkind) { return (invkind == INVOKE_PROPERTYGET || invkind == INVOKE_PROPERTYPUT || @@ -5428,7 +5428,8 @@ static HRESULT WINAPI ITypeLibComp_fnBind( BINDPTR * pBindPtr) { ITypeLibImpl *This = impl_from_ITypeComp(iface); - int typemismatch=0, i; + BOOL typemismatch = FALSE; + int i; TRACE("(%p)->(%s, 0x%x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); @@ -5469,7 +5470,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( return S_OK; } else if (hr == TYPE_E_TYPEMISMATCH) - typemismatch = 1; + typemismatch = TRUE; } if ((pTypeInfo->typekind == TKIND_COCLASS) && @@ -5540,7 +5541,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( return S_OK; } else if (hr == TYPE_E_TYPEMISMATCH) - typemismatch = 1; + typemismatch = TRUE; } } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index e1672a1..d492e7d 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4682,10 +4682,10 @@ static unsigned char VARIANT_int_divbychar(DWORD * p, unsigned int n, unsigned c } /* check to test if encoded number is a zero. Returns 1 if zero, 0 for nonzero */ -static int VARIANT_int_iszero(const DWORD * p, unsigned int n) +static BOOL VARIANT_int_iszero(const DWORD * p, unsigned int n) { - for (; n > 0; n--) if (*p++ != 0) return 0; - return 1; + for (; n > 0; n--) if (*p++ != 0) return FALSE; + return TRUE; } /* multiply two DECIMALS, without changing either one, and place result in third @@ -4695,7 +4695,7 @@ static int VARIANT_int_iszero(const DWORD * p, unsigned int n) */ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI * result) { - int r_overflow = 0; + BOOL r_overflow = FALSE; DWORD running[6]; signed int mulstart; @@ -4786,12 +4786,12 @@ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI } /* cast DECIMAL into string. Any scale should be handled properly. en_US locale is - hardcoded (period for decimal separator, dash as negative sign). Returns 0 for - success, nonzero if insufficient space in output buffer. + hardcoded (period for decimal separator, dash as negative sign). Returns TRUE for + success, FALSE if insufficient space in output buffer. */ -static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) +static BOOL VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) { - int overflow = 0; + BOOL overflow = FALSE; DWORD quotient[3]; unsigned char remainder; unsigned int i; @@ -4802,7 +4802,7 @@ static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) *s++ = '-'; n--; } - else overflow = 1; + else overflow = TRUE; } /* prepare initial 0 */ @@ -4810,7 +4810,7 @@ static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) if (n >= 2) { s[0] = '0'; s[1] = '\0'; - } else overflow = 1; + } else overflow = TRUE; } i = 0; @@ -4818,7 +4818,7 @@ static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) while (!overflow && !VARIANT_int_iszero(quotient, sizeof(quotient) / sizeof(DWORD))) { remainder = VARIANT_int_divbychar(quotient, sizeof(quotient) / sizeof(DWORD), 10); if (i + 2 > n) { - overflow = 1; + overflow = TRUE; } else { s[i++] = '0' + remainder; s[i] = '\0'; @@ -4839,7 +4839,7 @@ static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) if (i <= a->scale) { unsigned int numzeroes = a->scale + 1 - i; if (i + 1 + numzeroes >= n) { - overflow = 1; + overflow = TRUE; } else { memmove(s + numzeroes, s, (i + 1) * sizeof(WCHAR)); i += numzeroes; @@ -4853,7 +4853,7 @@ static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) if (a->scale > 0) { unsigned int periodpos = i - a->scale; if (i + 2 >= n) { - overflow = 1; + overflow = TRUE; } else { memmove(s + periodpos + 1, s + periodpos, (i + 1 - periodpos) * sizeof(WCHAR)); s[periodpos] = '.'; i++; @@ -4865,7 +4865,7 @@ static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) } } - return overflow; + return !overflow; } /* shift the bits of a DWORD array to the left. p[0] is assumed LSB */

1 0

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

18 Oct '13

Module: wine Branch: master Commit: 3f91834ffb72a99defe86271f6a2b3ae4c7d621e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f91834ffb72a99defe86271f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 18 11:25:02 2013 +0200 oleaut32/tests: Use BOOL type where appropriate. --- dlls/oleaut32/tests/olefont.c | 38 +++++++++++++++++++------------------- dlls/oleaut32/tests/typelib.c | 2 +- dlls/oleaut32/tests/vartest.c | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 2482554..9761778 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -77,9 +77,9 @@ static void test_ifont_size(LONG lo_size, LONG hi_size, S(fd.cySize).Hi = hi_size; fd.sWeight = 0; fd.sCharset = 0; - fd.fItalic = 0; - fd.fUnderline = 0; - fd.fStrikethrough = 0; + fd.fItalic = FALSE; + fd.fUnderline = FALSE; + fd.fStrikethrough = FALSE; /* Create font, test that it worked. */ hres = pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj); @@ -539,9 +539,9 @@ static void test_IsEqual(void) S(fd.cySize).Hi = 100; fd.sWeight = 0; fd.sCharset = 0; - fd.fItalic = 0; - fd.fUnderline = 0; - fd.fStrikethrough = 0; + fd.fItalic = FALSE; + fd.fUnderline = FALSE; + fd.fStrikethrough = FALSE; /* Create font */ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt); @@ -604,30 +604,30 @@ static void test_IsEqual(void) IFont_Release(ifnt2); /* Test italic setting */ - fd.fItalic = 1; + fd.fItalic = TRUE; pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Italic) Expected S_FALSE but got 0x%08x\n",hres); - fd.fItalic = 0; + fd.fItalic = FALSE; IFont_Release(ifnt2); /* Test underline setting */ - fd.fUnderline = 1; + fd.fUnderline = TRUE; pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Underline) Expected S_FALSE but got 0x%08x\n",hres); - fd.fUnderline = 0; + fd.fUnderline = FALSE; IFont_Release(ifnt2); /* Test strikethrough setting */ - fd.fStrikethrough = 1; + fd.fStrikethrough = TRUE; pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Strikethrough) Expected S_FALSE but got 0x%08x\n",hres); - fd.fStrikethrough = 0; + fd.fStrikethrough = FALSE; IFont_Release(ifnt2); /* Free IFont. */ @@ -652,9 +652,9 @@ static void test_ReleaseHfont(void) S(fd.cySize).Hi = 100; fd.sWeight = 0; fd.sCharset = 0; - fd.fItalic = 0; - fd.fUnderline = 0; - fd.fStrikethrough = 0; + fd.fItalic = FALSE; + fd.fUnderline = FALSE; + fd.fStrikethrough = FALSE; /* Create HFONTs and IFONTs */ pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj1); @@ -722,9 +722,9 @@ static void test_AddRefHfont(void) S(fd.cySize).Hi = 100; fd.sWeight = 0; fd.sCharset = 0; - fd.fItalic = 0; - fd.fUnderline = 0; - fd.fStrikethrough = 0; + fd.fItalic = FALSE; + fd.fUnderline = FALSE; + fd.fStrikethrough = FALSE; /* Create HFONTs and IFONTs */ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt1); @@ -813,7 +813,7 @@ static void test_AddRefHfont(void) IFont_Release(ifnt2); /* Need to make a new IFONT for testing */ - fd.fUnderline = 1; + fd.fUnderline = TRUE; pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt3); IFont_get_hFont(ifnt3,&hfnt3); diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index c356ae0..9f6fa1f 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -76,7 +76,7 @@ static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0 static WCHAR wszGUID[] = {'G','U','I','D',0}; static WCHAR wszguid[] = {'g','u','i','d',0}; -static const int is_win64 = sizeof(void *) > sizeof(int); +static const BOOL is_win64 = sizeof(void *) > sizeof(int); static HRESULT WINAPI invoketest_QueryInterface(IInvokeTest *iface, REFIID riid, void **ret) { diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 1ee3c4f..2840f47 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -381,9 +381,9 @@ static const VARTYPE ExtraFlags[16] = }; /* Determine if a vt is valid for VariantClear() */ -static int IsValidVariantClearVT(VARTYPE vt, VARTYPE extraFlags) +static BOOL IsValidVariantClearVT(VARTYPE vt, VARTYPE extraFlags) { - int ret = 0; + BOOL ret = FALSE; /* Only the following flags/types are valid */ if ((vt <= VT_LPWSTR || vt == VT_RECORD || vt == VT_CLSID) && @@ -392,10 +392,10 @@ static int IsValidVariantClearVT(VARTYPE vt, VARTYPE extraFlags) (!(extraFlags & (VT_BYREF|VT_ARRAY)) || vt > VT_NULL) && (extraFlags == 0 || extraFlags == VT_BYREF || extraFlags == VT_ARRAY || extraFlags == (VT_ARRAY|VT_BYREF))) - ret = 1; /* ok */ + ret = TRUE; /* ok */ if (!has_i8 && (vt == VT_I8 || vt == VT_UI8)) - ret = 0; /* Old versions of oleaut32 */ + ret = FALSE; /* Old versions of oleaut32 */ return ret; } @@ -681,15 +681,15 @@ static void test_VariantCopy(void) } /* Determine if a vt is valid for VariantCopyInd() */ -static int IsValidVariantCopyIndVT(VARTYPE vt, VARTYPE extraFlags) +static BOOL IsValidVariantCopyIndVT(VARTYPE vt, VARTYPE extraFlags) { - int ret = 0; + BOOL ret = FALSE; if ((extraFlags & VT_ARRAY) || (vt > VT_NULL && vt != (VARTYPE)15 && vt < VT_VOID && !(extraFlags & (VT_VECTOR|VT_RESERVED)))) { - ret = 1; /* ok */ + ret = TRUE; /* ok */ } return ret; } @@ -2875,7 +2875,7 @@ static void test_VarFix(void) for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { - HRESULT bFail = TRUE; + BOOL bFail = TRUE; SKIPTESTS(vt); @@ -2990,7 +2990,7 @@ static void test_VarInt(void) for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { - HRESULT bFail = TRUE; + BOOL bFail = TRUE; SKIPTESTS(vt); @@ -3111,7 +3111,7 @@ static void test_VarNeg(void) for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { - HRESULT bFail = TRUE; + BOOL bFail = TRUE; SKIPTESTS(vt);

1 0

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

18 Oct '13

Module: wine Branch: master Commit: 497f088715f00eeb5076afe8f035886a843361da URL: http://source.winehq.org/git/wine.git/?a=commit;h=497f088715f00eeb5076afe8f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 18 12:35:08 2013 +0200 d3dxof: Use BOOL type where appropriate. --- dlls/d3dxof/parsing.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index f7f67c5..49ff964 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -542,7 +542,7 @@ static BOOL is_float(parse_buffer* buf) DWORD pos = 0; char c; float decimal; - BOOL dot = 0; + BOOL dot = FALSE; while (pos < buf->rem_bytes && !is_separator(c = *(buf->buffer+pos))) { @@ -899,10 +899,10 @@ static inline BOOL is_primitive_type(WORD token) case TOKEN_LPSTR: case TOKEN_UNICODE: case TOKEN_CSTRING: - ret = 1; + ret = TRUE; break; default: - ret = 0; + ret = FALSE; break; } return ret; @@ -948,14 +948,14 @@ static BOOL parse_template_members_list(parse_buffer * buf) while (1) { - BOOL array = 0; + BOOL array = FALSE; int nb_dims = 0; cur_member = &buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].members[idx_member]; if (check_TOKEN(buf) == TOKEN_ARRAY) { get_TOKEN(buf); - array = 1; + array = TRUE; } if (check_TOKEN(buf) == TOKEN_NAME)

1 0

Alexandre Julliard : explorer: Make sure the graphics driver module is always set.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: 040bd407c722e3c073c7cac4df9c1a7d89a64b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=040bd407c722e3c073c7cac4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 18 11:38:42 2013 +0200 explorer: Make sure the graphics driver module is always set. --- programs/explorer/desktop.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 694f3f6..4c38edb 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -40,7 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define DESKTOP_CLASS_ATOM ((LPCWSTR)MAKEINTATOM(32769)) #define DESKTOP_ALL_ACCESS 0x01ff -static HMODULE graphics_driver; static BOOL using_root; struct launcher @@ -549,16 +548,16 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR } /* create the desktop and the associated driver window, and make it the current desktop */ -static BOOL create_desktop( const WCHAR *name, unsigned int width, unsigned int height ) +static BOOL create_desktop( HMODULE driver, const WCHAR *name, unsigned int width, unsigned int height ) { static const WCHAR rootW[] = {'r','o','o','t',0}; BOOL ret = FALSE; BOOL (CDECL *create_desktop_func)(unsigned int, unsigned int); /* magic: desktop "root" means use the root window */ - if (graphics_driver && strcmpiW( name, rootW )) + if (driver && strcmpiW( name, rootW )) { - create_desktop_func = (void *)GetProcAddress( graphics_driver, "wine_create_desktop" ); + create_desktop_func = (void *)GetProcAddress( driver, "wine_create_desktop" ); if (create_desktop_func) ret = create_desktop_func( width, height ); } return ret; @@ -749,16 +748,14 @@ void manage_desktop( WCHAR *arg ) if (hwnd == GetDesktopWindow()) { - HMODULE shell32; + HMODULE shell32, graphics_driver; void (WINAPI *pShellDDEInit)( BOOL ); - if (desktop) - { - hdc = GetDC( hwnd ); - graphics_driver = __wine_get_driver_module( hdc ); - using_root = !create_desktop( name, width, height ); - ReleaseDC( hwnd, hdc ); - } + hdc = GetDC( hwnd ); + graphics_driver = __wine_get_driver_module( hdc ); + using_root = !desktop || !create_desktop( graphics_driver, name, width, height ); + ReleaseDC( hwnd, hdc ); + SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name );

1 0