__USE_W32API Deleted: trunk/reactos/lib/msgina/Makefile Added: trunk/reactos/lib/msgina/makefile Modified: trunk/reactos/lib/msgina/msgina.c Modified: trunk/reactos/lib/msgina/stubs.c _____
Deleted: trunk/reactos/lib/msgina/Makefile --- trunk/reactos/lib/msgina/Makefile 2005-04-02 19:33:08 UTC (rev 14454) +++ trunk/reactos/lib/msgina/Makefile 2005-04-02 19:47:52 UTC (rev 14455) @@ -1,45 +0,0 @@
-# $Id$ - -PATH_TO_TOP = ../.. - -TARGET_TYPE = dynlink - -TARGET_NAME = msgina - -TARGET_INSTALLDIR = system32 - -TARGET_BASE = $(TARGET_BASE_LIB_MSGINA) - -TARGET_CFLAGS = \ - -I./include \ - -DUNICODE \ - -D_UNICODE \ - -D__REACTOS__ \ - -Wall \ - -Werror \ - -fno-builtin - -TARGET_LFLAGS = -nostartfiles -nostdlib - -TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a user32.a - -TARGET_GCCLIBS = gcc - -TARGET_PCH = - -TARGET_CLEAN = - -TARGET_OBJECTS = msgina.o stubs.o - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -include $(TOOLS_PATH)/depend.mk - -%/TAGS: - etags -o $(@D)/TAGS $(@D)/*.c - -etags: ./TAGS _____
Copied: trunk/reactos/lib/msgina/makefile (from rev 14454, trunk/reactos/lib/msgina/Makefile) --- trunk/reactos/lib/msgina/Makefile 2005-04-02 19:33:08 UTC (rev 14454) +++ trunk/reactos/lib/msgina/makefile 2005-04-02 19:47:52 UTC (rev 14455) @@ -0,0 +1,46 @@
+# $Id$ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = dynlink + +TARGET_NAME = msgina + +TARGET_INSTALLDIR = system32 + +TARGET_BASE = $(TARGET_BASE_LIB_MSGINA) + +TARGET_CFLAGS = \ + -I./include \ + -DUNICODE \ + -D_UNICODE \ + -D__USE_W32API \ + -D__REACTOS__ \ + -Wall \ + -Werror \ + -fno-builtin + +TARGET_LFLAGS = -nostartfiles -nostdlib + +TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a user32.a + +TARGET_GCCLIBS = gcc + +TARGET_PCH = + +TARGET_CLEAN = + +TARGET_OBJECTS = msgina.o stubs.o + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +include $(TOOLS_PATH)/depend.mk + +%/TAGS: + etags -o $(@D)/TAGS $(@D)/*.c + +etags: ./TAGS _____
Modified: trunk/reactos/lib/msgina/msgina.c --- trunk/reactos/lib/msgina/msgina.c 2005-04-02 19:33:08 UTC (rev 14454) +++ trunk/reactos/lib/msgina/msgina.c 2005-04-02 19:47:52 UTC (rev 14455) @@ -30,6 +30,8 @@
#include "msgina.h" #include "resource.h"
+#include <wine/debug.h> + extern HINSTANCE hDllInstance;
typedef struct _DISPLAYSTATUSMSG @@ -203,7 +205,7 @@ if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon", 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) - {DbgPrint("GINA: Failed: 1\n"); + {ERR("GINA: Failed: 1\n"); VirtualFree(pEnvironment, 0, MEM_RELEASE); return FALSE; } @@ -211,7 +213,7 @@ if((RegQueryValueEx(hKey, L"Userinit", NULL, &ValueType, (LPBYTE)pszUserInitApp, &BufSize) != ERROR_SUCCESS) || !((ValueType == REG_SZ) || (ValueType == REG_EXPAND_SZ))) - {DbgPrint("GINA: Failed: 2\n"); + {ERR("GINA: Failed: 2\n"); RegCloseKey(hKey); VirtualFree(pEnvironment, 0, MEM_RELEASE); return FALSE; @@ -243,7 +245,7 @@ NULL, &si, &pi); - if(!Ret) DbgPrint("GINA: Failed: 3\n"); + if(!Ret) ERR("GINA: Failed: 3\n"); VirtualFree(pEnvironment, 0, MEM_RELEASE); return Ret; } @@ -281,22 +283,22 @@ } case WLX_SAS_TYPE_SC_INSERT: { - DbgPrint("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_SC_INSERT not supported!\n"); + FIXME("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_SC_INSERT not supported!\n"); break; } case WLX_SAS_TYPE_SC_REMOVE: { - DbgPrint("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_SC_REMOVE not supported!\n"); + FIXME("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_SC_REMOVE not supported!\n"); break; } case WLX_SAS_TYPE_TIMEOUT: { - DbgPrint("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_TIMEOUT not supported!\n"); + FIXME("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_TIMEOUT not supported!\n"); break; } default: { - DbgPrint("WlxLoggedOnSAS: Unknown SasType: 0x%x\n", dwSasType); + WARN("WlxLoggedOnSAS: Unknown SasType: 0x%x\n", dwSasType); break; } } @@ -494,7 +496,7 @@
if(!phToken) { - DbgPrint("msgina: phToken == NULL!\n"); + WARN("msgina: phToken == NULL!\n"); return WLX_SAS_ACTION_NONE; }
@@ -503,13 +505,13 @@ LOGON32_PROVIDER_DEFAULT, phToken)) { - DbgPrint("msgina: Logonuser() failed\n"); + WARN("msgina: Logonuser() failed\n"); return WLX_SAS_ACTION_NONE; }
if(!(*phToken)) { - DbgPrint("msgina: *phToken == NULL!\n"); + WARN("msgina: *phToken == NULL!\n"); return WLX_SAS_ACTION_NONE; }
@@ -524,7 +526,7 @@ sizeof(TOKEN_STATISTICS), &cbStats)) { - DbgPrint("msgina: Couldn't get Autentication id from user token!\n"); + WARN("msgina: Couldn't get Autentication id from user token!\n"); return WLX_SAS_ACTION_NONE; } *pAuthenticationId = Stats.AuthenticationId; _____
Modified: trunk/reactos/lib/msgina/stubs.c --- trunk/reactos/lib/msgina/stubs.c 2005-04-02 19:33:08 UTC (rev 14454) +++ trunk/reactos/lib/msgina/stubs.c 2005-04-02 19:47:52 UTC (rev 14455) @@ -12,10 +12,8 @@
#include <windows.h> #include <winwlx.h>
-#define UNIMPLEMENTED \ - DbgPrint("MSGINA: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) +#include <wine/debug.h>
- /* * @unimplemented */