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

Alexandre Julliard : gdi32: Add null driver entry points for the mapping functions.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 3a850fc842337640b4b69634a4c6291d516d1192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a850fc842337640b4b69634a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 16:21:45 2011 +0100 gdi32: Add null driver entry points for the mapping functions. --- dlls/gdi32/driver.c | 34 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 20 +- dlls/gdi32/enhmfdrv/init.c | 16 +- dlls/gdi32/enhmfdrv/mapping.c | 68 +++-- dlls/gdi32/gdi_private.h | 25 ++- dlls/gdi32/mapping.c | 497 +++++++++++++++++----------------- dlls/gdi32/mfdrv/init.c | 16 +- dlls/gdi32/mfdrv/mapping.c | 68 ++--- dlls/gdi32/mfdrv/metafiledrv.h | 20 +- dlls/gdi32/tests/metafile.c | 16 +- 10 files changed, 397 insertions(+), 383 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a850fc842337640b4b69…

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the OpenGL functions.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 6d9ebd05a550c634d61ba698592cd43ee2f7e953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d9ebd05a550c634d61ba6985… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 20:51:06 2011 +0100 gdi32: Add null driver entry points for the OpenGL functions. --- dlls/gdi32/driver.c | 85 ++++++++++++++++++++++++---- dlls/gdi32/opengl.c | 156 +++++++++++++++++++++++++------------------------- 2 files changed, 151 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d9ebd05a550c634d61ba…

1 0

Austin English : oleaut32: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 651adc7fc8c7ec55c1be0b540e8775d75e5cb666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=651adc7fc8c7ec55c1be0b540… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:08:09 2011 -0800 oleaut32: Avoid shadowing a parameter. --- dlls/oleaut32/varformat.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index e21ce96..351529c 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2490,11 +2490,11 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, if (nGrouping == -2) { - WCHAR nGrouping[16]; - nGrouping[2] = '\0'; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, nGrouping, - sizeof(nGrouping)/sizeof(WCHAR)); - numfmt.Grouping = nGrouping[2] == '2' ? 32 : nGrouping[0] - '0'; + WCHAR grouping[16]; + grouping[2] = '\0'; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping, + sizeof(grouping)/sizeof(WCHAR)); + numfmt.Grouping = grouping[2] == '2' ? 32 : grouping[0] - '0'; } else if (nGrouping == -1) numfmt.Grouping = 3; /* 3 = "n,nnn.nn" */

1 0

Austin English : user32: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 38a87ecfeac35b30783668feb5ec35458ed70dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a87ecfeac35b30783668feb… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:08:24 2011 -0800 user32: Avoid shadowing a parameter. --- dlls/user32/desktop.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 6313292..92ee21a 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -228,12 +228,12 @@ BOOL DESKTOP_SetPattern( LPCWSTR pattern ) &pat[0], &pat[1], &pat[2], &pat[3], &pat[4], &pat[5], &pat[6], &pat[7] )) { - WORD pattern[8]; + WORD ptrn[8]; HBITMAP hbitmap; int i; - for (i = 0; i < 8; i++) pattern[i] = pat[i] & 0xffff; - hbitmap = CreateBitmap( 8, 8, 1, 1, pattern ); + for (i = 0; i < 8; i++) ptrn[i] = pat[i] & 0xffff; + hbitmap = CreateBitmap( 8, 8, 1, 1, ptrn ); hbrushPattern = CreatePatternBrush( hbitmap ); DeleteObject( hbitmap ); }

1 0

