Ros-diffs

ros-diffs@reactos.org

81390 discussions

[winesync] 32854: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 04 Apr '08

04 Apr '08

Author: winesync Date: Fri Apr 4 09:15:40 2008 New Revision: 32854 URL: http://svn.reactos.org/svn/reactos?rev=32854&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/oleacc/main.c trunk/reactos/dll/win32/oleacc/oleacc.rbuild trunk/reactos/dll/win32/oleacc/oleacc.spec Modified: trunk/reactos/dll/win32/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] Fri Apr 4 09:15:40 2008 @@ -61,3 +61,9 @@ FIXME("\n"); return S_OK; } + +void WINAPI GetOleaccVersionInfo(DWORD* pVersion, DWORD* pBuild) +{ + *pVersion = MAKELONG(2,4); /* Windows XP version of oleacc: 4.2.5406.0 */ + *pBuild = MAKELONG(0,5406); +} Modified: trunk/reactos/dll/win32/oleacc/oleacc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rb… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.rbuild [iso-8859-1] Fri Apr 4 09:15:40 2008 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="oleacc" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true"> +<group> +<module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true" entrypoint="0"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="oleacc.spec.def" /> <include base="oleacc">.</include> @@ -8,9 +9,10 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> + <file>main.c</file> + <file>oleacc.spec</file> <library>wine</library> <library>kernel32</library> <library>ntdll</library> - <file>main.c</file> - <file>oleacc.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/oleacc/oleacc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.sp… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] Fri Apr 4 09:15:40 2008 @@ -7,7 +7,7 @@ @ stub CreateStdAccessibleProxyW @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() -@ stub GetOleaccVersionInfo +@ stdcall GetOleaccVersionInfo(ptr ptr) @ stub GetRoleTextA @ stub GetRoleTextW @ stub GetStateTextA

1 0

[winesync] 32853: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 04 Apr '08

04 Apr '08

