* Sync up to trunk head (r60691).

svn path=/branches/ntvdm/; revision=60692
This commit is contained in:
Amine Khaldi 2013-10-17 11:19:05 +00:00
commit 25445ea35f
5851 changed files with 218087 additions and 724119 deletions

View file

@ -2838,7 +2838,7 @@ retry:
DebugPrint((1, "ClassSendSrbSynchronous: Exception %lx "
"locking buffer\n", status));
return status;
_SEH2_YIELD(return status);
} _SEH2_END;
}

View file

@ -72,7 +72,7 @@ END
// MOFDATA
//
MOFRESOURCE MOFDATA MOVEABLE PURE "BT958.bmf"
MOFRESOURCE MOFDATA "BT958.bmf"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@ -80,18 +80,18 @@ MOFRESOURCE MOFDATA MOVEABLE PURE "BT958.bmf"
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"