[TAPI32] Sync with Wine Staging 1.9.4. CORE-10912

svn path=/trunk/; revision=70936

diff --git a/reactos/dll/win32/tapi32/assisted.c b/reactos/dll/win32/tapi32/assisted.c
index 960081e..aab6863 100644 (file)
--- a/reactos/dll/win32/tapi32/assisted.c
+++ b/reactos/dll/win32/tapi32/assisted.c
@@ -46,7 +46,7 @@ DWORD WINAPI tapiGetLocationInfoW(LPWSTR countrycode, LPWSTR citycode)
          'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
          'T','e','l','e','p','h','o','n','y','\\','L','o','c','a','t','i','o','n','s',0};
 
          'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
          'T','e','l','e','p','h','o','n','y','\\','L','o','c','a','t','i','o','n','s',0};
 

-    if(!RegOpenKeyW(HKEY_LOCAL_MACHINE, locations_keyW, &hkey) != ERROR_SUCCESS) {
+    if(RegOpenKeyW(HKEY_LOCAL_MACHINE, locations_keyW, &hkey) == ERROR_SUCCESS) {

         valsize = sizeof( DWORD);
         if(!RegQueryValueExW(hkey, currentidW, 0, &type, (LPBYTE) &currid, &valsize) &&
            type == REG_DWORD) {
         valsize = sizeof( DWORD);
         if(!RegQueryValueExW(hkey, currentidW, 0, &type, (LPBYTE) &currid, &valsize) &&
            type == REG_DWORD) {

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index e6c4716..d3ce999 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -187,7 +187,7 @@ reactos/dll/win32/stdole32.tlb        # Synced to WineStaging-1.7.55
 reactos/dll/win32/sti                 # Synced to WineStaging-1.7.55
 reactos/dll/win32/sxs                 # Synced to WineStaging-1.7.55
 reactos/dll/win32/t2embed             # Synced to WineStaging-1.7.55
 reactos/dll/win32/sti                 # Synced to WineStaging-1.7.55
 reactos/dll/win32/sxs                 # Synced to WineStaging-1.7.55
 reactos/dll/win32/t2embed             # Synced to WineStaging-1.7.55

-reactos/dll/win32/tapi32              # Synced to WineStaging-1.7.55
+reactos/dll/win32/tapi32              # Synced to WineStaging-1.9.4

 reactos/dll/win32/traffic             # Synced to WineStaging-1.7.55
 reactos/dll/win32/twain_32            # Synced to WineStaging-1.7.55
 reactos/dll/win32/updspapi            # Synced to WineStaging-1.7.55
 reactos/dll/win32/traffic             # Synced to WineStaging-1.7.55
 reactos/dll/win32/twain_32            # Synced to WineStaging-1.7.55
 reactos/dll/win32/updspapi            # Synced to WineStaging-1.7.55