[ros-diffs] [gvg] 14103: Sync to Wine-20050310:

Sync to Wine-20050310:
Dmitry Timoshkov <dmitry(a)codeweavers.com>
- Fix prototypes of GetClassLongA/W, GetClassLongPtrA/W and
  SetClassLongA/W according to SDK definitions.
- Add prototypes for SetClassLongPtrA/W, protect some GWL_ and GCL_
  constants from using in Wine or in _WIN64 mode.
- Fix all places in Wine affected by the above changes.
Jon Griffiths <jon_p_griffiths(a)yahoo.com>
- Documentation spelling fixes.
Thomas Weidenmueller <wine-patches(a)reactsoft.com>
- Forward to user32 when appropriate.
Alex Villacis Lasso <a_villacis(a)palosanto.com>
- Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL for LANG_SPANISH in all
  resources, so that Spanish locales other than Spain also use Spanish
  resources.
Modified: trunk/reactos/lib/shlwapi/assoc.c
Modified: trunk/reactos/lib/shlwapi/msgbox.c
Modified: trunk/reactos/lib/shlwapi/ordinal.c
Modified: trunk/reactos/lib/shlwapi/shlwapi.spec
Modified: trunk/reactos/lib/shlwapi/shlwapi_Es.rc
Modified: trunk/reactos/lib/shlwapi/string.c
  _____  

Modified: trunk/reactos/lib/shlwapi/assoc.c
--- trunk/reactos/lib/shlwapi/assoc.c	2005-03-15 21:30:32 UTC (rev
14102)
+++ trunk/reactos/lib/shlwapi/assoc.c	2005-03-15 21:36:47 UTC (rev
14103)
@@ -43,7 +43,7 @@

  *  when you right-click on a file).
  *
  * HELPERS
- * You can use this object tranparently by calling the helper functions
+ * You can use this object transparently by calling the helper
functions
  * AssocQueryKeyA(), AssocQueryStringA() and AssocQueryStringByKeyA().
These
  * create an IQueryAssociations object, perform the requested actions
  * and then dispose of the object. Alternatively, you can create an
instance
  _____  

Modified: trunk/reactos/lib/shlwapi/msgbox.c
--- trunk/reactos/lib/shlwapi/msgbox.c	2005-03-15 21:30:32 UTC (rev
14102)
+++ trunk/reactos/lib/shlwapi/msgbox.c	2005-03-15 21:36:47 UTC (rev
14103)
@@ -62,7 +62,7 @@

 /* Dialogue procedure for general message boxes */
 static INT_PTR CALLBACK SHDlgProcEx(HWND hDlg, UINT uMsg, WPARAM
wParam, LPARAM lParam)
 {
-  DLGDATAEX *d = (DLGDATAEX *)GetWindowLongW(hDlg, DWL_USER);
+  DLGDATAEX *d = (DLGDATAEX *)GetWindowLongPtrW(hDlg, DWLP_USER);
 
   TRACE("(%p,%u,%d,%ld) data %p\n", hDlg, uMsg, wParam, lParam, d);
 
@@ -71,7 +71,7 @@
   case WM_INITDIALOG:
   {
     /* FIXME: Not sure where native stores its lParam */
-    SetWindowLongW(hDlg, DWL_USER, lParam);
+    SetWindowLongPtrW(hDlg, DWLP_USER, lParam);
     d = (DLGDATAEX *)lParam;
     TRACE("WM_INITDIALOG: %p, %s,%p,%p\n", hDlg, debugstr_w(d->lpszId),
           d->dlgProc, (void*)d->lParam);
  _____  

Modified: trunk/reactos/lib/shlwapi/ordinal.c
--- trunk/reactos/lib/shlwapi/ordinal.c	2005-03-15 21:30:32 UTC (rev
14102)
+++ trunk/reactos/lib/shlwapi/ordinal.c	2005-03-15 21:36:47 UTC (rev
14103)
@@ -2397,7 +2397,7 @@

                          hWndParent, hMenu, shlwapi_hInstance, 0);
   if (hWnd)
   {
-    SetWindowLongA(hWnd, DWL_MSGRESULT, z);
+    SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, z);
 
     if (wndProc)
       SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc);
@@ -2684,7 +2684,7 @@
                          hWndParent, hMenu, shlwapi_hInstance, 0);
   if (hWnd)
   {
-    SetWindowLongW(hWnd, DWL_MSGRESULT, z);
+    SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, z);
 
     if (wndProc)
       SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc);
  _____  

Modified: trunk/reactos/lib/shlwapi/shlwapi.spec
--- trunk/reactos/lib/shlwapi/shlwapi.spec	2005-03-15 21:30:32 UTC
(rev 14102)
+++ trunk/reactos/lib/shlwapi/shlwapi.spec	2005-03-15 21:36:47 UTC
(rev 14103)
@@ -368,9 +368,9 @@

 368 stdcall @(wstr wstr ptr long wstr)
kernel32.GetPrivateProfileStructW
 369 stdcall @(wstr wstr ptr ptr long long ptr wstr ptr ptr)
kernel32.CreateProcessW
 370 stdcall -noname ExtractIconWrapW(long wstr long)
-371 stdcall DdeInitializeWrapW(ptr ptr long long) user32.DdeInitializeW
-372 stdcall DdeCreateStringHandleWrapW(long ptr long)
user32.DdeCreateStringHandleW
-373 stdcall DdeQueryStringWrapW(long ptr wstr long long)
user32.DdeQueryStringW
+371 stdcall -noname DdeInitializeWrapW(ptr ptr long long)
user32.DdeInitializeW
+372 stdcall -noname DdeCreateStringHandleWrapW(long ptr long)
user32.DdeCreateStringHandleW
+373 stdcall -noname DdeQueryStringWrapW(long ptr wstr long long)
user32.DdeQueryStringW
 374 stub -noname SHCheckDiskForMediaA
 375 stub -noname SHCheckDiskForMediaW
 376 stdcall -noname MLGetUILanguage()  #
kernel32.GetUserDefaultUILanguage
@@ -389,7 +389,7 @@
 389 stdcall -noname GetSaveFileNameWrapW(ptr)
 390 stdcall -noname WNetRestoreConnectionWrapW(long wstr)
 391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long)
-392 stdcall EndDialogWrap(ptr ptr) user32.EndDialog
+392 stdcall -noname EndDialogWrap(ptr ptr) user32.EndDialog
 393 stdcall @(long ptr long ptr long) user32.CreateDialogIndirectParamW
 394 stdcall @(long ptr long ptr long) user32.CreateDialogIndirectParamA
 395 stub -noname MLWinHelpA
@@ -456,8 +456,8 @@
 456 stdcall -noname PathIsValidCharW(long long)
 457 stub -noname GetLongPathNameWrapW
 458 stub -noname GetLongPathNameWrapA
-459 stdcall SHExpandEnvironmentStringsA(str ptr long)
kernel32.ExpandEnvironmentStringsA
-460 stdcall SHExpandEnvironmentStringsW(wstr ptr long)
kernel32.ExpandEnvironmentStringsW
+459 stdcall -noname SHExpandEnvironmentStringsA(str ptr long)
kernel32.ExpandEnvironmentStringsA
+460 stdcall -noname SHExpandEnvironmentStringsW(wstr ptr long)
kernel32.ExpandEnvironmentStringsW
 461 stdcall -noname SHGetAppCompatFlags(long)
 462 stub -noname UrlFixupW
 463 stub -noname SHExpandEnvironmentStringsForUserA
  _____  

Modified: trunk/reactos/lib/shlwapi/shlwapi_Es.rc
--- trunk/reactos/lib/shlwapi/shlwapi_Es.rc	2005-03-15 21:30:32 UTC
(rev 14102)
+++ trunk/reactos/lib/shlwapi/shlwapi_Es.rc	2005-03-15 21:36:47 UTC
(rev 14103)
@@ -18,7 +18,7 @@

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
  */
 
-LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
  _____  

Modified: trunk/reactos/lib/shlwapi/string.c
--- trunk/reactos/lib/shlwapi/string.c	2005-03-15 21:30:32 UTC (rev
14102)
+++ trunk/reactos/lib/shlwapi/string.c	2005-03-15 21:36:47 UTC (rev
14103)
@@ -534,7 +534,7 @@

 
/***********************************************************************
**
  * StrRStrIA	[SHLWAPI.@]
  *
- * Find the last occurence of a substring within a string.
+ * Find the last occurrence of a substring within a string.
  *
  * PARAMS
  *  lpszStr    [I] String to search in
@@ -542,7 +542,7 @@
  *  lpszSearch [I] String to look for
  *
  * RETURNS
- *  The last occurence lpszSearch within lpszStr, or NULL if not found.
+ *  The last occurrence lpszSearch within lpszStr, or NULL if not
found.
  */
 LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR
lpszSearch)
 {
@@ -711,7 +711,7 @@
  * NOTES
  *  Leading whitespace, '-' and '+' are allowed before the number. If
  *  dwFlags includes STIF_SUPPORT_HEX, hexadecimal numbers are allowed,
if
- *  preceeded by '0x'. If this flag is not set, or there is no '0x'
prefix,
+ *  preceded by '0x'. If this flag is not set, or there is no '0x'
prefix,
  *  the string is treated as a decimal string. A leading '-' is ignored
for
  *  hexadecimal numbers.
  */
@@ -1171,7 +1171,7 @@
 
/***********************************************************************
***
  * StrRChrA	[SHLWAPI.@]
  *
- * Find the last occurence of a character in string.
+ * Find the last occurrence of a character in string.
  *
  * PARAMS
  *  lpszStr [I] String to search in
@@ -1205,7 +1205,7 @@
 
/***********************************************************************
***
  * StrRChrIA	[SHLWAPI.@]
  *
- * Find the last occurence of a character in string, ignoring case.
+ * Find the last occurrence of a character in string, ignoring case.
  *
  * PARAMS
  *  lpszStr [I] String to search in