Author: winesync Date: Fri Apr 4 08:51:01 2008 New Revision: 32853 URL: http://svn.reactos.org/svn/reactos?rev=32853&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/netapi32/nbt.c trunk/reactos/dll/win32/netapi32/netapi32.rbuild trunk/reactos/dll/win32/netapi32/wksta.c Modified: trunk/reactos/dll/win32/netapi32/nbt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbt.c?r… ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbt.c [iso-8859-1] Fri Apr 4 08:51:01 2008 @@ -1278,13 +1278,13 @@ { UCHAR ret; NetBTAdapter *adapter; - + if (!ipRow) return NRC_BADDR; adapter = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NetBTAdapter)); if (adapter) { - memcpy(&adapter->ipr, ipRow, sizeof(MIB_IPADDRROW)); + adapter->ipr = *ipRow; if (!NetBIOSRegisterAdapter(gTransportID, ipRow->dwIndex, adapter)) { NetBTCleanupAdapter(adapter); Modified: trunk/reactos/dll/win32/netapi32/netapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.rbuild [iso-8859-1] Fri Apr 4 08:51:01 2008 @@ -8,12 +8,6 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> - <library>wine</library> - <library>iphlpapi</library> - <library>ws2_32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>ntdll</library> <file>access.c</file> <file>apibuf.c</file> <file>browsr.c</file> @@ -27,5 +21,11 @@ <file>share.c</file> <file>wksta.c</file> <file>netapi32.spec</file> + <library>wine</library> + <library>iphlpapi</library> + <library>ws2_32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> </module> </group> Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Fri Apr 4 08:51:01 2008 @@ -308,6 +308,8 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, PBYTE* bufptr) { + NET_API_STATUS nastatus; + TRACE("(%s, %d, %p)\n", debugstr_w(reserved), level, bufptr); switch (level) { @@ -317,8 +319,10 @@ DWORD dwSize = UNLEN + 1; /* set up buffer */ - NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_0) + dwSize * sizeof(WCHAR), + nastatus = NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_0) + dwSize * sizeof(WCHAR), (LPVOID *) bufptr); + if (nastatus != NERR_Success) + return ERROR_NOT_ENOUGH_MEMORY; ui = (PWKSTA_USER_INFO_0) *bufptr; ui->wkui0_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_0)); @@ -329,11 +333,14 @@ NetApiBufferFree(ui); return ERROR_NOT_ENOUGH_MEMORY; } - else - NetApiBufferReallocate( + else { + nastatus = NetApiBufferReallocate( *bufptr, sizeof(WKSTA_USER_INFO_0) + (lstrlenW(ui->wkui0_username) + 1) * sizeof(WCHAR), (LPVOID *) bufptr); + if (nastatus != NERR_Success) + return nastatus; + } break; } @@ -356,7 +363,9 @@ /* get some information first to estimate size of the buffer */ ui0 = NULL; - NetWkstaUserGetInfo(NULL, 0, (PBYTE *) &ui0); + nastatus = NetWkstaUserGetInfo(NULL, 0, (PBYTE *) &ui0); + if (nastatus != NERR_Success) + return nastatus; username_sz = lstrlenW(ui0->wkui0_username) + 1; ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); @@ -376,10 +385,14 @@ LsaClose(PolicyHandle); /* set up buffer */ - NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_1) + + nastatus = NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_1) + (username_sz + logon_domain_sz + oth_domains_sz + logon_server_sz) * sizeof(WCHAR), (LPVOID *) bufptr); + if (nastatus != NERR_Success) { + NetApiBufferFree(ui0); + return nastatus; + } ui = (WKSTA_USER_INFO_1 *) *bufptr; ui->wkui1_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_1)); ui->wkui1_logon_domain = (LMSTR) ( @@ -414,9 +427,10 @@ /* FIXME see also wkui1_oth_domains for level 1 */ /* set up buffer */ - NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_1101) + dwSize * sizeof(WCHAR), + nastatus = NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_1101) + dwSize * sizeof(WCHAR), (LPVOID *) bufptr); - + if (nastatus != NERR_Success) + return nastatus; ui = (PWKSTA_USER_INFO_1101) *bufptr; ui->wkui1101_oth_domains = (LMSTR)(ui + 1); @@ -442,10 +456,9 @@ NetApiBufferAllocate(dwSize * sizeof(WCHAR), (LPVOID *) Buffer); if (GetComputerNameW(*Buffer, &dwSize)) { - NetApiBufferReallocate( + return NetApiBufferReallocate( *Buffer, (dwSize + 1) * sizeof(WCHAR), (LPVOID *) Buffer); - return NERR_Success; } else {

1 0

[winesync] 32852: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 04 Apr '08

04 Apr '08

