Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[akhaldi] 72570: [CRT] Sync undname.c with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: akhaldi Date: Sun Sep 4 09:04:00 2016 New Revision: 72570 URL: http://svn.reactos.org/svn/reactos?rev=72570&view=rev Log: [CRT] Sync undname.c with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/crt/wine/undname.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 4 09:04:00 2016 @@ -299,7 +299,7 @@ reactos/sdk/lib/crt/string/wcs.c # Synced at 20080611 reactos/sdk/lib/crt/string/wctype.c # Synced at WineStaging-1.9.16 reactos/sdk/lib/crt/wine/heap.c # Synced at 20080529 - reactos/sdk/lib/crt/wine/undname.c # Synced to WineStaging-1.7.55 + reactos/sdk/lib/crt/wine/undname.c # Synced to WineStaging-1.9.16 reactos/sdk/lib/crt/process/thread.c # Synced to WineStaging-1.7.55 User32 - Modified: trunk/reactos/sdk/lib/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/wine/undname.c… ============================================================================== --- trunk/reactos/sdk/lib/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/wine/undname.c [iso-8859-1] Sun Sep 4 09:04:00 2016 @@ -184,7 +184,7 @@ a->alloc *= 2; a->elts = new; } - if (len == -1) len = (int)strlen(ptr); + if (len == -1) len = strlen(ptr); a->elts[a->num] = und_alloc(sym, len + 1); assert(a->elts[a->num]); memcpy(a->elts[a->num], ptr, len); @@ -197,10 +197,10 @@ for (i = a->max - 1; i >= 0; i--) { c = '>'; - if ((unsigned)i < a->start) c = '-'; - else if ((unsigned)i >= a->num) c = '}'; + if (i < a->start) c = '-'; + else if (i >= a->num) c = '}'; /* This check is as useless as the unused-but-set gcc warning that we want to silence here */ - if (c != 0) TRACE("%p\t%d%c %s\n", a, i, c, a->elts[i]); + if (c != 0) TRACE("%p\t%d%c %s\n", a, i, c, debugstr_a(a->elts[i])); } } @@ -222,7 +222,7 @@ return NULL; } TRACE("Returning %p[%d] => %s\n", - cref, idx, cref->elts[cref->start + idx]); + cref, idx, debugstr_a(cref->elts[cref->start + idx])); return cref->elts[cref->start + idx]; } @@ -246,7 +246,7 @@ { switch (format[++i]) { - case 's': t = va_arg(args, char*); if (t) len += (int)strlen(t); break; + case 's': t = va_arg(args, char*); if (t) len += strlen(t); break; case 'c': (void)va_arg(args, int); len++; break; default: i--; /* fall through */ case '%': len++; break; @@ -267,7 +267,7 @@ t = va_arg(args, char*); if (t) { - sz = (int)strlen(t); + sz = strlen(t); memcpy(p, t, sz); p += sz; } @@ -518,12 +518,12 @@ (*sym->current >= 'a' && *sym->current <= 'z') || (*sym->current >= '0' && *sym->current <= '9') || *sym->current == '_' || *sym->current == '$')) { - TRACE("Failed at '%c' in %s\n", *sym->current, ptr); + TRACE("Failed at '%c' in %s\n", *sym->current, debugstr_a(ptr)); return NULL; } } while (*++sym->current != '@'); sym->current++; - if (!str_array_push(sym, ptr, (int)(sym->current - 1 - ptr), &sym->names)) + if (!str_array_push(sym, ptr, sym->current - 1 - ptr, &sym->names)) return NULL; return str_array_get_ref(&sym->names, sym->names.num - sym->names.start - 1); @@ -641,15 +641,15 @@ char* ret; struct array *a = &sym->stack; - for (len = 0, i = start; i < (int)a->num; i++) + for (len = 0, i = start; i < a->num; i++) { assert(a->elts[i]); - len += 2 + (int)strlen(a->elts[i]); + len += 2 + strlen(a->elts[i]); } if (!(ret = und_alloc(sym, len - 1))) return NULL; for (len = 0, i = a->num - 1; i >= start; i--) { - sz = (int)strlen(a->elts[i]); + sz = strlen(a->elts[i]); memcpy(ret + len, a->elts[i], sz); len += sz; if (i > start) @@ -855,7 +855,7 @@ if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P', in_args)) goto done; break; case 'P': /* Pointer */ - if (isdigit((unsigned char)*sym->current)) + if (isdigit(*sym->current)) { /* FIXME: * P6 = Function pointer @@ -1572,7 +1572,7 @@ else ret = FALSE; done: if (ret) assert(sym->result); - else WARN("Failed at %s\n", sym->current); + else WARN("Failed at %s\n", debugstr_a(sym->current)); return ret; } @@ -1603,7 +1603,7 @@ const char* result; TRACE("(%p,%s,%d,%p,%p,%p,%x)\n", - buffer, mangled, buflen, memget, memfree, unknown, flags); + buffer, debugstr_a(mangled), buflen, memget, memfree, unknown, flags); /* The flags details is not documented by MS. However, it looks exactly * like the UNDNAME_ manifest constants from imagehlp.h and dbghelp.h

