wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Henri Verbeet : d3d9/tests: Use explicit A calls.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: a17abf8d7d7ef82d62a4487e2ef17179cbc09493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17abf8d7d7ef82d62a4487e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 30 10:17:54 2013 +0100 d3d9/tests: Use explicit A calls. --- dlls/d3d9/tests/Makefile.in | 1 - dlls/d3d9/tests/d3d9ex.c | 13 +++--- dlls/d3d9/tests/device.c | 81 ++++++++++++++++++++-------------- dlls/d3d9/tests/stateblock.c | 10 ++-- dlls/d3d9/tests/vertexdeclaration.c | 10 ++-- dlls/d3d9/tests/visual.c | 10 ++-- 6 files changed, 69 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a17abf8d7d7ef82d62a44…

1 0

Henri Verbeet : d3d9/tests: Avoid windowsx.h.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 3528393d642b1c9fb1d589b53de3208d2d87819a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3528393d642b1c9fb1d589b53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 30 10:17:53 2013 +0100 d3d9/tests: Avoid windowsx.h. --- dlls/d3d9/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 37fb8fe..0691429 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -22,10 +22,12 @@ */ #define COBJMACROS -#include <windowsx.h> #include <d3d9.h> #include "wine/test.h" +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) + static INT screen_width; static INT screen_height;

1 0

Henri Verbeet : ddraw: Use GET_MODULE_HANDLE_EX_FLAG_PIN.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: ff3014221eeb9acb608274f307395b7912fa90a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3014221eeb9acb608274f30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 30 10:17:52 2013 +0100 ddraw: Use GET_MODULE_HANDLE_EX_FLAG_PIN. --- dlls/ddraw/main.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 79033fc..e613126 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -872,10 +872,9 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) * exclusive mode, we replace the window proc of the ddraw window. If * an application would unload ddraw from the WM_DESTROY handler for * that window, it would return to unmapped memory and die. Apparently - * this is supposed to work on Windows. We should probably use - * GET_MODULE_HANDLE_EX_FLAG_PIN for this, but that's not currently - * implemented. */ - if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&ddraw_self, &ddraw_self)) + * this is supposed to work on Windows. */ + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN, + (const WCHAR *)&ddraw_self, &ddraw_self)) ERR("Failed to get own module handle.\n"); instance = inst;

1 0