Author: winesync Date: Fri Apr 4 08:49:05 2008 New Revision: 32852 URL: http://svn.reactos.org/svn/reactos?rev=32852&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc (with props) Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc trunk/reactos/dll/win32/msvfw32/msvideo_main.c trunk/reactos/dll/win32/msvfw32/rsrc.rc Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/drawdib.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/drawdib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/drawdib.c [iso-8859-1] Fri Apr 4 08:49:05 2008 @@ -133,6 +133,8 @@ TRACE("(%p)\n", hdd); + if (!whdd) return FALSE; + whdd->hpal = 0; /* Do not free this */ whdd->hdc = 0; HeapFree(GetProcessHeap(), 0, whdd->lpbi); Modified: trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild [iso-8859-1] Fri Apr 4 08:49:05 2008 @@ -8,6 +8,11 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> + <file>mciwnd.c</file> + <file>msvideo_main.c</file> + <file>drawdib.c</file> + <file>rsrc.rc</file> + <file>msvfw32.spec</file> <library>wine</library> <library>winmm</library> <library>version</library> @@ -17,10 +22,5 @@ <library>advapi32</library> <library>kernel32</library> <library>ntdll</library> - <file>mciwnd.c</file> - <file>msvideo_main.c</file> - <file>drawdib.c</file> - <file>rsrc.rc</file> - <file>msvfw32.spec</file> </module> </group> Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc [iso-8859-1] Fri Apr 4 08:49:05 2008 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc [iso-8859-1] Fri Apr 4 08:49:05 2008 @@ -1,0 +1,51 @@ +/* + * Copyright 2008 Frans Kool + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Video Compressie" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "Annuleren",IDCANCEL,129,18,49,14 + + LTEXT "&Compressor:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Con&figureer...",882,129,36,49,14 + PUSHBUTTON "&Over...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Compressie &Kwaliteit:",886,9,34,80,8 + + CONTROL "&Key Frame Elke",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "frames",889,103,62,26,10 + + CONTROL "&Data Snelheid",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Volledige Frames (Ongecomprimeerd)" +} Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] Fri Apr 4 08:49:05 2008 @@ -753,7 +753,7 @@ idx = SendMessageW(list, CB_ADDSTRING, 0, (LPARAM)icinfo.szDescription); ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); - memcpy(&ic->icinfo, &icinfo, sizeof(ICINFO)); + ic->icinfo = icinfo; ic->hic = hic; SendMessageW(list, CB_SETITEMDATA, idx, (LPARAM)ic); } @@ -1449,7 +1449,7 @@ if (!pc->lpbiIn) return FALSE; - memcpy(pc->lpbiIn, lpbiIn, sizeof(BITMAPINFO)); + *pc->lpbiIn = *lpbiIn; pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage); if (!pc->lpBitsPrev) { Modified: trunk/reactos/dll/win32/msvfw32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/rsrc.rc [iso-8859-1] Fri Apr 4 08:49:05 2008 @@ -26,6 +26,7 @@ #include "msvfw32_Fr.rc" #include "msvfw32_Hu.rc" #include "msvfw32_Ko.rc" +#include "msvfw32_Nl.rc" #include "msvfw32_No.rc" #include "msvfw32_Pl.rc" #include "msvfw32_Sv.rc"

1 0

[winesync] 32851: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 04 Apr '08

04 Apr '08

Author: winesync Date: Fri Apr 4 08:46:58 2008 New Revision: 32851 URL: http://svn.reactos.org/svn/reactos?rev=32851&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild [iso-8859-1] Fri Apr 4 08:46:58 2008 @@ -8,11 +8,11 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> + <file>msvcrt20.c</file> + <file>msvcrt20.spec</file> <library>wine</library> <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> - <file>msvcrt20.c</file> - <file>msvcrt20.spec</file> </module> </group> Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] Fri Apr 4 08:46:58 2008 @@ -566,10 +566,10 @@ @ varargs _execle(str str) msvcrt._execle @ varargs _execlp(str str) msvcrt._execlp @ varargs _execlpe(str str) msvcrt._execlpe -@ cdecl _execv(str str) msvcrt._execv -@ cdecl _execve(str str str) msvcrt._execve -@ cdecl _execvp(str str) msvcrt._execvp -@ cdecl _execvpe(str str str) msvcrt._execvpe +@ cdecl _execv(str ptr) msvcrt._execv +@ cdecl _execve(str ptr ptr) msvcrt._execve +@ cdecl _execvp(str ptr) msvcrt._execvp +@ cdecl _execvpe(str ptr ptr) msvcrt._execvpe @ cdecl _exit(long) msvcrt._exit @ cdecl _expand(ptr long) msvcrt._expand @ cdecl _fcloseall() msvcrt._fcloseall @@ -596,7 +596,7 @@ @ cdecl _fsopen(str str long) msvcrt._fsopen @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl _ftol() msvcrt._ftol +@ cdecl -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt( double long str) msvcrt._gcvt

1 0

[hpoussin] 32850: Add some prototypes
by hpoussin＠svn.reactos.org 04 Apr '08

04 Apr '08