Austin English : cmd: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 3631ee051ebbf4e54a2f7ab3ce135b127bf82a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3631ee051ebbf4e54a2f7ab3c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:07:20 2011 -0800 cmd: Avoid shadowing a parameter. --- programs/cmd/batch.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 585ea5e..f012eaf 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -399,14 +399,14 @@ void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValu if (memchrW(firstModifier, '$', modifierLen) != NULL) { /* Special Case: Search envar specified in $[envvar] for outputparam Note both $ and : are guaranteed otherwise check above would fail */ - WCHAR *start = strchrW(firstModifier, '$') + 1; + WCHAR *begin = strchrW(firstModifier, '$') + 1; WCHAR *end = strchrW(firstModifier, ':'); WCHAR env[MAX_PATH]; WCHAR fullpath[MAX_PATH]; /* Extract the env var */ - memcpy(env, start, (end-start) * sizeof(WCHAR)); - env[(end-start)] = 0x00; + memcpy(env, begin, (end-begin) * sizeof(WCHAR)); + env[(end-begin)] = 0x00; /* If env var not found, return empty string */ if ((GetEnvironmentVariableW(env, fullpath, MAX_PATH) == 0) ||

1 0

Austin English : setupapi: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: a326c9ee67d5a66b9634ae8e0850a99ba5fec26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a326c9ee67d5a66b9634ae8e0… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:08:16 2011 -0800 setupapi: Avoid shadowing a parameter. --- dlls/setupapi/install.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index a71f274..8f52a58 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -532,7 +532,7 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR * { /* file is an executable, not a dll */ STARTUPINFOW startup; - PROCESS_INFORMATION info; + PROCESS_INFORMATION process_info; WCHAR *cmd_line; BOOL res; static const WCHAR format[] = {'"','%','s','"',' ','%','s',0}; @@ -546,7 +546,7 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR * memset( &startup, 0, sizeof(startup) ); startup.cb = sizeof(startup); TRACE( "executing %s\n", debugstr_w(cmd_line) ); - res = CreateProcessW( NULL, cmd_line, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + res = CreateProcessW( NULL, cmd_line, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &process_info ); HeapFree( GetProcessHeap(), 0, cmd_line ); if (!res) { @@ -554,16 +554,16 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR * status.Win32Error = GetLastError(); goto done; } - CloseHandle( info.hThread ); + CloseHandle( process_info.hThread ); - if (WaitForSingleObject( info.hProcess, timeout*1000 ) == WAIT_TIMEOUT) + if (WaitForSingleObject( process_info.hProcess, timeout*1000 ) == WAIT_TIMEOUT) { /* timed out, kill the process */ - TerminateProcess( info.hProcess, 1 ); + TerminateProcess( process_info.hProcess, 1 ); status.FailureCode = SPREG_TIMEOUT; status.Win32Error = ERROR_TIMEOUT; } - CloseHandle( info.hProcess ); + CloseHandle( process_info.hProcess ); goto done; }

1 0

Austin English : shell32: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: b9cc7987cb594b72092e08791a58f787e25392d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9cc7987cb594b72092e08791… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:08:19 2011 -0800 shell32: Avoid shadowing a parameter. --- dlls/shell32/trash.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 99e7d7e..3352c0a 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -423,10 +423,10 @@ static HRESULT TRASH_GetDetails(const TRASH_BUCKET *bucket, LPCSTR filename, WIN else { /* show only the file name */ - char *filename = strrchr(original_file_name, '/'); - if (filename == NULL) - filename = original_file_name; - MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, data->cFileName, MAX_PATH); + char *file = strrchr(original_file_name, '/'); + if (file == NULL) + file = original_file_name; + MultiByteToWideChar(CP_UNIXCP, 0, file, -1, data->cFileName, MAX_PATH); } deletion_date = XDG_GetStringValue(parsed, trashinfo_group, "DeletionDate", 0);

1 0

Austin English : wininet: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 249f4562d9163e609a1c6c13a10a1244f8794c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=249f4562d9163e609a1c6c13a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:08:52 2011 -0800 wininet: Avoid shadowing a parameter. --- dlls/wininet/internet.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0dbc5af..84d1770 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2334,27 +2334,27 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * } for (i = 0; i < con->dwOptionCount; i++) { - INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i; + INTERNET_PER_CONN_OPTIONW *optionW = con->pOptions + i; INTERNET_PER_CONN_OPTIONA *optionA = conA->pOptions + i; - switch (option->dwOption) { + switch (optionW->dwOption) { case INTERNET_PER_CONN_FLAGS: if(pi.dwProxyEnabled) - option->Value.dwValue = PROXY_TYPE_PROXY; + optionW->Value.dwValue = PROXY_TYPE_PROXY; else - option->Value.dwValue = PROXY_TYPE_DIRECT; + optionW->Value.dwValue = PROXY_TYPE_DIRECT; break; case INTERNET_PER_CONN_PROXY_SERVER: if (unicode) - option->Value.pszValue = heap_strdupW(pi.lpszProxyServer); + optionW->Value.pszValue = heap_strdupW(pi.lpszProxyServer); else optionA->Value.pszValue = heap_strdupWtoA(pi.lpszProxyServer); break; case INTERNET_PER_CONN_PROXY_BYPASS: if (unicode) - option->Value.pszValue = heap_strdupW(pi.lpszProxyBypass); + optionW->Value.pszValue = heap_strdupW(pi.lpszProxyBypass); else optionA->Value.pszValue = heap_strdupWtoA(pi.lpszProxyBypass); break; @@ -2365,12 +2365,12 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: - FIXME("Unhandled dwOption %d\n", option->dwOption); - memset(&option->Value, 0, sizeof(option->Value)); + FIXME("Unhandled dwOption %d\n", optionW->dwOption); + memset(&optionW->Value, 0, sizeof(optionW->Value)); break; default: - FIXME("Unknown dwOption %d\n", option->dwOption); + FIXME("Unknown dwOption %d\n", optionW->dwOption); res = ERROR_INVALID_PARAMETER; break; }

1 0

Austin English : mapi32: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 2520a363bdd915db4028e707c062afe0e1bb9678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2520a363bdd915db4028e707c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:07:32 2011 -0800 mapi32: Avoid shadowing a parameter. --- dlls/mapi32/sendmail.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index e115649..89daf0f 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -298,7 +298,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM if (IMAPISession_PrepareForm(session, NULL, msg, &token) == S_OK) { - ULONG access = 0, status = 0, flags = 0, pc = 0; + ULONG access = 0, status = 0, message_flags = 0, pc = 0; ULONG pT[2] = {1, PR_MSG_STATUS}; /* Retrieve message status, flags, access rights and class */ @@ -313,7 +313,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM if (IMessage_GetProps(msg, (LPSPropTagArray) pT, 0, &pc, &props) == S_OK) { - flags = props->Value.ul; + message_flags = props->Value.ul; MAPIFreeBuffer(props); } @@ -332,7 +332,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM /* Show the message form (edit window) */ ret = IMAPISession_ShowForm(session, 0, msg_store, draft_folder, NULL, - token, NULL, 0, status, flags, access, + token, NULL, 0, status, message_flags, access, props->Value.lpszA); switch (ret)

1 0

Austin English : mshtml: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: a71f3683afe719895dcf71b73d81ef5c5c36e037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71f3683afe719895dcf71b73… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:07:39 2011 -0800 mshtml: Avoid shadowing a parameter. --- dlls/mshtml/dispex.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4706309..327b5db 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -106,16 +106,16 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) } if(!typeinfos[tid]) { - ITypeInfo *typeinfo; + ITypeInfo *ti; - hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if(FAILED(hres)) { ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); return hres; } - if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), typeinfo, NULL)) - ITypeInfo_Release(typeinfo); + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); } *typeinfo = typeinfos[tid];

1 0