Remove unneeded wine/library.h include.

Use lstrlenW() instead of the Wine-specific strlenW(). This also lets us get rid of the wine/unicode.h include. Define the InitializeObjectAttributes() macro if not using Wine's winternl.h header.

Remove unneeded wine/library.h include.
46940ac9 · Francois Gouget · Alexandre Julliard · d05532e2 · 46940ac9
Commit 46940ac9 authored Aug 11, 2005 by Francois Gouget Committed by Alexandre Julliard Aug 11, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

reg.c dlls/ntdll/tests/reg.c +11 -3

No files found.
--- a/dlls/ntdll/tests/reg.c
+++ b/dlls/ntdll/tests/reg.c
@@ -24,12 +24,10 @@

 #include "ntdll_test.h"
 #include "winternl.h"
-#include "wine/library.h"
 #include "stdio.h"
 #include "winnt.h"
 #include "winnls.h"
 #include "stdlib.h"
-#include "wine/unicode.h"

 #ifndef __WINE_WINTERNL_H

@@ -69,6 +67,16 @@ typedef struct _RTL_QUERY_REGISTRY_TABLE {
  ULONG  DefaultLength;
 } RTL_QUERY_REGISTRY_TABLE, *PRTL_QUERY_REGISTRY_TABLE;

+#define InitializeObjectAttributes(p,n,a,r,s) \
+    do { \
+        (p)->Length = sizeof(OBJECT_ATTRIBUTES); \
+        (p)->RootDirectory = r; \
+        (p)->Attributes = a; \
+        (p)->ObjectName = n; \
+        (p)->SecurityDescriptor = s; \
+        (p)->SecurityQualityOfService = NULL; \
+    } while (0)
+
 #endif

 static NTSTATUS (WINAPI * pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR);
@@ -151,7 +159,7 @@ static NTSTATUS WINAPI QueryRoutine (IN PCWSTR ValueName, IN ULONG ValueType, IN

    if(ValueName)
    {
-        ValueNameLength = strlenW(ValueName);
+        ValueNameLength = lstrlenW(ValueName);

        ValName = (LPSTR)pRtlAllocateHeap(GetProcessHeap(), 0, ValueNameLength);