Author: hpoussin Date: Fri Apr 4 08:44:06 2008 New Revision: 32850 URL: http://svn.reactos.org/svn/reactos?rev=32850&view=rev Log: Add some prototypes Added: trunk/reactos/include/psdk/propvarutil.h (with props) Modified: trunk/reactos/include/psdk/msi.h trunk/reactos/include/psdk/propidl.idl Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=328… ============================================================================== --- trunk/reactos/include/psdk/msi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msi.h [iso-8859-1] Fri Apr 4 08:44:06 2008 @@ -348,7 +348,7 @@ /* Source List Info */ #define INSTALLPROPERTY_LASTUSEDSOURCEA "LastUsedSource" static const WCHAR INSTALLPROPERTY_LASTUSEDSOURCEW[] = {'L','a','s','t','U','s','e','d','S','o','u','r','c','e',0}; -#define INSTALLPROPERTY_LASTUSEDSOURCE WINELIB_NAME_AW(INSTALLPROPERTY_LASTUSEDSOURCEW) +#define INSTALLPROPERTY_LASTUSEDSOURCE WINELIB_NAME_AW(INSTALLPROPERTY_LASTUSEDSOURCE) #define INSTALLPROPERTY_LASTUSEDTYPEA "LastUsedType" static const WCHAR INSTALLPROPERTY_LASTUSEDTYPEW[] = {'L','a','s','t','U','s','e','d','T','y','p','e',0}; @@ -385,6 +385,10 @@ UINT WINAPI MsiApplyPatchW(LPCWSTR, LPCWSTR, INSTALLTYPE, LPCWSTR); #define MsiApplyPatch WINELIB_NAME_AW(MsiApplyPatch) +UINT WINAPI MsiEnumComponentCostsA(MSIHANDLE, LPCSTR, DWORD, INSTALLSTATE, LPSTR, LPDWORD, LPINT, LPINT); +UINT WINAPI MsiEnumComponentCostsW(MSIHANDLE, LPCWSTR, DWORD, INSTALLSTATE, LPWSTR, LPDWORD, LPINT, LPINT); +#define MsiEnumComponentCosts WINELIB_NAME_AW(MsiEnumComponentCosts) + UINT WINAPI MsiEnumProductsA(DWORD, LPSTR); UINT WINAPI MsiEnumProductsW(DWORD, LPWSTR); #define MsiEnumProducts WINELIB_NAME_AW(MsiEnumProducts) @@ -457,6 +461,10 @@ UINT WINAPI MsiGetProductInfoW(LPCWSTR, LPCWSTR, LPWSTR, LPDWORD); #define MsiGetProductInfo WINELIB_NAME_AW(MsiGetProductInfo) +UINT WINAPI MsiGetProductInfoExA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPSTR, LPDWORD); +UINT WINAPI MsiGetProductInfoExW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, LPCWSTR, LPWSTR, LPDWORD); +#define MsiGetProductInfoEx WINELIB_NAME_AW(MsiGetProductInfoEx) + UINT WINAPI MsiEnableLogA(DWORD, LPCSTR, DWORD); UINT WINAPI MsiEnableLogW(DWORD, LPCWSTR, DWORD); #define MsiEnableLog WINELIB_NAME_AW(MsiEnableLog) @@ -541,6 +549,16 @@ UINT WINAPI MsiSourceListAddSourceW(LPCWSTR, LPCWSTR, DWORD, LPCWSTR); #define MsiSourceListAddSource WINELIB_NAME_AW(MsiSourceListAddSource) +UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPDWORD, + LPSTR, LPDWORD, LPSTR, LPDWORD); +UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPDWORD, + LPWSTR, LPDWORD, LPWSTR, LPDWORD); +#define MsiSourceListEnumMediaDisks WINELIB_NAME_AW(MsiSourceListEnumMediaDisks) + +UINT WINAPI MsiSourceListEnumSourcesA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPSTR, LPDWORD); +UINT WINAPI MsiSourceListEnumSourcesW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWSTR, LPDWORD); +#define MsiSourceListEnumSources WINELIB_NAME_AW(MsiSourceListEnumSources) + UINT WINAPI MsiSourceListClearAllA(LPCSTR, LPCSTR, DWORD); UINT WINAPI MsiSourceListClearAllW(LPCWSTR, LPCWSTR, DWORD); #define MsiSourceListClearAll WINELIB_NAME_AW(MsiSourceListClearAll) @@ -572,6 +590,10 @@ UINT WINAPI MsiAdvertiseScriptA(LPCSTR, DWORD, PHKEY, BOOL); UINT WINAPI MsiAdvertiseScriptW(LPCWSTR, DWORD, PHKEY, BOOL); #define MsiAdvertiseScript WINELIB_NAME_AW(MsiAdvertiseScript) + +UINT WINAPI MsiIsProductElevatedA(LPCSTR, BOOL *); +UINT WINAPI MsiIsProductElevatedW(LPCWSTR, BOOL *); +#define MsiIsProductElevated WINELIB_NAME_AW(MsiIsProductElevated) /* Non Unicode */ UINT WINAPI MsiCloseHandle(MSIHANDLE); Modified: trunk/reactos/include/psdk/propidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propidl.idl?r… ============================================================================== --- trunk/reactos/include/psdk/propidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/propidl.idl [iso-8859-1] Fri Apr 4 08:44:06 2008 @@ -18,9 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "objidl.idl"; import "oaidl.idl"; - +#endif /* * Windows SDK braindamage alert @@ -205,6 +206,8 @@ typedef struct tagPROPVARIANT *LPPROPVARIANT; + cpp_quote("#define REFPROPVARIANT const PROPVARIANT *") + cpp_quote("#define PIDDI_THUMBNAIL 0x00000002L /* VT_BLOB */") cpp_quote("") cpp_quote("#define PIDSI_TITLE 0x00000002L /* VT_LPSTR */") Added: trunk/reactos/include/psdk/propvarutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propvarutil.h… ============================================================================== --- trunk/reactos/include/psdk/propvarutil.h (added) +++ trunk/reactos/include/psdk/propvarutil.h [iso-8859-1] Fri Apr 4 08:44:06 2008 @@ -1,0 +1,41 @@ +/* + * Copyright 2008 James Hawkins for CodeWeavers + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_PROPVARUTIL_H +#define __WINE_PROPVARUTIL_H + +#include <propidl.h> +#include <shtypes.h> +#include <shlwapi.h> + +enum tagPROPVAR_CHANGE_FLAGS +{ + PVCHF_DEFAULT = 0x00000000, + PVCHF_NOVALUEPROP = 0x00000001, + PVCHF_ALPHABOOL = 0x00000002, + PVCHF_NOUSEROVERRIDE = 0x00000004, + PVCHF_LOCALBOOL = 0x00000008, + PVCHF_NOHEXSTRING = 0x00000010, +}; + +typedef int PROPVAR_CHANGE_FLAGS; + +HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, + PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); + +#endif /* __WINE_PROPVARUTIL_H */ Propchange: trunk/reactos/include/psdk/propvarutil.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[winesync] 32849: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 04 Apr '08

