[ros-dev] [ros-diffs] [jgardou] 64311: [WIN32K] - Simplify IntRemoveWindowProp - Complain loudly if a NULL list entry sneaks into a window property list. CORE-8562
Jérôme Gardou
jerome.gardou at reactos.org
Fri Sep 26 12:52:25 UTC 2014
Uh oh, seems like I screwed up these two.
The spec2def part of this commit should indeed belong to r64312.
Le 26/09/2014 14:43, jgardou at svn.reactos.org a écrit :
> Author: jgardou
> Date: Fri Sep 26 12:43:12 2014
> New Revision: 64311
>
> URL: http://svn.reactos.org/svn/reactos?rev=64311&view=rev
> Log:
> [WIN32K]
> - Simplify IntRemoveWindowProp
> - Complain loudly if a NULL list entry sneaks into a window property list.
> CORE-8562
>
> Modified:
> trunk/reactos/tools/spec2def/spec2def.c
> trunk/reactos/win32ss/user/ntuser/prop.c
>
> Modified: trunk/reactos/tools/spec2def/spec2def.c
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?rev=64311&r1=64310&r2=64311&view=diff
> ==============================================================================
> --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original)
> +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Fri Sep 26 12:43:12 2014
> @@ -38,6 +38,7 @@
> typedef int (*PFNOUTLINE)(FILE *, EXPORT *);
> int gbMSComp = 0;
> int gbImportLib = 0;
> +int gbTracing = 0;
> int giArch = ARCH_X86;
> char *pszArchString = "i386";
> char *pszArchString2;
> @@ -52,6 +53,9 @@
> FL_STUB = 2,
> FL_NONAME = 4,
> FL_ORDINAL = 8,
> + FL_NORELAY = 16,
> + FL_RET64 = 32,
> + FL_REGISTER = 64,
> };
>
> enum
> @@ -161,52 +165,126 @@
> OutputHeader_stub(FILE *file)
> {
> fprintf(file, "/* This file is autogenerated, do not edit. */\n\n"
> - "#include <stubs.h>\n\n");
> + "#include <stubs.h>\n");
> +
> + if (gbTracing)
> + {
> + fprintf(file, "#include <wine/debug.h>\n");
> + fprintf(file, "#include <inttypes.h>\n");
> + fprintf(file, "WINE_DECLARE_DEBUG_CHANNEL(relay);\n");
> + }
> +
> + fprintf(file, "\n");
> }
>
> int
> OutputLine_stub(FILE *file, EXPORT *pexp)
> {
> int i;
> + int bRelay = 0;
> + int bInPrototype;
>
> if (pexp->nCallingConvention != CC_STUB &&
> - (pexp->uFlags & FL_STUB) == 0) return 0;
> -
> - fprintf(file, "int ");
> - if ((giArch == ARCH_X86) &&
> - pexp->nCallingConvention == CC_STDCALL)
> - {
> - fprintf(file, "__stdcall ");
> - }
> -
> - /* Check for C++ */
> - if (pexp->strName.buf[0] == '?')
> - {
> - fprintf(file, "stub_function%d(", pexp->nNumber);
> + (pexp->uFlags & FL_STUB) == 0)
> + {
> + /* Only relay trace stdcall C functions */
> + if (!gbTracing || (pexp->nCallingConvention != CC_STDCALL)
> + || (pexp->uFlags & FL_NORELAY)
> + || (pexp->strName.buf[0] == '?'))
> + {
> + return 0;
> + }
> + bRelay = 1;
> + }
> +
> + /* Declare the "real" function */
> + if (bRelay)
> + {
> + fprintf(file, "extern ");
> + bInPrototype = 1;
> + }
> +
> + do
> + {
> + if (pexp->uFlags & FL_REGISTER)
> + {
> + /* FIXME: Not sure this is right */
> + fprintf(file, "void ");
> + }
> + else if (pexp->uFlags & FL_RET64)
> + {
> + fprintf(file, "__int64 ");
> + }
> + else
> + {
> + fprintf(file, "int ");
> + }
> +
> + if ((giArch == ARCH_X86) &&
> + pexp->nCallingConvention == CC_STDCALL)
> + {
> + fprintf(file, "__stdcall ");
> + }
> +
> + /* Check for C++ */
> + if (pexp->strName.buf[0] == '?')
> + {
> + fprintf(file, "stub_function%d(", pexp->nNumber);
> + }
> + else
> + {
> + if (!bRelay || bInPrototype)
> + fprintf(file, "%.*s(", pexp->strName.len, pexp->strName.buf);
> + else
> + fprintf(file, "$relaytrace$%.*s(", pexp->strName.len, pexp->strName.buf);
> + }
> +
> + for (i = 0; i < pexp->nArgCount; i++)
> + {
> + if (i != 0) fprintf(file, ", ");
> + switch (pexp->anArgs[i])
> + {
> + case ARG_LONG: fprintf(file, "long"); break;
> + case ARG_PTR: fprintf(file, "void*"); break;
> + case ARG_STR: fprintf(file, "char*"); break;
> + case ARG_WSTR: fprintf(file, "wchar_t*"); break;
> + case ARG_DBL: fprintf(file, "double"); break;
> + case ARG_INT64 : fprintf(file, "__int64"); break;
> + case ARG_INT128 : fprintf(file, "__int128"); break;
> + case ARG_FLOAT: fprintf(file, "float"); break;
> + }
> + fprintf(file, " a%d", i);
> + }
> +
> + if (bInPrototype)
> + {
> + fprintf(file, ");\n\n");
> + }
> + } while (bInPrototype--);
> +
> + if (!bRelay)
> + {
> + fprintf(file, ")\n{\n\tDbgPrint(\"WARNING: calling stub %.*s(",
> + pexp->strName.len, pexp->strName.buf);
> }
> else
> {
> - fprintf(file, "%.*s(", pexp->strName.len, pexp->strName.buf);
> - }
> -
> - for (i = 0; i < pexp->nArgCount; i++)
> - {
> - if (i != 0) fprintf(file, ", ");
> - switch (pexp->anArgs[i])
> - {
> - case ARG_LONG: fprintf(file, "long"); break;
> - case ARG_PTR: fprintf(file, "void*"); break;
> - case ARG_STR: fprintf(file, "char*"); break;
> - case ARG_WSTR: fprintf(file, "wchar_t*"); break;
> - case ARG_DBL:
> - case ARG_INT64 : fprintf(file, "__int64"); break;
> - case ARG_INT128 : fprintf(file, "__int128"); break;
> - case ARG_FLOAT: fprintf(file, "float"); break;
> - }
> - fprintf(file, " a%d", i);
> - }
> - fprintf(file, ")\n{\n\tDbgPrint(\"WARNING: calling stub %.*s(",
> - pexp->strName.len, pexp->strName.buf);
> + fprintf(file, ")\n{\n");
> + if (pexp->uFlags & FL_REGISTER)
> + {
> + /* No return value */
> + }
> + else if (pexp->uFlags & FL_RET64)
> + {
> + fprintf(file, "\t__int64 retval;\n");
> + }
> + else
> + {
> + fprintf(file, "\tint retval;\n");
> + }
> + fprintf(file, "\tif(TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s(",
> + pszDllName, pexp->strName.len, pexp->strName.buf);
> + }
>
> for (i = 0; i < pexp->nArgCount; i++)
> {
> @@ -246,8 +324,42 @@
> {
> fprintf(file, "\t__wine_spec_unimplemented_stub(\"%s\", __FUNCTION__);\n", pszDllName);
> }
> -
> - fprintf(file, "\treturn 0;\n}\n\n");
> + else if (bRelay)
> + {
> + if (pexp->uFlags & FL_REGISTER)
> + {
> + fprintf(file,"\t");
> + }
> + else
> + {
> + fprintf(file, "\tretval = ");
> + }
> + fprintf(file, "%.*s(", pexp->strName.len, pexp->strName.buf);
> +
> + for (i = 0; i < pexp->nArgCount; i++)
> + {
> + if (i != 0) fprintf(file, ", ");
> + fprintf(file, "a%d", i);
> + }
> + fprintf(file, ");\n");
> + }
> +
> + if (!bRelay)
> + fprintf(file, "\treturn 0;\n}\n\n");
> + else if ((pexp->uFlags & FL_REGISTER) == 0)
> + {
> + if (pexp->uFlags & FL_RET64)
> + {
> + fprintf(file, "\tif(TRACE_ON(relay))\n\t\t(\"%s: %.*s: retval = %%\"PRIx64\"\\n\", retval);\n",
> + pszDllName, pexp->strName.len, pexp->strName.buf);
> + }
> + else
> + {
> + fprintf(file, "\tTRACE_(relay)(\"%.*s: retval = 0x%%lx\\n\", retval);\n",
> + pexp->strName.len, pexp->strName.buf);
> + }
> + fprintf(file, "\treturn retval;\n}\n\n");
> + }
>
> return 1;
> }
> @@ -458,11 +570,18 @@
> /* C++ stubs are forwarded to C stubs */
> fprintf(fileDest, "=stub_function%d", pexp->nNumber);
> }
> + else if (gbTracing && ((pexp->uFlags & FL_NORELAY) == 0) && (pexp->nCallingConvention == CC_STDCALL) &&
> + (pexp->strName.buf[0] != '?'))
> + {
> + /* Redirect it to the relay-tracing trampoline */
> + fprintf(fileDest, "=$relaytrace$%.*s", pexp->strName.len, pexp->strName.buf);
> + }
> }
>
> void
> OutputLine_def_GCC(FILE *fileDest, EXPORT *pexp)
> {
> + int bTracing = 0;
> /* Print the function name, with decoration for export libs */
> PrintName(fileDest, pexp, &pexp->strName, gbImportLib);
> DbgPrint("Generating def line for '%.*s'\n", pexp->strName.len, pexp->strName.buf);
> @@ -482,6 +601,19 @@
> {
> /* C++ stubs are forwarded to C stubs */
> fprintf(fileDest, "=stub_function%d", pexp->nNumber);
> + }
> + else if (gbTracing && ((pexp->uFlags & FL_NORELAY) == 0) && (pexp->nCallingConvention == CC_STDCALL) &&
> + (pexp->strName.buf[0] != '?'))
> + {
> + /* Redirect it to the relay-tracing trampoline */
> + char buf[256];
> + STRING strTarget;
> + fprintf(fileDest, "=");
> + sprintf(buf, "$relaytrace$%.*s", pexp->strName.len, pexp->strName.buf);
> + strTarget.buf = buf;
> + strTarget.len = pexp->strName.len + 12;
> + PrintName(fileDest, pexp, &strTarget, 1);
> + bTracing = 1;
> }
>
> /* Special handling for stdcall and fastcall */
> @@ -500,7 +632,7 @@
> fprintf(fileDest, "==%.*s", pexp->strName.len, pexp->strName.buf);
> }
> }
> - else if (!pexp->strTarget.buf)
> + else if ((!pexp->strTarget.buf) && !(bTracing))
> {
> /* Write a forwarder to the actual decorated symbol */
> fprintf(fileDest, "=");
> @@ -694,11 +826,17 @@
> {
> exp.uFlags |= FL_STUB;
> }
> - else if (CompareToken(pc, "-norelay") ||
> - CompareToken(pc, "-register") ||
> - CompareToken(pc, "-ret64"))
> - {
> - /* silently ignore these */
> + else if (CompareToken(pc, "-norelay"))
> + {
> + exp.uFlags |= FL_NORELAY;
> + }
> + else if (CompareToken(pc, "-ret64"))
> + {
> + exp.uFlags |= FL_RET64;
> + }
> + else if (CompareToken(pc, "-register"))
> + {
> + exp.uFlags |= FL_REGISTER;
> }
> else
> {
> @@ -862,6 +1000,9 @@
> fprintf(stderr, "error: line %d, additional tokens after ')'\n", nLine);
> return -17;
> }
> +
> + /* Don't relay-trace forwarded functions */
> + exp.uFlags |= FL_NORELAY;
> }
> else
> {
> @@ -886,16 +1027,17 @@
>
> void usage(void)
> {
> - printf("syntax: spec2pdef [<options> ...] <spec file>\n"
> + printf("syntax: spec2def [<options> ...] <spec file>\n"
> "Possible options:\n"
> - " -h --help prints this screen\n"
> - " -l=<file> generates an asm lib stub\n"
> - " -d=<file> generates a def file\n"
> - " -s=<file> generates a stub file\n"
> - " --ms msvc compatibility\n"
> - " -n=<name> name of the dll\n"
> - " --implib generate a def file for an import library\n"
> - " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n");
> + " -h --help prints this screen\n"
> + " -l=<file> generates an asm lib stub\n"
> + " -d=<file> generates a def file\n"
> + " -s=<file> generates a stub file\n"
> + " --ms msvc compatibility\n"
> + " -n=<name> name of the dll\n"
> + " --implib generate a def file for an import library\n"
> + " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n"
> + " --with-tracing generates wine-like \"+relay\" trace trampolines. (necessitates -s)\n");
> }
>
> int main(int argc, char *argv[])
> @@ -945,6 +1087,15 @@
> {
> gbMSComp = 1;
> }
> + else if ((strcasecmp(argv[i], "--with-tracing") == 0))
> + {
> + if (!pszStubFileName)
> + {
> + fprintf(stderr, "Error: cannot use --with-tracing without -s option.\n");
> + return -1;
> + }
> + gbTracing = 1;
> + }
> else if (argv[i][1] == 'a' && argv[i][2] == '=')
> {
> pszArchString = argv[i] + 3;
>
> Modified: trunk/reactos/win32ss/user/ntuser/prop.c
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c?rev=64311&r1=64310&r2=64311&view=diff
> ==============================================================================
> --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original)
> +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Fri Sep 26 12:43:12 2014
> @@ -19,9 +19,18 @@
> int i;
>
> ListEntry = Window->PropListHead.Flink;
> +
> for (i = 0; i < Window->PropListItems; i++ )
> {
> Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry);
> +
> + if (ListEntry == NULL)
> + {
> + ERR("Corrupted (or uninitialized?) property list for window %p. Prop count %d. Atom %d.\n",
> + Window, Window->PropListItems, Atom);
> + return NULL;
> + }
> +
> if (Property->Atom == Atom)
> {
> return(Property);
> @@ -84,16 +93,14 @@
> {
> PLIST_ENTRY ListEntry;
> PPROPERTY Property;
> - int i, Count = Window->PropListItems;
> -
> - ListEntry = Window->PropListHead.Flink;
> - for (i = 0; i < Count; i++ )
> - {
> - Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry);
> - ListEntry = ListEntry->Flink;
> - RemoveEntryList(&Property->PropListEntry);
> - UserHeapFree(Property);
> - Window->PropListItems--;
> +
> + while (!IsListEmpty(&Window->PropListHead))
> + {
> + ListEntry = Window->PropListHead.Flink;
> + Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry);
> + RemoveEntryList(&Property->PropListEntry);
> + UserHeapFree(Property);
> + Window->PropListItems--;
> }
> return;
> }
>
>
More information about the Ros-dev
mailing list