1 0

[cwittich] 72569: [USER32] Fix use-after-free. wine patch by Thomas Faller
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 08:57:52 2016 New Revision: 72569 URL: http://svn.reactos.org/svn/reactos?rev=72569&view=rev Log: [USER32] Fix use-after-free. wine patch by Thomas Faller Modified: trunk/reactos/win32ss/user/user32/misc/ddeclient.c Modified: trunk/reactos/win32ss/user/user32/misc/ddeclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/ddeclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/ddeclient.c [iso-8859-1] Sun Sep 4 08:57:52 2016 @@ -769,7 +769,7 @@ GlobalDeleteAtom(uiHi); if (ack) *ack = uiLo; - GlobalFree(pXAct->hMem); + pXAct->hMem = GlobalFree(pXAct->hMem); pXAct->hDdeData = (HDDEDATA)TRUE; return TRUE;

1 0

[akhaldi] 72568: [SHELL32] Partially sync shlmenu.c with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: akhaldi Date: Sun Sep 4 08:57:08 2016 New Revision: 72568 URL: http://svn.reactos.org/svn/reactos?rev=72568&view=rev Log: [SHELL32] Partially sync shlmenu.c with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/shell32/wine/shlmenu.c Modified: trunk/reactos/dll/win32/shell32/wine/shlmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/shl… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shlmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shlmenu.c [iso-8859-1] Sun Sep 4 08:57:08 2016 @@ -608,7 +608,7 @@ clrPrevBkgnd = SetBkColor(lpdis->hDC, GetSysColor (COLOR_MENU)); } - CopyRect(&TextRect, &(lpdis->rcItem)); + TextRect = lpdis->rcItem; /* add the menubitmap */ menuinfo = FM_GetMenuInfo(pMyItem->hMenu); @@ -628,7 +628,7 @@ Shell_GetImageLists(0, &hImageList); ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL); - TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom); + TRACE("-- %s\n", wine_dbgstr_rect(&TextRect)); SetTextColor(lpdis->hDC, clrPrevText); SetBkColor(lpdis->hDC, clrPrevBkgnd); @@ -789,8 +789,8 @@ FIXME("%p 0x%08x\n", hMenu, uPos); if (GetMenuItemRect(0, hMenu, uPos, &rect)) - { FIXME("0x%04x 0x%04x 0x%04x 0x%04x\n", - rect.right, rect.left, rect.top, rect.bottom); + { + FIXME("%s\n", wine_dbgstr_rect(&rect)); return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom); } return 0x00100010; /*FIXME*/

1 0