04 Apr '08

Author: winesync Date: Fri Apr 4 08:43:40 2008 New Revision: 32849 URL: http://svn.reactos.org/svn/reactos?rev=32849&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/cond.y trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/events.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/format.c trunk/reactos/dll/win32/msi/join.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/msi_Ko.rc trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiserver.idl trunk/reactos/dll/win32/msi/msiserver_dispids.h trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/record.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/source.c trunk/reactos/dll/win32/msi/streams.c trunk/reactos/dll/win32/msi/suminfo.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/dll/win32/msi/where.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?… Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… Modified: trunk/reactos/dll/win32/msi/cond.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.y?rev=3… Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… Modified: trunk/reactos/dll/win32/msi/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/events.c?rev… Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… Modified: trunk/reactos/dll/win32/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/format.c?rev… Modified: trunk/reactos/dll/win32/msi/join.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/join.c?rev=3… Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=32… Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… Modified: trunk/reactos/dll/win32/msi/msi_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Ko.rc?re… Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… Modified: trunk/reactos/dll/win32/msi/msiserver.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.id… Modified: trunk/reactos/dll/win32/msi/msiserver_dispids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver_di… Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… Modified: trunk/reactos/dll/win32/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/record.c?rev… Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… Modified: trunk/reactos/dll/win32/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/source.c?rev… Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… Modified: trunk/reactos/dll/win32/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?re… Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… Modified: trunk/reactos/dll/win32/msi/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/where.c?rev=…

1 0

[winesync] 32848: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 04 Apr '08

04 Apr '08

Author: winesync Date: Fri Apr 4 08:28:59 2008 New Revision: 32848 URL: http://svn.reactos.org/svn/reactos?rev=32848&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/mpr/mpr.rbuild trunk/reactos/dll/win32/mpr/mpr_Nl.rc trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.rbuild [iso-8859-1] Fri Apr 4 08:28:59 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll" allowwarnings="true"> <importlibrary definition="mpr.spec.def" /> <include base="mpr">.</include> @@ -7,11 +8,6 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> - <library>wine</library> - <library>user32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>ntdll</library> <file>auth.c</file> <file>mpr_main.c</file> <file>multinet.c</file> @@ -20,4 +16,10 @@ <file>wnet.c</file> <file>mpr.rc</file> <file>mpr.spec</file> + <library>wine</library> + <library>user32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> </module> +</group> Modified: trunk/reactos/dll/win32/mpr/mpr_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Nl.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Nl.rc [iso-8859-1] Fri Apr 4 08:28:59 2008 @@ -2,6 +2,7 @@ * Dutch resources for MPR * * Copyright (C) 2004 Hans Leidekker + * Copyright (C) 2008 Frans Kool * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,3 +25,23 @@ { IDS_ENTIRENETWORK "Gehele netwerk" } + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Voer het Netwerk Wachtwoord in" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Voer a.u.b uw gebruikersnaam en wachtwoord in:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Gebruiker", -1, 40, 66, 50, 10 + LTEXT "Wachtwoord", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Sla dit wachtwoord op (Onveilig)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=3… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Fri Apr 4 08:28:59 2008 @@ -279,16 +279,18 @@ { PWSTR ptrPrev; int entireNetworkLen; + LPCWSTR stringresource; entireNetworkLen = LoadStringW(hInstDll, - IDS_ENTIRENETWORK, NULL, 0); + IDS_ENTIRENETWORK, (LPWSTR)&stringresource, 0); providerTable->entireNetwork = HeapAlloc( GetProcessHeap(), 0, (entireNetworkLen + 1) * sizeof(WCHAR)); if (providerTable->entireNetwork) - LoadStringW(hInstDll, IDS_ENTIRENETWORK, - providerTable->entireNetwork, - entireNetworkLen + 1); + { + memcpy(providerTable->entireNetwork, stringresource, entireNetworkLen*sizeof(WCHAR)); + providerTable->entireNetwork[entireNetworkLen] = 0; + } providerTable->numAllocated = numToAllocate; for (ptr = providers; ptr; ) { @@ -355,7 +357,7 @@ { size_t len; - memcpy(ret, lpNet, sizeof(ret)); + *ret = *lpNet; ret->lpLocalName = ret->lpComment = ret->lpProvider = NULL; if (lpNet->lpRemoteName) {

1 0

[winesync] 32847: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 04 Apr '08

04 Apr '08

Author: winesync Date: Fri Apr 4 08:26:49 2008 New Revision: 32847 URL: http://svn.reactos.org/svn/reactos?rev=32847&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/mlang/mlang.c trunk/reactos/dll/win32/mlang/mlang.rbuild trunk/reactos/dll/win32/mlang/mlang.spec Modified: trunk/reactos/dll/win32/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.c?re… ============================================================================== --- trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] Fri Apr 4 08:26:49 2008 @@ -46,6 +46,7 @@ #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); +static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum); static DWORD MLANG_tls_index; /* to store various per thead data */ @@ -761,6 +762,38 @@ return E_FAIL; } +HRESULT WINAPI Rfc1766ToLcidW(LCID *pLocale, LPCWSTR pszRfc1766) +{ + IEnumRfc1766 *enumrfc1766; + HRESULT hr; + + TRACE("(%p, %s)\n", pLocale, debugstr_w(pszRfc1766)); + + if (!pLocale || !pszRfc1766) + return E_INVALIDARG; + + *pLocale = 0; + + hr = EnumRfc1766_create(0, &enumrfc1766); + if (FAILED(hr)) + return hr; + + hr = lcid_from_rfc1766(enumrfc1766, pLocale, pszRfc1766); + IEnumRfc1766_Release(enumrfc1766); + + return hr; +} + +HRESULT WINAPI Rfc1766ToLcidA(LCID *lcid, LPCSTR rfc1766A) +{ + WCHAR rfc1766W[MAX_RFC1766_NAME + 1]; + + MultiByteToWideChar(CP_ACP, 0, rfc1766A, -1, rfc1766W, MAX_RFC1766_NAME); + rfc1766W[MAX_RFC1766_NAME] = 0; + + return Rfc1766ToLcidW(lcid, rfc1766W); +} + /****************************************************************************** * MLANG ClassFactory */ @@ -1868,13 +1901,12 @@ return TRUE; } -static HRESULT EnumRfc1766_create(MLang_impl* mlang, LANGID LangId, - IEnumRfc1766 **ppEnum) +static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum) { EnumRfc1766_impl *rfc; struct enum_locales_data data; - TRACE("%p, %04x, %p\n", mlang, LangId, ppEnum); + TRACE("%04x, %p\n", LangId, ppEnum); rfc = HeapAlloc( GetProcessHeap(), 0, sizeof(EnumRfc1766_impl) ); rfc->vtbl_IEnumRfc1766 = &IEnumRfc1766_vtbl; @@ -1918,7 +1950,7 @@ ICOM_THIS_MULTI(MLang_impl, vtbl_IMultiLanguage, iface); TRACE("%p %p\n", This, ppEnumRfc1766); - return EnumRfc1766_create(This, 0, ppEnumRfc1766); + return EnumRfc1766_create(0, ppEnumRfc1766); } /******************************************************************************/ @@ -2243,7 +2275,7 @@ ICOM_THIS_MULTI(MLang_impl, vtbl_IMultiLanguage, iface); TRACE("%p %p\n", This, ppEnumRfc1766); - return EnumRfc1766_create(This, LangId, ppEnumRfc1766); + return EnumRfc1766_create(LangId, ppEnumRfc1766); } static HRESULT WINAPI fnIMultiLanguage2_GetRfc1766Info( Modified: trunk/reactos/dll/win32/mlang/mlang.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.rbui… ============================================================================== --- trunk/reactos/dll/win32/mlang/mlang.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/mlang.rbuild [iso-8859-1] Fri Apr 4 08:26:49 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="mlang" type="win32dll" baseaddress="${BASEADDRESS_MLANG}" installbase="system32" installname="mlang.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="mlang.spec.def" /> @@ -8,16 +9,17 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> + <file>mlang.c</file> + <file>regsvr.c</file> + <file>mlang.spec</file> <library>wine</library> <library>ole32</library> <library>user32</library> <library>gdi32</library> <library>advapi32</library> <library>kernel32</library> - <library>ntdll</library> <library>oleaut32</library> <library>uuid</library> - <file>mlang.c</file> - <file>regsvr.c</file> - <file>mlang.spec</file> + <library>ntdll</library> </module> +</group> Modified: trunk/reactos/dll/win32/mlang/mlang.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.spec… ============================================================================== --- trunk/reactos/dll/win32/mlang/mlang.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/mlang.spec [iso-8859-1] Fri Apr 4 08:26:49 2008 @@ -10,5 +10,5 @@ @ stdcall IsConvertINetStringAvailable(long long) @ stdcall LcidToRfc1766A(long ptr long) @ stdcall LcidToRfc1766W(long ptr long) -@ stub Rfc1766ToLcidA -@ stub Rfc1766ToLcidW +@ stdcall Rfc1766ToLcidA(ptr str) +@ stdcall Rfc1766ToLcidW(ptr wstr)

1 0

[hpoussin] 32846: Try to fix build
by hpoussin＠svn.reactos.org 04 Apr '08

04 Apr '08

