Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: installer/src/installer-lib/test/test-installer-lib-ca.cpp

Issue 29329159: Issue #1185 - Fix formatting in installer-lib and its tests (Closed)
Patch Set: Created Oct. 15, 2015, 7:03 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: installer/src/installer-lib/test/test-installer-lib-ca.cpp
===================================================================
--- a/installer/src/installer-lib/test/test-installer-lib-ca.cpp
+++ b/installer/src/installer-lib/test/test-installer-lib-ca.cpp
@@ -7,12 +7,12 @@
/**
* DllMain is the standard entry point call when the DLL is loaded or unloaded.
*
- * \param[in] module_handle
+ * \param[in] module_handle
* Handle for this instance of the DLL; same as the module handle.
* This handle allows us to get the DLL file name for logging.
- * \param[in] reason
+ * \param[in] reason
* The point in the DLL life cycle at which this call is made. Called "reason code" by Microsoft.
- * \param[in] reserved
+ * \param[in] reserved
* No longer reserved, since it contains a point in the thread life cycle.
* We aren't using it, though.
@@ -22,50 +22,50 @@
extern "C" BOOL WINAPI DllMain(
IN HINSTANCE module_handle,
IN ULONG reason,
- IN LPVOID reserved )
+ IN LPVOID reserved)
{
/*
* Because this is an external API, we must ensure that there is a catch-all block for each execution path. There are two of these below.
*/
- switch ( reason )
+ switch (reason)
{
- case DLL_PROCESS_ATTACH:
- try
- {
- DllModule::Attach( module_handle );
+ case DLL_PROCESS_ATTACH:
+ try
+ {
+ DllModule::Attach(module_handle);
+ return TRUE;
+ }
+ catch (...)
+ {
+ // We can't log to the installation log yet, and this couldn't shouldn't be executed except in rare cases such as out-of-memory.
+ // Since it's a lot of code to do something useful (such as logging to the Windows system event log), we don't do anything but return a failure.
+ return FALSE;
+ }
+ break;
+
+ case DLL_PROCESS_DETACH:
+ try
+ {
+ DllModule::Detach();
+ return TRUE;
+ }
+ catch (...)
+ {
+ // See comment above in parallel catch-block.
+ return FALSE;
+ }
+ break;
+
+ /*
+ * This entry point is called for each thread after the first in a process with this DLL loaded. Note "after the first".
+ * The process life cycle is always called, and we do our global initialization there. So even though this DLL
+ * doesn't support asynchronous operation, this entry point gets called anyway. We need to ignore these calls.
+ */
+ case DLL_THREAD_ATTACH:
+ case DLL_THREAD_DETACH:
return TRUE;
- }
- catch(...)
- {
- // We can't log to the installation log yet, and this couldn't shouldn't be executed except in rare cases such as out-of-memory.
- // Since it's a lot of code to do something useful (such as logging to the Windows system event log), we don't do anything but return a failure.
+
+ default:
return FALSE;
- }
- break;
-
- case DLL_PROCESS_DETACH:
- try
- {
- DllModule::Detach();
- return TRUE;
- }
- catch(...)
- {
- // See comment above in parallel catch-block.
- return FALSE;
- }
- break;
-
- /*
- * This entry point is called for each thread after the first in a process with this DLL loaded. Note "after the first".
- * The process life cycle is always called, and we do our global initialization there. So even though this DLL
- * doesn't support asynchronous operation, this entry point gets called anyway. We need to ignore these calls.
- */
- case DLL_THREAD_ATTACH:
- case DLL_THREAD_DETACH:
- return TRUE;
-
- default:
- return FALSE;
}
}
« no previous file with comments | « installer/src/installer-lib/test/record_test.cpp ('k') | installer/src/installer-lib/test/test-installer-lib-ca.rc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld