[ros-diffs] [akhaldi] 55106: [CREDUI] * Sync to Wine 1.3.37.

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Mon Jan 23 15:42:58 2012
New Revision: 55106

URL: http://svn.reactos.org/svn/reactos?rev=55106&view=rev
Log:
[CREDUI]
* Sync to Wine 1.3.37.

Modified:
    trunk/reactos/dll/win32/credui/credui_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/credui/credui_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_main.c?rev=55106&r1=55105&r2=55106&view=diff
==============================================================================
--- trunk/reactos/dll/win32/credui/credui_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/credui/credui_main.c [iso-8859-1] Mon Jan 23 15:42:58 2012
@@ -65,19 +65,21 @@
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
+    struct pending_credentials *entry, *cursor2;
     TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved);
 
-    if (fdwReason == DLL_WINE_PREATTACH) return FALSE;	/* prefer native version */
-
-    if (fdwReason == DLL_PROCESS_ATTACH)
-    {
+    switch (fdwReason)
+    {
+    case DLL_WINE_PREATTACH:
+        return FALSE;	/* prefer native version */
+
+    case DLL_PROCESS_ATTACH:
         DisableThreadLibraryCalls(hinstDLL);
         hinstCredUI = hinstDLL;
         InitCommonControls();
-    }
-    else if (fdwReason == DLL_PROCESS_DETACH)
-    {
-        struct pending_credentials *entry, *cursor2;
+        break;
+
+    case DLL_PROCESS_DETACH:
         LIST_FOR_EACH_ENTRY_SAFE(entry, cursor2, &pending_credentials_list, struct pending_credentials, entry)
         {
             list_remove(&entry->entry);
@@ -88,6 +90,8 @@
             HeapFree(GetProcessHeap(), 0, entry->pszPassword);
             HeapFree(GetProcessHeap(), 0, entry);
         }
+        DeleteCriticalSection(&csPendingCredentials);
+        break;
     }
 
     return TRUE;
@@ -260,7 +264,7 @@
     SendMessageW(params->hwndBalloonTip, TTM_SETTITLEW, TTI_ERROR, (LPARAM)wszTitle);
 
     GetWindowRect(GetDlgItem(hwndDlg, IDC_PASSWORD), &rcPassword);
-    /* centred vertically and in the right side of the password edit control */
+    /* centered vertically and in the right side of the password edit control */
     x = rcPassword.right - 12;
     y = (rcPassword.top + rcPassword.bottom) / 2;
     SendMessageW(params->hwndBalloonTip, TTM_TRACKPOSITION, 0, MAKELONG(x, y));

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=55106&r1=55105&r2=55106&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Jan 23 15:42:58 2012
@@ -51,7 +51,7 @@
 reactos/dll/win32/comctl32        # Synced to Wine 1.3.14
 reactos/dll/win32/comdlg32        # Autosync
 reactos/dll/win32/compstui        # Autosync
-reactos/dll/win32/credui          # Autosync
+reactos/dll/win32/credui          # Synced to Wine-1.3.37
 reactos/dll/win32/crypt32         # Autosync
 reactos/dll/win32/cryptdlg        # Autosync
 reactos/dll/win32/cryptdll        # Autosync