[ros-diffs] [akhaldi] 55260: [NDDEAPI] * Sync to Wine 1.3.37.

Author: akhaldi
Date: Fri Jan 27 20:21:06 2012
New Revision: 55260

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

Modified:
    trunk/reactos/dll/win32/nddeapi/nddeapi.c
    trunk/reactos/dll/win32/nddeapi/nddeapi.spec
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/nddeapi/nddeapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/nddeapi.…
==============================================================================
--- trunk/reactos/dll/win32/nddeapi/nddeapi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/nddeapi/nddeapi.c [iso-8859-1] Fri Jan 27 20:21:06 2012
@@ -26,15 +26,228 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(nddeapi);
 
+/* Network DDE functionality was removed in Windows Vista, so the functions are silent
stubs.
+ * Since the corresponding header is no longer available in the Windows SDK, a required
definition
+ * is replicated here. */
+#define NDDE_NOT_IMPLEMENTED 14
+
+/***********************************************************************
+ *             NDdeShareAddA   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeShareAddA(LPSTR lpszServer, UINT nLevel, PSECURITY_DESCRIPTOR pSD,
+                          LPBYTE lpBuffer, DWORD cBufSize)
+{
+    TRACE("(%s, %u, %p, %p, %u)\n", debugstr_a(lpszServer), nLevel, pSD,
lpBuffer, cBufSize);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeShareDelA   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeShareDelA(LPSTR lpszServer, LPSTR lpszShareName, UINT wReserved)
+{
+    TRACE("(%s, %s, %u)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName),
wReserved);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeShareEnumA   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeShareEnumA(LPSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD
cBufSize,
+                           LPDWORD lpnEntriesRead, LPDWORD lpcbTotalAvailable)
+{
+    TRACE("(%s, %u, %p, %u, %p, %p)\n", debugstr_a(lpszServer), nLevel,
lpBuffer, cBufSize,
+                                        lpnEntriesRead, lpcbTotalAvailable);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeShareGetInfoA   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeShareGetInfoA(LPSTR lpszServer, LPSTR lpszShareName, UINT nLevel, LPBYTE
lpBuffer,
+                              DWORD cBufSize, LPDWORD lpnTotalAvailable, LPWORD
lpnItems)
+{
+    TRACE("(%s, %s, %u, %p, %u, %p, %p)\n", debugstr_a(lpszServer),
debugstr_a(lpszShareName), nLevel,
+                                            lpBuffer, cBufSize, lpnTotalAvailable,
lpnItems);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeShareSetInfoA   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeShareSetInfoA(LPSTR lpszServer, LPSTR lpszShareName, UINT nLevel, LPBYTE
lpBuffer,
+                              DWORD cBufSize, WORD sParmNum)
+{
+    TRACE("(%s, %s, %u, %p, %u, %u)\n", debugstr_a(lpszServer),
debugstr_a(lpszShareName), nLevel,
+                                        lpBuffer, cBufSize, sParmNum);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
 /***********************************************************************
  *             NDdeGetErrorStringA   (NDDEAPI.@)
  *
  */
 UINT WINAPI NDdeGetErrorStringA(UINT uErrorCode, LPSTR lpszErrorString, DWORD cBufSize)
 {
-    FIXME("(%u, %s, %d): stub!\n",uErrorCode,debugstr_a(lpszErrorString),
cBufSize);
-
-    return E_NOTIMPL;
+    TRACE("(%u, %p, %d)\n", uErrorCode, lpszErrorString, cBufSize);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeIsValidShareNameA   (NDDEAPI.@)
+ *
+ */
+BOOL WINAPI NDdeIsValidShareNameA(LPSTR shareName)
+{
+    TRACE("(%s)\n", debugstr_a(shareName));
+
+    return FALSE;
+}
+
+/***********************************************************************
+ *             NDdeIsValidAppTopicListA   (NDDEAPI.@)
+ *
+ */
+BOOL WINAPI NDdeIsValidAppTopicListA(LPSTR targetTopic)
+{
+    TRACE("(%s)\n", debugstr_a(targetTopic));
+
+    return FALSE;
+}
+
+/***********************************************************************
+ *             NDdeGetShareSecurityA   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeGetShareSecurityA(LPSTR lpszServer, LPSTR lpszShareName,
SECURITY_INFORMATION si,
+                                  PSECURITY_DESCRIPTOR pSD, DWORD cbSD, LPDWORD
lpcbsdRequired)
+{
+    TRACE("(%s, %s, %u, %p, %u, %p)\n", debugstr_a(lpszServer),
debugstr_a(lpszShareName),
+                                        si, pSD, cbSD, lpcbsdRequired);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeSetShareSecurityA   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeSetShareSecurityA(LPSTR lpszServer, LPSTR lpszShareName,
SECURITY_INFORMATION si,
+                                  PSECURITY_DESCRIPTOR pSD)
+{
+    TRACE("(%s, %s, %u, %p)\n", debugstr_a(lpszServer),
debugstr_a(lpszShareName), si, pSD);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeGetTrustedShareA   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeGetTrustedShareA(LPSTR lpszServer, LPSTR lpszShareName, LPDWORD
lpdwTrustOptions,
+                                 LPDWORD lpdwShareModId0, LPDWORD lpdwShareModId1)
+{
+    TRACE("(%s, %s, %p, %p, %p)\n", debugstr_a(lpszServer),
debugstr_a(lpszShareName), lpdwTrustOptions,
+                                    lpdwShareModId0, lpdwShareModId1);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeSetTrustedShareA   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeSetTrustedShareA(LPSTR lpszServer, LPSTR lpszShareName, DWORD
dwTrustOptions)
+{
+    TRACE("(%s, %s, 0x%08x)\n", debugstr_a(lpszServer),
debugstr_a(lpszShareName), dwTrustOptions);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeTrustedShareEnumA   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeTrustedShareEnumA(LPSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD
cBufSize,
+                                  LPDWORD lpnEntriesRead, LPDWORD lpcbTotalAvailable)
+{
+    TRACE("(%s, %u, %p, %u, %p, %p)\n", debugstr_a(lpszServer), nLevel,
lpBuffer, cBufSize,
+                                        lpnEntriesRead, lpcbTotalAvailable);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeShareAddW   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeShareAddW(LPWSTR lpszServer, UINT nLevel, PSECURITY_DESCRIPTOR pSD,
+                          LPBYTE lpBuffer, DWORD cBufSize)
+{
+    TRACE("(%s, %u, %p, %p, %u)\n", debugstr_w(lpszServer), nLevel, pSD,
lpBuffer, cBufSize);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeShareDelW   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeShareDelW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT wReserved)
+{
+    TRACE("(%s, %s, %u)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName),
wReserved);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeShareEnumW   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeShareEnumW(LPWSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD
cBufSize,
+                           LPDWORD lpnEntriesRead, LPDWORD lpcbTotalAvailable)
+{
+    TRACE("(%s, %u, %p, %u, %p, %p)\n", debugstr_w(lpszServer), nLevel,
lpBuffer, cBufSize,
+                                        lpnEntriesRead, lpcbTotalAvailable);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeShareGetInfoW   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeShareGetInfoW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT nLevel,
LPBYTE lpBuffer,
+                              DWORD cBufSize, LPDWORD lpnTotalAvailable, LPWORD
lpnItems)
+{
+    TRACE("(%s, %s, %u, %p, %u, %p, %p)\n", debugstr_w(lpszServer),
debugstr_w(lpszShareName), nLevel,
+                                            lpBuffer, cBufSize, lpnTotalAvailable,
lpnItems);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeShareSetInfoW   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeShareSetInfoW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT nLevel,
LPBYTE lpBuffer,
+                              DWORD cBufSize, WORD sParmNum)
+{
+    TRACE("(%s, %s, %u, %p, %u, %u)\n", debugstr_w(lpszServer),
debugstr_w(lpszShareName), nLevel,
+                                        lpBuffer, cBufSize, sParmNum);
+
+    return NDDE_NOT_IMPLEMENTED;
 }
 
 /***********************************************************************
@@ -43,7 +256,91 @@
 */
 UINT WINAPI NDdeGetErrorStringW(UINT uErrorCode, LPWSTR lpszErrorString, DWORD cBufSize)
 {
-    FIXME("(%u, %s, %d): stub!\n",uErrorCode,debugstr_w(lpszErrorString),
cBufSize);
-
-    return E_NOTIMPL;
-}
+    FIXME("(%u, %p, %d): stub!\n", uErrorCode, lpszErrorString, cBufSize);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeIsValidShareNameW   (NDDEAPI.@)
+ *
+ */
+BOOL WINAPI NDdeIsValidShareNameW(LPWSTR shareName)
+{
+    TRACE("(%s)\n", debugstr_w(shareName));
+
+    return FALSE;
+}
+
+/***********************************************************************
+ *             NDdeIsValidAppTopicListW   (NDDEAPI.@)
+ *
+ */
+BOOL WINAPI NDdeIsValidAppTopicListW(LPWSTR targetTopic)
+{
+    TRACE("(%s)\n", debugstr_w(targetTopic));
+
+    return FALSE;
+}
+
+/***********************************************************************
+ *             NDdeGetShareSecurityW   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeGetShareSecurityW(LPWSTR lpszServer, LPWSTR lpszShareName,
SECURITY_INFORMATION si,
+                                  PSECURITY_DESCRIPTOR pSD, DWORD cbSD, LPDWORD
lpcbsdRequired)
+{
+    TRACE("(%s, %s, %u, %p, %u, %p)\n", debugstr_w(lpszServer),
debugstr_w(lpszShareName),
+                                        si, pSD, cbSD, lpcbsdRequired);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeSetShareSecurityW   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeSetShareSecurityW(LPWSTR lpszServer, LPWSTR lpszShareName,
SECURITY_INFORMATION si,
+                                  PSECURITY_DESCRIPTOR pSD)
+{
+    TRACE("(%s, %s, %u, %p)\n", debugstr_w(lpszServer),
debugstr_w(lpszShareName), si, pSD);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeGetTrustedShareW   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeGetTrustedShareW(LPWSTR lpszServer, LPWSTR lpszShareName, LPDWORD
lpdwTrustOptions,
+                                 LPDWORD lpdwShareModId0, LPDWORD lpdwShareModId1)
+{
+    TRACE("(%s, %s, %p, %p, %p)\n", debugstr_w(lpszServer),
debugstr_w(lpszShareName), lpdwTrustOptions,
+                                    lpdwShareModId0, lpdwShareModId1);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeSetTrustedShareW   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeSetTrustedShareW(LPWSTR lpszServer, LPWSTR lpszShareName, DWORD
dwTrustOptions)
+{
+    TRACE("(%s, %s, 0x%08x)\n", debugstr_w(lpszServer),
debugstr_w(lpszShareName), dwTrustOptions);
+
+    return NDDE_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *             NDdeTrustedShareEnumW   (NDDEAPI.@)
+ *
+ */
+UINT WINAPI NDdeTrustedShareEnumW(LPWSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD
cBufSize,
+                                  LPDWORD lpnEntriesRead, LPDWORD lpcbTotalAvailable)
+{
+    TRACE("(%s, %u, %p, %u, %p, %p)\n", debugstr_w(lpszServer), nLevel,
lpBuffer, cBufSize,
+                                        lpnEntriesRead, lpcbTotalAvailable);
+
+    return NDDE_NOT_IMPLEMENTED;
+}

Modified: trunk/reactos/dll/win32/nddeapi/nddeapi.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/nddeapi.…
==============================================================================
--- trunk/reactos/dll/win32/nddeapi/nddeapi.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/nddeapi/nddeapi.spec [iso-8859-1] Fri Jan 27 20:21:06 2012
@@ -1,28 +1,29 @@
-@ stdcall NDdeGetErrorStringA(long str long)
-@ stdcall NDdeGetErrorStringW(long wstr long)
-@ stub NDdeGetShareSecurityA
-@ stub NDdeGetShareSecurityW
-@ stub NDdeGetTrustedShareA
-@ stub NDdeGetTrustedShareW
-@ stub NDdeIsValidAppTopicListA
-@ stub NDdeIsValidAppTopicListW
-@ stub NDdeIsValidShareNameA
-@ stub NDdeIsValidShareNameW
-@ stub NDdeSetShareSecurityA
-@ stub NDdeSetShareSecurityW
-@ stub NDdeSetTrustedShareA
-@ stub NDdeSetTrustedShareW
-@ stub NDdeShareAddA
-@ stub NDdeShareAddW
-@ stub NDdeShareDelA
-@ stub NDdeShareDelW
-@ stub NDdeShareEnumA
-@ stub NDdeShareEnumW
-@ stub NDdeShareGetInfoA
-@ stub NDdeShareGetInfoW
-@ stub NDdeShareSetInfoA
-@ stub NDdeShareSetInfoW
+500 stdcall NDdeShareAddA(str long ptr ptr long)
+501 stdcall NDdeShareDelA(str str long)
+502 stdcall NDdeShareEnumA(str long ptr long ptr ptr)
+503 stdcall NDdeShareGetInfoA(str str long ptr long ptr ptr)
+504 stdcall NDdeShareSetInfoA(str str long ptr long long)
+505 stdcall NDdeGetErrorStringA(long ptr long)
+506 stdcall NDdeIsValidShareNameA(str)
+507 stdcall NDdeIsValidAppTopicListA(str)
+509 stdcall NDdeGetShareSecurityA(str str long ptr long ptr)
+510 stdcall NDdeSetShareSecurityA(ptr ptr long ptr)
+511 stdcall NDdeGetTrustedShareA(str str ptr ptr ptr)
+512 stdcall NDdeSetTrustedShareA(str str long)
+513 stdcall NDdeTrustedShareEnumA(str long ptr long ptr ptr)
+600 stdcall NDdeShareAddW(wstr long ptr ptr long)
+601 stdcall NDdeShareDelW(wstr wstr long)
+602 stdcall NDdeShareEnumW(wstr long ptr long ptr ptr)
+603 stdcall NDdeShareGetInfoW(wstr wstr long ptr long ptr ptr)
+604 stdcall NDdeShareSetInfoW(wstr wstr long ptr long long)
+605 stdcall NDdeGetErrorStringW(long wstr long)
+606 stdcall NDdeIsValidShareNameW(wstr)
+607 stdcall NDdeIsValidAppTopicListW(wstr)
+609 stdcall NDdeGetShareSecurityW(wstr wstr long ptr long ptr)
+610 stdcall NDdeSetShareSecurityW(ptr ptr long ptr)
+611 stdcall NDdeGetTrustedShareW(wstr wstr ptr ptr ptr)
+612 stdcall NDdeSetTrustedShareW(wstr wstr long)
+613 stdcall NDdeTrustedShareEnumW(wstr long ptr long ptr ptr)
+
 @ stub NDdeSpecialCommandA
 @ stub NDdeSpecialCommandW
-@ stub NDdeTrustedShareEnumA
-@ stub NDdeTrustedShareEnumW

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Jan 27 20:21:06 2012
@@ -115,7 +115,7 @@
 reactos/dll/win32/msvfw32         # Autosync
 reactos/dll/win32/msvidc32        # Autosync
 reactos/dll/win32/msxml3          # Autosync
-reactos/dll/win32/nddeapi         # Autosync
+reactos/dll/win32/nddeapi         # Synced to Wine-1.3.37
 reactos/dll/win32/netapi32        # Autosync
 reactos/dll/win32/ntdsapi         # Autosync
 reactos/dll/win32/ntprint         # Autosync