Author: hpoussin Date: Fri Apr 4 08:24:40 2008 New Revision: 32846 URL: http://svn.reactos.org/svn/reactos?rev=32846&view=rev Log: Try to fix build Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=32… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Fri Apr 4 08:24:40 2008 @@ -51,7 +51,7 @@ #include "shldisp.h" #include "comcat.h" #include "urlmon.h" -#include "mapiguid.h" + #include "activscp.h" #include "dispex.h" #include "mlang.h"

1 0

[winesync] 32845: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 04 Apr '08

04 Apr '08

Author: winesync Date: Fri Apr 4 08:24:16 2008 New Revision: 32845 URL: http://svn.reactos.org/svn/reactos?rev=32845&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/mapi32/mapi32.rbuild trunk/reactos/dll/win32/mapi32/mapi32.spec trunk/reactos/dll/win32/mapi32/mapi32_main.c trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/dll/win32/mapi32/util.c Modified: trunk/reactos/dll/win32/mapi32/mapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.rb… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.rbuild [iso-8859-1] Fri Apr 4 08:24:16 2008 @@ -8,17 +8,17 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> + <file>imalloc.c</file> + <file>mapi32_main.c</file> + <file>prop.c</file> + <file>sendmail.c</file> + <file>util.c</file> + <file>mapi32.spec</file> <library>wine</library> <library>shlwapi</library> <library>shell32</library> <library>kernel32</library> <library>uuid</library> <library>ntdll</library> - <file>imalloc.c</file> - <file>mapi32_main.c</file> - <file>prop.c</file> - <file>sendmail.c</file> - <file>util.c</file> - <file>mapi32.spec</file> </module> </group> Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.sp… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.spec [iso-8859-1] Fri Apr 4 08:24:16 2008 @@ -54,7 +54,7 @@ 72 stdcall FEqualNames@8(ptr ptr) FEqualNames 73 stub WrapStoreEntryID@24 74 stdcall IsBadBoundedStringPtr@8(ptr long) IsBadBoundedStringPtr - 75 stub HrQueryAllRows@24 + 75 stdcall HrQueryAllRows@24(ptr ptr ptr ptr long ptr) HrQueryAllRows 76 stdcall PropCopyMore@16(ptr ptr ptr ptr) PropCopyMore 77 stdcall UlPropSize@4(ptr) UlPropSize 78 stdcall FPropContainsProp@12(ptr ptr long) FPropContainsProp Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_ma… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] Fri Apr 4 08:24:16 2008 @@ -24,6 +24,7 @@ #include "winbase.h" #include "winerror.h" #include "objbase.h" +#include "initguid.h" #include "mapix.h" #include "mapiform.h" #include "mapi.h" Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] Fri Apr 4 08:24:16 2008 @@ -83,7 +83,7 @@ case PT_CLSID: scode = lpMore(sizeof(GUID), lpOrig, (LPVOID*)&lpDest->Value.lpguid); if (SUCCEEDED(scode)) - memcpy(lpDest->Value.lpguid, lpSrc->Value.lpguid, sizeof(GUID)); + *lpDest->Value.lpguid = *lpSrc->Value.lpguid; break; case PT_STRING8: ulLen = lstrlenA(lpSrc->Value.lpszA) + 1u; @@ -810,7 +810,7 @@ { case PT_CLSID: lpDest->Value.lpguid = (LPGUID)lpDataDest; - memcpy(lpDest->Value.lpguid, lpProps->Value.lpguid, sizeof(GUID)); + *lpDest->Value.lpguid = *lpProps->Value.lpguid; lpDataDest += sizeof(GUID); break; case PT_STRING8: Modified: trunk/reactos/dll/win32/mapi32/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] Fri Apr 4 08:24:16 2008 @@ -890,3 +890,15 @@ } return ret; } + +/************************************************************************** + * HrQueryAllRows (MAPI32.75) + */ +HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags, + LPSRestriction lpRestriction, LPSSortOrderSet lpSortOrderSet, + LONG crowsMax, LPSRowSet *lppRows) +{ + FIXME("(%p, %p, %p, %p, %d, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); + *lppRows = NULL; + return MAPI_E_CALL_FAILED; +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs