mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 18:15:11 +00:00
Sync to Wine-20050930:
Francois Gouget <fgouget@free.fr> - Fix .spec declarations for functinos with 64bit arguments (reported by winapi_check). Stefan Leichter <Stefan.Leichter@camLine.com> - Added version resource to shlwapi.dll. Alexandre Julliard <julliard@winehq.org> - Remove the 'L' suffix on a number of constants to avoid comparison errors on 64-bit platforms. - Take into account -noname functions when checking for duplicate export names. Fixed a couple of issues found by the stricter check. - Specify 64-bit integers as double instead of long long in spec files so that we get the correct number of arguments. - We are no longer generating .dbg.c files. Dmitry Timoshkov <dmitry@codeweavers.com> - Fix the usage of COLOR_xxx constants in the place of the window's class hbrBackground. Alexander N. Sørnes <alex@thehandofagony.com> - Added Norwegian translations. Marcus Meissner <marcus@jet.franken.de> - The last argument to MultiByteToWideChar is wide character count and not the buffer size in bytes. Fixed all places where it was wrong. svn path=/trunk/; revision=18356
This commit is contained in:
Gé van Geldorp
parent
644b190f61
commit
d2f8256c62
16 changed files with 389 additions and 324 deletions
|
|
@ -40,7 +40,7 @@ typedef struct tagSHLWAPI_CLIST
|
|||
typedef const SHLWAPI_CLIST* LPCSHLWAPI_CLIST;
|
||||
|
||||
/* ulId for contained SHLWAPI_CLIST items */
|
||||
#define CLIST_ID_CONTAINER (~0UL)
|
||||
#define CLIST_ID_CONTAINER (~0U)
|
||||
|
||||
HRESULT WINAPI SHAddDataBlock(LPSHLWAPI_CLIST*,LPCSHLWAPI_CLIST);
|
||||
|
||||
|
|
|
|||
|
|
@ -2593,7 +2593,7 @@ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle
|
|||
wc.hInstance = shlwapi_hInstance;
|
||||
wc.hIcon = NULL;
|
||||
wc.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW);
|
||||
wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW;
|
||||
wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
|
||||
wc.lpszMenuName = NULL;
|
||||
wc.lpszClassName = szClass;
|
||||
|
||||
|
|
@ -2880,7 +2880,7 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle
|
|||
wc.hInstance = shlwapi_hInstance;
|
||||
wc.hIcon = NULL;
|
||||
wc.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW);
|
||||
wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW;
|
||||
wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
|
||||
wc.lpszMenuName = NULL;
|
||||
wc.lpszClassName = szClass;
|
||||
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ LONG WINAPI SHRegOpenUSKeyW(LPCWSTR Path, REGSAM AccessType, HUSKEY hRelativeUSK
|
|||
|
||||
/* Create internal HUSKEY */
|
||||
hKey = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*hKey));
|
||||
lstrcpynW(hKey->lpszPath, Path, sizeof(hKey->lpszPath));
|
||||
lstrcpynW(hKey->lpszPath, Path, sizeof(hKey->lpszPath)/sizeof(WCHAR));
|
||||
|
||||
if (hRelativeUSKey)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,10 +23,13 @@
|
|||
#include "winuser.h"
|
||||
#include "resource.h"
|
||||
|
||||
#include "version.rc"
|
||||
|
||||
#include "shlwapi_De.rc"
|
||||
#include "shlwapi_En.rc"
|
||||
#include "shlwapi_Es.rc"
|
||||
#include "shlwapi_Nl.rc"
|
||||
#include "shlwapi_No.rc"
|
||||
#include "shlwapi_It.rc"
|
||||
#include "shlwapi_Ja.rc"
|
||||
#include "shlwapi_Pl.rc"
|
||||
|
|
|
|||
|
|
@ -546,7 +546,7 @@
|
|||
550 stub -noname GetTemplateInfoFromHandle
|
||||
551 stub -noname IShellFolder_CompareIDs
|
||||
|
||||
@ stdcall AssocCreate(long long long long ptr ptr)
|
||||
@ stdcall AssocCreate(double double ptr ptr)
|
||||
@ stdcall AssocIsDangerous(long)
|
||||
@ stdcall AssocQueryKeyA(long long str ptr ptr)
|
||||
@ stdcall AssocQueryKeyW(long long wstr ptr ptr)
|
||||
|
|
@ -768,11 +768,11 @@
|
|||
@ stdcall StrCpyW (ptr wstr)
|
||||
@ stdcall StrDupA (str)
|
||||
@ stdcall StrDupW (wstr)
|
||||
@ stdcall StrFormatByteSize64A(long long ptr long)
|
||||
@ stdcall StrFormatByteSize64A(double ptr long)
|
||||
@ stdcall StrFormatByteSizeA(long ptr long)
|
||||
@ stdcall StrFormatByteSizeW(long long ptr long)
|
||||
@ stdcall StrFormatKBSizeA(long long str long)
|
||||
@ stdcall StrFormatKBSizeW(long long wstr long)
|
||||
@ stdcall StrFormatByteSizeW(double ptr long)
|
||||
@ stdcall StrFormatKBSizeA(double str long)
|
||||
@ stdcall StrFormatKBSizeW(double wstr long)
|
||||
@ stdcall StrFromTimeIntervalA(ptr long long long)
|
||||
@ stdcall StrFromTimeIntervalW(ptr long long long)
|
||||
@ stdcall StrIsIntlEqualA(long str str long)
|
||||
|
|
|
|||
35
reactos/lib/shlwapi/shlwapi_No.rc
Normal file
35
reactos/lib/shlwapi/shlwapi_No.rc
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
/*
|
||||
* Norwegian Bokmål resources for shlwapi
|
||||
*
|
||||
* Copyright 2005 Alexander N. Sørnes <alex@thehandofagony.com>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
|
||||
|
||||
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
|
||||
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Feil"
|
||||
FONT 8, "MS Shell Dlg"
|
||||
{
|
||||
LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
|
||||
LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
|
||||
CHECKBOX "&Ikke vis denne meldingen igjen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
|
||||
PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
|
||||
PUSHBUTTON L"&Avbryt" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
|
||||
PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
|
||||
PUSHBUTTON L"&Nei" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
|
||||
}
|
||||
|
|
@ -1811,7 +1811,7 @@ HRESULT WINAPI SHStrDupA(LPCSTR lpszStr, LPWSTR * lppszDest)
|
|||
|
||||
if (*lppszDest)
|
||||
{
|
||||
MultiByteToWideChar(0, 0, lpszStr, -1, *lppszDest, len);
|
||||
MultiByteToWideChar(0, 0, lpszStr, -1, *lppszDest, len/sizeof(WCHAR));
|
||||
hRet = S_OK;
|
||||
}
|
||||
else
|
||||
|
|
|
|||
27
reactos/lib/shlwapi/version.rc
Normal file
27
reactos/lib/shlwapi/version.rc
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
/*
|
||||
* Copyright 2005
|
||||
*
|
||||
* Stefan Leichter
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#define WINE_FILENAME_STR "shlwapi.dll"
|
||||
#define WINE_FILEVERSION 6,0,2800,1692
|
||||
#define WINE_FILEVERSION_STR "6.0.2800.1692"
|
||||
#define WINE_PRODUCTVERSION 6,0,2800,1692
|
||||
#define WINE_PRODUCTVERSION_STR "6.0.2800.1692"
|
||||
|
||||
#include "wine/wine_common_ver.rc"
|
||||
Loading…
Reference in a new issue