[cwittich] 72567: [SDK] sync undname.c to wine 1.9.16
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 08:54:06 2016 New Revision: 72567 URL: http://svn.reactos.org/svn/reactos?rev=72567&view=rev Log: [SDK] sync undname.c to wine 1.9.16 Modified: trunk/reactos/sdk/lib/crt/wine/undname.c Modified: trunk/reactos/sdk/lib/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/wine/undname.c… ============================================================================== --- trunk/reactos/sdk/lib/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/wine/undname.c [iso-8859-1] Sun Sep 4 08:54:06 2016 @@ -857,14 +857,55 @@ case 'P': /* Pointer */ if (isdigit((unsigned char)*sym->current)) { - /* FIXME: P6 = Function pointer, others who knows.. */ - if (*sym->current++ == '6') + /* FIXME: + * P6 = Function pointer + * P8 = Member function pointer + * others who knows.. */ + if (*sym->current == '8') { char* args = NULL; const char* call_conv; const char* exported; struct datatype_t sub_ct; unsigned mark = sym->stack.num; + const char* class; + const char* modifier; + const char* ptr_modif; + + sym->current++; + + if (!(class = get_class_name(sym))) + goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) + goto done; + if (modifier) + modifier = str_printf(sym, "%s %s", modifier, ptr_modif); + else if(ptr_modif[0]) + modifier = str_printf(sym, " %s", ptr_modif); + if (!get_calling_convention(*sym->current++, + &call_conv, &exported, + sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE)) + goto done; + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) + goto done; + + args = get_args(sym, pmt_ref, TRUE, '(', ')'); + if (!args) goto done; + sym->stack.num = mark; + + ct->left = str_printf(sym, "%s%s (%s %s::*", + sub_ct.left, sub_ct.right, call_conv, class); + ct->right = str_printf(sym, ")%s%s", args, modifier); + } + else if (*sym->current == '6') + { + char* args = NULL; + const char* call_conv; + const char* exported; + struct datatype_t sub_ct; + unsigned mark = sym->stack.num; + + sym->current++; if (!get_calling_convention(*sym->current++, &call_conv, &exported, @@ -902,6 +943,7 @@ case '5': case '6': case '7': case '8': case '9': /* Referring back to previously parsed type */ /* left and right are pushed as two separate strings */ + if (!pmt_ref) goto done; ct->left = str_array_get_ref(pmt_ref, (dt - '0') * 2); ct->right = str_array_get_ref(pmt_ref, (dt - '0') * 2 + 1); if (!ct->left) goto done; @@ -948,7 +990,37 @@ } break; case '$': - if (*sym->current == 'C') + if (*sym->current == 'B') + { + unsigned mark = sym->stack.num; + struct datatype_t sub_ct; + const char* arr = NULL; + sym->current++; + + /* multidimensional arrays */ + if (*sym->current == 'Y') + { + const char* n1; + int num; + + sym->current++; + if (!(n1 = get_number(sym))) goto done; + num = atoi(n1); + + while (num--) + arr = str_printf(sym, "%s[%s]", arr, get_number(sym)); + } + + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) goto done; + + if (arr) + ct->left = str_printf(sym, "%s %s", sub_ct.left, arr); + else + ct->left = sub_ct.left; + ct->right = sub_ct.right; + sym->stack.num = mark; + } + else if (*sym->current == 'C') { const char *ptr, *ptr_modif; @@ -1377,6 +1449,8 @@ sym->current++; str_array_init(&pmt); demangle_datatype(sym, &ct, &pmt, FALSE); + if (!demangle_datatype(sym, &ct, NULL, FALSE)) + goto done; function_name = str_printf(sym, "%s%s `RTTI Type Descriptor'", ct.left, ct.right); sym->current--;

1 0

[cwittich] 72566: [SHELL32] some minor wine syncs
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 08:44:20 2016 New Revision: 72566 URL: http://svn.reactos.org/svn/reactos?rev=72566&view=rev Log: [SHELL32] some minor wine syncs Modified: trunk/reactos/dll/win32/shell32/wine/brsfolder.c trunk/reactos/dll/win32/shell32/wine/shellord.c Modified: trunk/reactos/dll/win32/shell32/wine/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/brs… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] Sun Sep 4 08:44:20 2016 @@ -782,10 +782,11 @@ if(FAILED(hr)) return hr; - hr = SHGetPathFromIDListW(info->pidlRet, name); - if(FAILED(hr)) + if(!SHGetPathFromIDListW(info->pidlRet, name)) { + hr = E_FAIL; goto cleanup; - + } + len = strlenW(name); if(len<MAX_PATH) name[len++] = '\\'; Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] Sun Sep 4 08:44:20 2016 @@ -900,7 +900,7 @@ /* buffer size looks good */ ptr += 12; /* get to string */ len = bufused - (ptr-buffer); /* get length of buf remaining */ - if ((lstrlenA(ptr) > 0) && (lstrlenA(ptr) <= len-1)) { + if (ptr[0] && (lstrlenA(ptr) <= len-1)) { /* appears to be good string */ lstrcpyA(old_lnk_name, link_dir); PathAppendA(old_lnk_name, ptr);