Alistair Leslie-Hughes : mscoree: Rename function to match its use.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 2d899505d7717a8e99d33ee28fcc577c8a7616de URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d899505d7717a8e99d33ee28… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 30 08:14:49 2013 +1100 mscoree: Rename function to match its use. --- dlls/mscoree/metahost.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 7e99bbe..6d87b25 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -110,7 +110,7 @@ void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); -static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); static void mono_shutdown_callback_fn(MonoProfiler *prof); @@ -236,7 +236,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This) mono_config_parse(NULL); - mono_install_assembly_preload_hook(mono_assembly_search_hook_fn, NULL); + mono_install_assembly_preload_hook(mono_assembly_preload_hook_fn, NULL); trace_size = GetEnvironmentVariableA("WINE_MONO_TRACE", trace_setting, sizeof(trace_setting)); @@ -1253,7 +1253,7 @@ HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int return hr; } -static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) { HRESULT hr; MonoAssembly *result=NULL;

1 0

Alistair Leslie-Hughes : mscoree: Display the privatePath when parsing the .config file.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 45109f45df19c1cf7f9390056b64c147348dd93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45109f45df19c1cf7f9390056… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 28 11:24:37 2013 +1100 mscoree: Display the privatePath when parsing the .config file. --- dlls/mscoree/config.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index c5e3cec..5da1102 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -41,8 +41,11 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); enum parse_state { + STATE_ASSEMBLY_BINDING, STATE_ROOT, STATE_CONFIGURATION, + STATE_PROBING, + STATE_RUNTIME, STATE_STARTUP, STATE_UNKNOWN }; @@ -147,6 +150,23 @@ static HRESULT parse_startup(ConfigFileHandler *This, ISAXAttributes *pAttr) return hr; } +static HRESULT parse_probing(ConfigFileHandler *This, ISAXAttributes *pAttr) +{ + static const WCHAR privatePath[] = {'p','r','i','v','a','t','e','P','a','t','h',0}; + static const WCHAR empty[] = {0}; + LPCWSTR value; + int value_size; + HRESULT hr; + + hr = ISAXAttributes_getValueFromName(pAttr, empty, 0, privatePath, lstrlenW(privatePath), &value, &value_size); + if (SUCCEEDED(hr)) + FIXME("privatePath=%s not implemented\n", debugstr_wn(value, value_size)); + hr = S_OK; + + return hr; +} + + static HRESULT parse_supported_runtime(ConfigFileHandler *This, ISAXAttributes *pAttr) { static const WCHAR version[] = {'v','e','r','s','i','o','n',0}; @@ -199,8 +219,12 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, { ConfigFileHandler *This = impl_from_ISAXContentHandler(iface); static const WCHAR configuration[] = {'c','o','n','f','i','g','u','r','a','t','i','o','n',0}; + static const WCHAR assemblyBinding[] = {'a','s','s','e','m','b','l','y','B','i','n','d','i','n','g',0}; + static const WCHAR probing[] = {'p','r','o','b','i','n','g',0}; + static const WCHAR runtime[] = {'r','u','n','t','i','m','e',0}; static const WCHAR startup[] = {'s','t','a','r','t','u','p',0}; static const WCHAR supportedRuntime[] = {'s','u','p','p','o','r','t','e','d','R','u','n','t','i','m','e',0}; + HRESULT hr = S_OK; TRACE("%s %s %s\n", debugstr_wn(pNamespaceUri,nNamespaceUri), @@ -231,6 +255,31 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, This->states[++This->statenum] = STATE_STARTUP; break; } + else if (nLocalName == sizeof(runtime)/sizeof(WCHAR)-1 && + lstrcmpW(pLocalName, runtime) == 0) + { + This->states[++This->statenum] = STATE_RUNTIME; + break; + } + else + goto unknown; + case STATE_RUNTIME: + if (nLocalName == sizeof(assemblyBinding)/sizeof(WCHAR)-1 && + lstrcmpW(pLocalName, assemblyBinding) == 0) + { + This->states[++This->statenum] = STATE_ASSEMBLY_BINDING; + break; + } + else + goto unknown; + case STATE_ASSEMBLY_BINDING: + if (nLocalName == sizeof(probing)/sizeof(WCHAR)-1 && + lstrcmpW(pLocalName, probing) == 0) + { + hr = parse_probing(This, pAttr); + This->states[++This->statenum] = STATE_PROBING; + break; + } else goto unknown; case STATE_STARTUP:

1 0

Vijay Kiran Kamuju : wininet: Implement setting INTERNET_PER_CONN_PROXY_BYPASS.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: ebe121e360c4118c5263c20717a3fc25ebbcd9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe121e360c4118c5263c2071… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Oct 27 22:01:22 2013 +0000 wininet: Implement setting INTERNET_PER_CONN_PROXY_BYPASS. --- dlls/wininet/internet.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 954e891..73fdfe4 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2912,13 +2912,17 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, } break; + case INTERNET_PER_CONN_PROXY_BYPASS: + heap_free(pi.proxyBypass); + pi.proxyBypass = heap_strdupW(option->Value.pszValue); + break; + case INTERNET_PER_CONN_AUTOCONFIG_URL: case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: - case INTERNET_PER_CONN_PROXY_BYPASS: FIXME("Unhandled dwOption %d\n", option->dwOption); break;

1 0

Alexandre Julliard : gdi32: Remove no longer used default driver name.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 3bd1e59cfbf32eefa1493ec1a50d04285670edf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd1e59cfbf32eefa1493ec1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 09:47:22 2013 +0100 gdi32: Remove no longer used default driver name. --- dlls/gdi32/driver.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 99ac146..750ef11 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -59,12 +59,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -#ifdef __APPLE__ -static const char default_driver[] = "mac,x11"; -#else -static const char default_driver[] = "x11"; -#endif - /********************************************************************** * create_driver *

1 0

Alexandre Julliard : explorer: Allow to specify the name of the graphics driver in the /desktop option.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: b23614253029c91cdf1e165bb90edb97ad5783be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23614253029c91cdf1e165bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 09:47:08 2013 +0100 explorer: Allow to specify the name of the graphics driver in the /desktop option. --- programs/explorer/desktop.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 35c3168..c3abe6d 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -638,7 +638,7 @@ static BOOL get_default_desktop_size( const WCHAR *name, unsigned int *width, un return found; } -static HMODULE load_graphics_driver( const GUID *guid ) +static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { static const WCHAR device_keyW[] = { 'S','y','s','t','e','m','\\', @@ -660,15 +660,19 @@ static HMODULE load_graphics_driver( const GUID *guid ) HKEY hkey; char error[80]; - strcpyW( buffer, default_driver ); - - /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ - if (!RegOpenKeyW( HKEY_CURRENT_USER, driversW, &hkey )) + if (!driver) { - DWORD count = sizeof(buffer); - RegQueryValueExW( hkey, graphicsW, 0, NULL, (LPBYTE)buffer, &count ); - RegCloseKey( hkey ); + strcpyW( buffer, default_driver ); + + /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ + if (!RegOpenKeyW( HKEY_CURRENT_USER, driversW, &hkey )) + { + DWORD count = sizeof(buffer); + RegQueryValueExW( hkey, graphicsW, 0, NULL, (LPBYTE)buffer, &count ); + RegCloseKey( hkey ); + } } + else lstrcpynW( buffer, driver, sizeof(buffer)/sizeof(WCHAR) ); name = buffer; while (name) @@ -773,7 +777,7 @@ void manage_desktop( WCHAR *arg ) HWND hwnd, msg_hwnd; HMODULE graphics_driver; unsigned int width, height; - WCHAR *cmdline = NULL; + WCHAR *cmdline = NULL, *driver = NULL; WCHAR *p = arg; const WCHAR *name = NULL; @@ -787,12 +791,16 @@ void manage_desktop( WCHAR *arg ) } /* parse the desktop option */ - /* the option is of the form /desktop=name[,widthxheight] */ + /* the option is of the form /desktop=name[,widthxheight[,driver]] */ if (*arg == '=' || *arg == ',') { arg++; name = arg; - if ((p = strchrW( arg, ',' ))) *p++ = 0; + if ((p = strchrW( arg, ',' ))) + { + *p++ = 0; + if ((driver = strchrW( p, ',' ))) *driver++ = 0; + } if (!p || !parse_size( p, &width, &height )) get_default_desktop_size( name, &width, &height ); } @@ -813,7 +821,7 @@ void manage_desktop( WCHAR *arg ) UuidCreate( &guid ); TRACE( "display guid %s\n", debugstr_guid(&guid) ); - graphics_driver = load_graphics_driver( &guid ); + graphics_driver = load_graphics_driver( driver, &guid ); /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL,

1 0

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 4473ce4db9827ca29eecd635fc10500df7be942d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4473ce4db9827ca29eecd635f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 29 15:57:31 2013 +0100 Assorted spelling fixes. --- dlls/avifil32/avifile.c | 2 +- dlls/comctl32/tests/header.c | 8 ++++---- dlls/msgsm32.acm/msgsm32.c | 2 +- dlls/mshtml/navigate.c | 2 +- dlls/msrle32/msrle32.c | 4 ++-- dlls/ole32/filemoniker.c | 10 +++++----- dlls/shell32/shfldr_unixfs.c | 2 +- dlls/urlmon/tests/uri.c | 2 +- dlls/urlmon/uri.c | 2 +- dlls/winegstreamer/glibthread.c | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 2711ba4..7c14805 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -2096,7 +2096,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) if (This->dwMoviChunkPos == 0) AVIFILE_ComputeMoviStart(This); - /* written one record to much? */ + /* written one record too much? */ if (This->ckLastRecord.dwFlags & MMIO_DIRTY) { This->dwNextFramePos -= 3 * sizeof(DWORD); if (This->nIdxRecords > 0) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index fdde684..4ef4b5d 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1354,7 +1354,7 @@ static LRESULT customdraw_1(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return -1; } @@ -1381,7 +1381,7 @@ static LRESULT customdraw_2(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return 0; } @@ -1411,7 +1411,7 @@ static LRESULT customdraw_3(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return 0; } @@ -1439,7 +1439,7 @@ static LRESULT customdraw_4(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return 0; } diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 8b0885f..5e7bce0 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -510,7 +510,7 @@ static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER return ACMERR_NOTPOSSIBLE; } - /* The packing algorythm writes 32 bytes, then 33 bytes, + /* The packing algorithm writes 32 bytes, then 33 bytes, * and it seems to pad to align to 65 bytes always * adding extra data where necessary */ diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f84af32..3ef255a 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -185,7 +185,7 @@ static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface, nsres = aWriter(&This->nsIInputStream_iface, aClousure, This->buf, 0, aCount, &written); if(NS_FAILED(nsres)) - TRACE("aWritter failed: %08x\n", nsres); + TRACE("aWriter failed: %08x\n", nsres); else if(written != This->buf_size) FIXME("written %d != buf_size %d\n", written, This->buf_size); diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 668701a..882b5d2 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1486,7 +1486,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) computeInternalFrame(pi, lpic->lpbiPrev, lpic->lpPrev); /* swap buffers for current and previous frame */ - /* Don't free and alloc new -- costs to much time and they are of equal size ! */ + /* Don't free and alloc new -- costs too much time and they are of equal size ! */ pTmp = pi->pPrevFrame; pi->pPrevFrame = pi->pCurFrame; pi->pCurFrame = pTmp; @@ -1534,7 +1534,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) } { /* swap buffer for current and previous frame */ - /* Don't free and alloc new -- costs to much time and they are of equal size ! */ + /* Don't free and alloc new -- costs too much time and they are of equal size ! */ LPWORD pTmp = pi->pPrevFrame; pi->pPrevFrame = pi->pCurFrame; diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 8905c55..9c542fc 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -939,7 +939,7 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p IBindCtx *pbind; DWORD mkSys; ULONG nb1,nb2,i,sameIdx; - BOOL machimeNameCase=FALSE; + BOOL machineNameCase = FALSE; if (ppmkPrefix==NULL) return E_POINTER; @@ -997,20 +997,20 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p if (sameIdx > 1 && *stringTable1[0]=='\\' && *stringTable2[1]=='\\'){ - machimeNameCase=TRUE; + machineNameCase = TRUE; for(i=2;i<sameIdx;i++) if( (*stringTable1[i]=='\\') && (i+1 < sameIdx) && (*stringTable1[i+1]=='\\') ){ - machimeNameCase=FALSE; + machineNameCase = FALSE; break; } } - if (machimeNameCase && *stringTable1[sameIdx-1]=='\\') + if (machineNameCase && *stringTable1[sameIdx-1]=='\\') sameIdx--; - if (machimeNameCase && (sameIdx<=3) && (nb1 > 3 || nb2 > 3) ) + if (machineNameCase && (sameIdx<=3) && (nb1 > 3 || nb2 > 3) ) ret = MK_E_NOPREFIX; else { diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 362d4e6..8723546 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -388,7 +388,7 @@ static inline BOOL UNIXFS_is_pidl_of_type(LPCITEMIDLIST pIDL, SHCONTF fFilter) { * * RETURNS * Success, TRUE - * Failure, FALSE - Path not existent, too long, insufficient rights, to many symlinks + * Failure, FALSE - Path not existent, too long, insufficient rights, too many symlinks */ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) { diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index ba31583..80d7741 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4595,7 +4595,7 @@ static const invalid_uri invalid_uri_tests[] = { {"*a*b*c*d://not.valid.com",0,FALSE}, /* Not allowed to have invalid % encoded data. */ {"ftp://google.co%XX/",0,FALSE}, - /* To many h16 components. */ + /* Too many h16 components. */ {"http://[1:2:3:4:5:6:7:8:9]",0,FALSE}, /* Not enough room for IPv4 address. */ {"http://[1:2:3:4:5:6:7:192.0.1.0]",0,FALSE}, diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 724d60f..dbdeaff 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1618,7 +1618,7 @@ static BOOL parse_ipv6address(const WCHAR **ptr, parse_data *data, DWORD flags) /* An IPv6 address can have no more than 8 h16 components. */ if(ip.h16_count >= 8) { *ptr = start; - TRACE("(%p %p %x): Not a IPv6 address, to many h16 components.\n", + TRACE("(%p %p %x): Not a IPv6 address, too many h16 components.\n", ptr, data, flags); return FALSE; } diff --git a/dlls/winegstreamer/glibthread.c b/dlls/winegstreamer/glibthread.c index 25eceb8..0d829a0 100644 --- a/dlls/winegstreamer/glibthread.c +++ b/dlls/winegstreamer/glibthread.c @@ -1,7 +1,7 @@ /* GLIB - Library of useful routines for C programming * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * - * Wine Gstramer integration + * Wine GStreamer integration * Copyright 2010 Aric Stewart, CodeWeavers * * gthread.c: solaris thread system implementation

1 0

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

30 Oct '13

Module: wine Branch: master Commit: cbd65f1c65deb46945d4da5fc2898185533a9683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd65f1c65deb46945d4da5fc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 29 22:23:38 2013 +0100 msxml3/tests: Use BOOL type where appropriate. --- dlls/msxml3/tests/saxreader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index d9c3c4e..f3a6bbd 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -101,7 +101,7 @@ static void free_bstrs(void) alloced_bstrs_count = 0; } -static void test_saxstr(const char *file, unsigned line, BSTR str, const char *expected, int todo, int *failcount) +static void test_saxstr(const char *file, unsigned line, BSTR str, const char *expected, BOOL todo, int *failcount) { int len, lenexp, cmp; WCHAR buf[1024]; @@ -323,7 +323,7 @@ static const char *get_event_name(CH event) } static void compare_attributes(const struct call_entry *actual, const struct call_entry *expected, const char *context, - int todo, const char *file, int line, int *failcount) + BOOL todo, const char *file, int line, int *failcount) { int i, lenexp = 0; @@ -359,7 +359,7 @@ static void compare_attributes(const struct call_entry *actual, const struct cal } static void ok_sequence_(struct call_sequence **seq, int sequence_index, - const struct call_entry *expected, const char *context, int todo, + const struct call_entry *expected, const char *context, BOOL todo, const char *file, int line) { struct call_sequence *call_seq = seq[sequence_index];

1 0

← Newer
1
2
3
4
5
6
7
...
76
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 October 2013