1 0

[cwittich] 72565: [SETUPAPI] Remove dead code. wine patch by André Hentschel
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 08:17:41 2016 New Revision: 72565 URL: http://svn.reactos.org/svn/reactos?rev=72565&view=rev Log: [SETUPAPI] Remove dead code. wine patch by André Hentschel Modified: trunk/reactos/dll/win32/setupapi/queue.c Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] Sun Sep 4 08:17:41 2016 @@ -136,11 +136,9 @@ if (buffer[-1] != '\\') *buffer++ = '\\'; if (src3) while (*src3 == '\\') src3++; } + if (src3) - { strcpyW( buffer, src3 ); - buffer += strlenW(buffer ); - } }

1 0

[cwittich] 72564: [ADVAPI32] Use proper enum member to initialize SECURITY_IMPERSONATION_LEVEL variable wine patch by Nikolay Sivov
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 08:11:52 2016 New Revision: 72564 URL: http://svn.reactos.org/svn/reactos?rev=72564&view=rev Log: [ADVAPI32] Use proper enum member to initialize SECURITY_IMPERSONATION_LEVEL variable wine patch by Nikolay Sivov Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Sep 4 08:11:52 2016 @@ -503,7 +503,7 @@ PHANDLE newToken) { TOKEN_TYPE type; - SECURITY_IMPERSONATION_LEVEL level = TokenImpersonationLevel; + SECURITY_IMPERSONATION_LEVEL level = SecurityAnonymous; DWORD size; FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n",

1 0

[cwittich] 72563: [USER32] on't overwrite 'cb' field with uninitialized data in DdeQueryConvInfo() patch by Nikolay Sivov
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 08:03:23 2016 New Revision: 72563 URL: http://svn.reactos.org/svn/reactos?rev=72563&view=rev Log: [USER32] on't overwrite 'cb' field with uninitialized data in DdeQueryConvInfo() patch by Nikolay Sivov Modified: trunk/reactos/win32ss/user/user32/misc/ddemisc.c Modified: trunk/reactos/win32ss/user/user32/misc/ddemisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/ddemisc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/ddemisc.c [iso-8859-1] Sun Sep 4 08:03:23 2016 @@ -2456,7 +2456,10 @@ } if (ret != 0) + { + ci.cb = lpConvInfo->cb; memcpy(lpConvInfo, &ci, min((size_t)lpConvInfo->cb, sizeof(ci))); + } return ret; }

1 0

[cwittich] 72562: [PSDK] fix typo
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 07:57:03 2016 New Revision: 72562 URL: http://svn.reactos.org/svn/reactos?rev=72562&view=rev Log: [PSDK] fix typo Modified: trunk/reactos/sdk/include/psdk/winbase.h Modified: trunk/reactos/sdk/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winbase.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winbase.h [iso-8859-1] Sun Sep 4 07:57:03 2016 @@ -29,7 +29,7 @@ #define FILE_SYSTEM_NOT_SUPPORT 6 #define FILE_USER_DISALLOWED 7 #define FILE_READ_ONLY 8 -#define FILE_DIR_DISALOWED 9 +#define FILE_DIR_DISALLOWED 9 #define COMMPROP_INITIALIZED 0xE73CF52E #define SP_SERIALCOMM 1

1 0

[cwittich] 72561: [SHELL32] add DECLSPEC_HOTPATCH to WinExec function (wine patch from Jacek Caban)
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 07:50:55 2016 New Revision: 72561 URL: http://svn.reactos.org/svn/reactos?rev=72561&view=rev Log: [SHELL32] add DECLSPEC_HOTPATCH to WinExec function (wine patch from Jacek Caban) Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Sep 4 07:50:55 2016 @@ -4812,6 +4812,7 @@ */ UINT WINAPI +DECLSPEC_HOTPATCH WinExec(LPCSTR lpCmdLine, UINT uCmdShow) {

1 0

← Newer
1
...
28
29
30
31
32
33
34
35
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2016