wine-commits November 2005

wine-commits@winehq.org

4 participants
575 discussions

wine/tools/winapi winapi_parser.pm
by Alexandre Julliard 04 Nov '05

04 Nov '05

ChangeSet ID: 21111 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:39:58 Modified files: tools/winapi : winapi_parser.pm Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> volatile is legal (and used now!) in a typedef struct {}. Patch: http://cvs.winehq.org/patch.py?id=21111 Old revision New revision Changes Path 1.6 1.7 +2 -1 wine/tools/winapi/winapi_parser.pm Index: wine/tools/winapi/winapi_parser.pm diff -u -p wine/tools/winapi/winapi_parser.pm:1.6 wine/tools/winapi/winapi_parser.pm:1.7 --- wine/tools/winapi/winapi_parser.pm:1.6 4 Nov 2005 11:39:58 -0000 +++ wine/tools/winapi/winapi_parser.pm 4 Nov 2005 11:39:58 -0000 @@ -359,8 +359,9 @@ sub parse_c_file($$) { $statements = undef; } elsif($in_type) { if(/^\s*((?:(?:FAR\s*)?\*\s*(?:RESTRICTED_POINTER\s+)?)? + (?:volatile\s+)? (?:\w+|WS$\w+$)\s* - (?:\s*,\s*(?:(?:FAR\s*)?\*+\s*(?:RESTRICTED_POINTER\s+)?)?(?:\w+|WS$\w+$))*\s*);/sx) { + (?:\s*,\s*(?:(?:FAR\s*)?\*+\s*(?:RESTRICTED_POINTER\s+)?)?(?:volatile\s+)?(?:\w+|WS$\w+$))*\s*);/sx) { my @parts = split(/\s*,\s*/, $1); &$type_end([@parts]); } elsif(/;/s) {

1 0

wine/ tools/winapi/win32.api include/imagehlp. ...
by Alexandre Julliard 04 Nov '05

04 Nov '05

ChangeSet ID: 21110 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:16:48 Modified files: tools/winapi : win32.api include : imagehlp.h dbghelp.h dlls/dbghelp : source.c Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Fix typo: PSYM_ENUMSOURCEFILES_CALLBACK instead of PSYM_ENUMSOURCFILES_CALLBACK. Patch: http://cvs.winehq.org/patch.py?id=21110 Old revision New revision Changes Path 1.52 1.53 +1 -1 wine/tools/winapi/win32.api 1.22 1.23 +2 -2 wine/include/imagehlp.h 1.15 1.16 +2 -2 wine/include/dbghelp.h 1.4 1.5 +1 -1 wine/dlls/dbghelp/source.c Index: wine/tools/winapi/win32.api diff -u -p wine/tools/winapi/win32.api:1.52 wine/tools/winapi/win32.api:1.53 --- wine/tools/winapi/win32.api:1.52 4 Nov 2005 11:16:48 -0000 +++ wine/tools/winapi/win32.api 4 Nov 2005 11:16:48 -0000 @@ -762,7 +762,7 @@ PMINIDUMP_USER_STREAM_INFORMATION PREAD_PROCESS_MEMORY_ROUTINE PSYM_ENUMERATESYMBOLS_CALLBACK PSYM_ENUMMODULES_CALLBACK -PSYM_ENUMSOURCFILES_CALLBACK +PSYM_ENUMSOURCEFILES_CALLBACK PSYM_ENUMSYMBOLS_CALLBACK PSYMBOL_REGISTERED_CALLBACK PSYMBOL_INFO Index: wine/include/imagehlp.h diff -u -p wine/include/imagehlp.h:1.22 wine/include/imagehlp.h:1.23 --- wine/include/imagehlp.h:1.22 4 Nov 2005 11:16:48 -0000 +++ wine/include/imagehlp.h 4 Nov 2005 11:16:48 -0000 @@ -366,7 +366,7 @@ typedef BOOL (CALLBACK *PSYM_ENUMERATESY PSYMBOL_INFO pSymInfo, DWORD SymbolSize, PVOID UserContext ); -typedef BOOL (CALLBACK *PSYM_ENUMSOURCFILES_CALLBACK)( +typedef BOOL (CALLBACK *PSYM_ENUMSOURCEFILES_CALLBACK)( PSOURCEFILE pSourceFile, PVOID UserContext ); @@ -554,7 +554,7 @@ BOOL WINAPI SymEnumerateSymbols( ); BOOL WINAPI SymEnumSourceFiles( HANDLE hProcess, DWORD ModBase, LPSTR Mask, - PSYM_ENUMSOURCFILES_CALLBACK cbSrcFiles, PVOID UserContext + PSYM_ENUMSOURCEFILES_CALLBACK cbSrcFiles, PVOID UserContext ); BOOL WINAPI SymEnumSymbols( HANDLE hProcess, DWORD BaseOfDll, PCSTR Mask, Index: wine/include/dbghelp.h diff -u -p wine/include/dbghelp.h:1.15 wine/include/dbghelp.h:1.16 --- wine/include/dbghelp.h:1.15 4 Nov 2005 11:16:48 -0000 +++ wine/include/dbghelp.h 4 Nov 2005 11:16:48 -0000 @@ -742,9 +742,9 @@ DWORD WINAPI UnDecorateSymbolName(LPCSTR /************************* * Source Files * *************************/ -typedef BOOL (CALLBACK *PSYM_ENUMSOURCFILES_CALLBACK)(PSOURCEFILE, PVOID); +typedef BOOL (CALLBACK *PSYM_ENUMSOURCEFILES_CALLBACK)(PSOURCEFILE, PVOID); -BOOL WINAPI SymEnumSourceFiles(HANDLE, ULONG64, LPSTR, PSYM_ENUMSOURCFILES_CALLBACK, +BOOL WINAPI SymEnumSourceFiles(HANDLE, ULONG64, LPSTR, PSYM_ENUMSOURCEFILES_CALLBACK, PVOID); BOOL WINAPI SymGetLineFromAddr(HANDLE, DWORD, PDWORD, PIMAGEHLP_LINE); BOOL WINAPI SymGetLinePrev(HANDLE, PIMAGEHLP_LINE); Index: wine/dlls/dbghelp/source.c diff -u -p wine/dlls/dbghelp/source.c:1.4 wine/dlls/dbghelp/source.c:1.5 --- wine/dlls/dbghelp/source.c:1.4 4 Nov 2005 11:16:48 -0000 +++ wine/dlls/dbghelp/source.c 4 Nov 2005 11:16:48 -0000 @@ -98,7 +98,7 @@ const char* source_get(const struct modu * */ BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, LPSTR Mask, - PSYM_ENUMSOURCFILES_CALLBACK cbSrcFiles, + PSYM_ENUMSOURCEFILES_CALLBACK cbSrcFiles, PVOID UserContext) { struct process* pcs;

1 0

wine/dlls/advapi32/tests registry.c
by Alexandre Julliard 04 Nov '05

04 Nov '05

ChangeSet ID: 21109 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:15:59 Modified files: dlls/advapi32/tests: registry.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> - RegConnectRegistryA fails on Win9x when Remote Registry Service is not installed (WinReg.DLL is missing). - Test "\\" prefixed computer names too. Patch: http://cvs.winehq.org/patch.py?id=21109 Old revision New revision Changes Path 1.33 1.34 +19 -2 wine/dlls/advapi32/tests/registry.c Index: wine/dlls/advapi32/tests/registry.c diff -u -p wine/dlls/advapi32/tests/registry.c:1.33 wine/dlls/advapi32/tests/registry.c:1.34 --- wine/dlls/advapi32/tests/registry.c:1.33 4 Nov 2005 11:15:59 -0000 +++ wine/dlls/advapi32/tests/registry.c 4 Nov 2005 11:15:59 -0000 @@ -601,22 +601,39 @@ static BOOL set_privileges(LPCSTR privil static void test_regconnectregistry( void) { CHAR compName[MAX_COMPUTERNAME_LENGTH + 1]; + CHAR netwName[MAX_COMPUTERNAME_LENGTH + 3]; /* 2 chars for double backslash */ DWORD len = sizeof(compName) ; BOOL ret; LONG retl; HKEY hkey; SC_HANDLE schnd; + DWORD GLE; ret = GetComputerNameA(compName, &len); ok( ret, "GetComputerName failed err = %ld\n", GetLastError()); if( !ret) return; + lstrcpyA(netwName, "\\\\"); + lstrcpynA(netwName+2, compName, MAX_COMPUTERNAME_LENGTH + 1); + retl = RegConnectRegistryA( compName, HKEY_LOCAL_MACHINE, &hkey); - ok( !retl, "RegConnectRegistryA failed err = %ld\n", retl); + ok( !retl || retl == ERROR_DLL_INIT_FAILED, "RegConnectRegistryA failed err = %ld\n", retl); + if( !retl) RegCloseKey( hkey); + + retl = RegConnectRegistryA( netwName, HKEY_LOCAL_MACHINE, &hkey); + ok( !retl || retl == ERROR_DLL_INIT_FAILED, "RegConnectRegistryA failed err = %ld\n", retl); if( !retl) RegCloseKey( hkey); schnd = OpenSCManagerA( compName, NULL, GENERIC_READ); - ok( schnd != NULL, "OpenSCManagerA failed err = %ld\n", GetLastError()); + GLE = GetLastError(); + ok( schnd != NULL || GLE==ERROR_CALL_NOT_IMPLEMENTED, + "OpenSCManagerA failed err = %ld\n", GLE); + CloseServiceHandle( schnd); + + schnd = OpenSCManagerA( netwName, NULL, GENERIC_READ); + GLE = GetLastError(); + ok( schnd != NULL || GLE==ERROR_CALL_NOT_IMPLEMENTED, + "OpenSCManagerA failed err = %ld\n", GLE); CloseServiceHandle( schnd); }

1 0

wine/dlls/shell32 shelllink.c
by Alexandre Julliard 04 Nov '05

04 Nov '05

ChangeSet ID: 21108 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:15:33 Modified files: dlls/shell32 : shelllink.c Log message: Mike McCormack <mike(a)codeweavers.com> Use advapi32.CommandLineFromMsiDescriptor to get msi component paths. Patch: http://cvs.winehq.org/patch.py?id=21108 Old revision New revision Changes Path 1.110 1.111 +14 -38 wine/dlls/shell32/shelllink.c Index: wine/dlls/shell32/shelllink.c diff -u -p wine/dlls/shell32/shelllink.c:1.110 wine/dlls/shell32/shelllink.c:1.111 --- wine/dlls/shell32/shelllink.c:1.110 4 Nov 2005 11:15:33 -0000 +++ wine/dlls/shell32/shelllink.c 4 Nov 2005 11:15:33 -0000 @@ -52,6 +52,7 @@ #include "shlguid.h" #include "shlwapi.h" #include "msi.h" +#include "appmgmt.h" #include "initguid.h" @@ -2413,50 +2414,25 @@ ShellLink_QueryContextMenu( IContextMenu return MAKE_HRESULT( SEVERITY_SUCCESS, 0, id ); } -static LPWSTR shelllink_get_msi_component_path( LPCWSTR component ) +static LPWSTR +shelllink_get_msi_component_path( LPWSTR component ) { - UINT (WINAPI *pMsiDecomposeDescriptorW)(LPCWSTR,LPWSTR,LPWSTR,LPWSTR,DWORD*); - INSTALLSTATE (WINAPI *pMsiGetComponentPathW)(LPCWSTR,LPCWSTR,LPWSTR,DWORD*); - WCHAR szProd[MAX_FEATURE_CHARS+1], szFeat[MAX_FEATURE_CHARS+1], - szComp[MAX_FEATURE_CHARS+1], szCompPath[MAX_PATH]; - INSTALLSTATE state; LPWSTR path = NULL; - HMODULE hmsi = NULL; - DWORD sz = 0; - UINT ret; + DWORD r, sz = 0; - TRACE("%s\n", debugstr_w( component ) ); - - hmsi = LoadLibraryA("msi"); - if (!hmsi) - goto end; - - pMsiDecomposeDescriptorW = (LPVOID) GetProcAddress(hmsi, "MsiDecomposeDescriptorW"); - pMsiGetComponentPathW = (LPVOID) GetProcAddress(hmsi, "MsiGetComponentPathW"); - if (!pMsiDecomposeDescriptorW || !pMsiGetComponentPathW) - goto end; - - ret = pMsiDecomposeDescriptorW( component, szProd, szFeat, szComp, &sz ); - if (ret != ERROR_SUCCESS) + r = CommandLineFromMsiDescriptor( component, NULL, &sz ); + if (r != ERROR_SUCCESS) + return path; + + sz++; + path = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); + r = CommandLineFromMsiDescriptor( component, path, &sz ); + if (r != ERROR_SUCCESS) { - ERR("failed to decompose descriptor %s\n", debugstr_w( component ) ); - goto end; + HeapFree( GetProcessHeap(), 0, path ); + path = NULL; } - sz = MAX_PATH; - state = pMsiGetComponentPathW( szProd, szComp, szCompPath, &sz ); - if (state != INSTALLSTATE_LOCAL) - { - ERR("MsiGetComponentPathW failed with error %d\n", ret ); - goto end; - } - - path = strdupW( szCompPath ); - -end: - if (hmsi) - FreeLibrary( hmsi ); - TRACE("returning %s\n", debugstr_w( path ) ); return path;

1 0

wine/dlls/advapi32 advapi32.spec advapi.c
by Alexandre Julliard 04 Nov '05

04 Nov '05

ChangeSet ID: 21107 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:15:18 Modified files: dlls/advapi32 : advapi32.spec advapi.c Log message: Mike McCormack <mike(a)codeweavers.com> Implement advapi32.CommandLineFromMsiDescriptor. It's a wrapper for msi.MsiProvideComponentFromDescriptor. Patch: http://cvs.winehq.org/patch.py?id=21107 Old revision New revision Changes Path 1.79 1.80 +1 -1 wine/dlls/advapi32/advapi32.spec 1.33 1.34 +19 -4 wine/dlls/advapi32/advapi.c Index: wine/dlls/advapi32/advapi32.spec diff -u -p wine/dlls/advapi32/advapi32.spec:1.79 wine/dlls/advapi32/advapi32.spec:1.80 --- wine/dlls/advapi32/advapi32.spec:1.79 4 Nov 2005 11:15:18 -0000 +++ wine/dlls/advapi32/advapi32.spec 4 Nov 2005 11:15:18 -0000 @@ -62,7 +62,7 @@ @ stdcall CloseEventLog (long) @ stdcall CloseServiceHandle(long) # @ stub CloseTrace -@ stdcall CommandLineFromMsiDescriptor(wstr wstr ptr) +@ stdcall CommandLineFromMsiDescriptor(wstr ptr ptr) # @ stub ComputeAccessTokenFromCodeAuthzLevel @ stdcall ControlService(long long ptr) # @ stub ControlTraceA Index: wine/dlls/advapi32/advapi.c diff -u -p wine/dlls/advapi32/advapi.c:1.33 wine/dlls/advapi32/advapi.c:1.34 --- wine/dlls/advapi32/advapi.c:1.33 4 Nov 2005 11:15:18 -0000 +++ wine/dlls/advapi32/advapi.c 4 Nov 2005 11:15:18 -0000 @@ -266,9 +266,24 @@ BOOL WINAPI LogonUserW( LPCWSTR lpszUser return TRUE; } -DWORD WINAPI CommandLineFromMsiDescriptor(WCHAR *Descriptor, WCHAR *CommandLine, - DWORD *CommandLineLength) +typedef UINT (WINAPI *fnMsiProvideComponentFromDescriptor)(LPCWSTR,LPWSTR,DWORD*,DWORD*); + +DWORD WINAPI CommandLineFromMsiDescriptor( WCHAR *szDescriptor, + WCHAR *szCommandLine, DWORD *pcchCommandLine ) { - FIXME("stub (%s)\n", debugstr_w(Descriptor)); - return ERROR_CALL_NOT_IMPLEMENTED; + static const WCHAR szMsi[] = { 'm','s','i',0 }; + fnMsiProvideComponentFromDescriptor mpcfd; + HMODULE hmsi; + UINT r = ERROR_CALL_NOT_IMPLEMENTED; + + TRACE("%s %p %p\n", debugstr_w(szDescriptor), szCommandLine, pcchCommandLine); + + hmsi = LoadLibraryW( szMsi ); + if (!hmsi) + return r; + mpcfd = (void*) GetProcAddress( hmsi, "MsiProvideComponentFromDescriptorW" ); + if (mpcfd) + r = mpcfd( szDescriptor, szCommandLine, pcchCommandLine, NULL ); + FreeLibrary( hmsi ); + return r; }

1 0

wine/dlls/hhctrl.ocx hhctrl.c
by Alexandre Julliard 04 Nov '05

04 Nov '05

ChangeSet ID: 21106 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:15:01 Modified files: dlls/hhctrl.ocx: hhctrl.c Log message: James Hawkins <truiken(a)gmail.com> Pass HtmlHelp commands to doWinMain. Patch: http://cvs.winehq.org/patch.py?id=21106 Old revision New revision Changes Path 1.8 1.9 +15 -4 wine/dlls/hhctrl.ocx/hhctrl.c Index: wine/dlls/hhctrl.ocx/hhctrl.c diff -u -p wine/dlls/hhctrl.ocx/hhctrl.c:1.8 wine/dlls/hhctrl.ocx/hhctrl.c:1.9 --- wine/dlls/hhctrl.ocx/hhctrl.c:1.8 4 Nov 2005 11:15: 1 -0000 +++ wine/dlls/hhctrl.ocx/hhctrl.c 4 Nov 2005 11:15: 1 -0000 @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); +int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine); + static const char *command_to_string(UINT command) { #define X(x) case x: return #x @@ -72,19 +74,28 @@ static const char *command_to_string(UIN HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) { - FIXME("(%p, %s, command=%s, data=%ld): stub\n", + CHAR *file = NULL; + + TRACE("(%p, %s, command=%s, data=%ld)\n", caller, debugstr_w( filename ), command_to_string( command ), data); + if (filename) + { + DWORD len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL ); + + file = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, filename, -1, file, len, NULL, NULL ); + } + switch (command) { case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOC: case HH_DISPLAY_SEARCH: case HH_HELP_CONTEXT: - MessageBoxA( NULL, "HTML Help functionality is currently unimplemented.\n\n" - "Try installing Internet Explorer, or using a native hhctrl.ocx with the Mozilla ActiveX control.", - "Wine", MB_OK | MB_ICONEXCLAMATION ); + FIXME("Not all HH cases handled correctly\n"); + doWinMain(GetModuleHandleW(NULL), file); default: return 0; }

1 0

wine/dlls/comctl32 string.c
by Alexandre Julliard 04 Nov '05

04 Nov '05

ChangeSet ID: 21105 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:14:53 Modified files: dlls/comctl32 : string.c Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Move functions in comctl32/string.c to remove function declaration. Patch: http://cvs.winehq.org/patch.py?id=21105 Old revision New revision Changes Path 1.8 1.9 +39 -44 wine/dlls/comctl32/string.c Index: wine/dlls/comctl32/string.c diff -u -p wine/dlls/comctl32/string.c:1.8 wine/dlls/comctl32/string.c:1.9 --- wine/dlls/comctl32/string.c:1.8 4 Nov 2005 11:14:53 -0000 +++ wine/dlls/comctl32/string.c 4 Nov 2005 11:14:53 -0000 @@ -40,11 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); -INT WINAPI StrCmpNA(LPCSTR, LPCSTR, INT); -INT WINAPI StrCmpNW(LPCWSTR, LPCWSTR, INT); -INT WINAPI StrCmpNIA(LPCSTR, LPCSTR, INT); -INT WINAPI StrCmpNIW(LPCWSTR, LPCWSTR, INT); - /************************************************************************* * COMCTL32_ChrCmpHelperA * @@ -179,6 +174,45 @@ LPSTR WINAPI StrChrA(LPCSTR lpszStr, WOR return NULL; } +/************************************************************************** + * StrCmpNIA [COMCTL32.353] + * + * Compare two strings, up to a maximum length, ignoring case. + * + * PARAMS + * lpszStr [I] First string to compare + * lpszComp [I] Second string to compare + * iLen [I] Maximum number of chars to compare. + * + * RETURNS + * An integer less than, equal to or greater than 0, indicating that + * lpszStr is less than, the same, or greater than lpszComp. + */ +INT WINAPI StrCmpNIA(LPCSTR lpszStr, LPCSTR lpszComp, INT iLen) +{ + INT iRet; + + TRACE("(%s,%s,%i)\n", debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); + + iRet = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen); + return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; +} + +/************************************************************************* + * StrCmpNIW [COMCTL32.361] + * + * See StrCmpNIA. + */ +INT WINAPI StrCmpNIW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen) +{ + INT iRet; + + TRACE("(%s,%s,%i)\n", debugstr_w(lpszStr), debugstr_w(lpszComp), iLen); + + iRet = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen); + return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; +} + /************************************************************************* * COMCTL32_StrStrHelperA * @@ -373,45 +407,6 @@ INT WINAPI StrCmpNA(LPCSTR lpszStr, LPCS } /************************************************************************** - * StrCmpNIA [COMCTL32.353] - * - * Compare two strings, up to a maximum length, ignoring case. - * - * PARAMS - * lpszStr [I] First string to compare - * lpszComp [I] Second string to compare - * iLen [I] Maximum number of chars to compare. - * - * RETURNS - * An integer less than, equal to or greater than 0, indicating that - * lpszStr is less than, the same, or greater than lpszComp. - */ -INT WINAPI StrCmpNIA(LPCSTR lpszStr, LPCSTR lpszComp, INT iLen) -{ - INT iRet; - - TRACE("(%s,%s,%i)\n", debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); - - iRet = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; -} - -/************************************************************************* - * StrCmpNIW [COMCTL32.361] - * - * See StrCmpNIA. - */ -INT WINAPI StrCmpNIW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen) -{ - INT iRet; - - TRACE("(%s,%s,%i)\n", debugstr_w(lpszStr), debugstr_w(lpszComp), iLen); - - iRet = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; -} - -/************************************************************************** * StrCmpNW [COMCTL32.360] * * See StrCmpNA.

1 0

wine/tools/winapi winapi_parser.pm winapi_loca ...
by Alexandre Julliard 04 Nov '05

04 Nov '05

ChangeSet ID: 21104 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:14:41 Modified files: tools/winapi : winapi_parser.pm winapi_local.pm winapi_function.pm Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> __RPC_STUB is a calling convention as well (#defined as __stdcall). Patch: http://cvs.winehq.org/patch.py?id=21104 Old revision New revision Changes Path 1.5 1.6 +3 -3 wine/tools/winapi/winapi_parser.pm 1.3 1.4 +2 -2 wine/tools/winapi/winapi_local.pm 1.2 1.3 +2 -2 wine/tools/winapi/winapi_function.pm Index: wine/tools/winapi/winapi_parser.pm diff -u -p wine/tools/winapi/winapi_parser.pm:1.5 wine/tools/winapi/winapi_parser.pm:1.6 --- wine/tools/winapi/winapi_parser.pm:1.5 4 Nov 2005 11:14:41 -0000 +++ wine/tools/winapi/winapi_parser.pm 4 Nov 2005 11:14:41 -0000 @@ -372,7 +372,7 @@ sub parse_c_file($$) { } next; } elsif(/(extern\s+|static\s+)?((struct\s+|union\s+|enum\s+|signed\s+|unsigned\s+)?\w+((\s*\*)+\s*|\s+)) - ((__cdecl|__stdcall|CDECL|NET_API_FUNCTION|RPC_ENTRY|VFWAPIV|VFWAPI|WINAPIV|WINAPI|CALLBACK)\s+)? + ((__cdecl|__stdcall|__RPC_STUB|CDECL|NET_API_FUNCTION|RPC_ENTRY|VFWAPIV|VFWAPI|WINAPIV|WINAPI|CALLBACK)\s+)? (\w+($\w+$)?)\s*$(.*?)$\s*(\{|\;)/sx) { my @lines = split(/\n/, $&); @@ -448,8 +448,8 @@ sub parse_c_file($$) { ((?:struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) (?:short\s+(?=int)|long\s+(?=int))?)?\w+)\s* ((?:const|volatile)?\s*(?:\*\s*(?:const|volatile)?\s*?)*)\s* - (?:__cdecl\s+|__stdcall\s+|CALLBACK\s+|CDECL\s+|NET_API_FUNCTION\s+|RPC_ENTRY\s+|STDMETHODCALLTYPE\s+|VFWAPIV\s+|VFWAPI\s+|WINAPIV\s+|WINAPI\s+)? - $\s*(?:__cdecl|__stdcall|CALLBACK|CDECL|NET_API_FUNCTION|RPC_ENTRY|STDMETHODCALLTYPE|VFWAPIV|VFWAPI|WINAPIV|WINAPI)?\s*\*\s*((?:\w+)?)\s*$\s* + (?:__cdecl\s+|__stdcall\s+|__RPC_STUB\s+|CALLBACK\s+|CDECL\s+|NET_API_FUNCTION\s+|RPC_ENTRY\s+|STDMETHODCALLTYPE\s+|VFWAPIV\s+|VFWAPI\s+|WINAPIV\s+|WINAPI\s+)? + $\s*(?:__cdecl|__stdcall|__RPC_STUB|CALLBACK|CDECL|NET_API_FUNCTION|RPC_ENTRY|STDMETHODCALLTYPE|VFWAPIV|VFWAPI|WINAPIV|WINAPI)?\s*\*\s*((?:\w+)?)\s*$\s* $\s*(.*?)\s*$$/x) { my $return_type = $1; Index: wine/tools/winapi/winapi_local.pm diff -u -p wine/tools/winapi/winapi_local.pm:1.3 wine/tools/winapi/winapi_local.pm:1.4 --- wine/tools/winapi/winapi_local.pm:1.3 4 Nov 2005 11:14:41 -0000 +++ wine/tools/winapi/winapi_local.pm 4 Nov 2005 11:14:41 -0000 @@ -85,7 +85,7 @@ sub _check_function($$$$$$) { $implemented_calling_convention = "cdecl"; } elsif($calling_convention =~ /^(?:VFWAPIV|WINAPIV)$/) { $implemented_calling_convention = "varargs"; - } elsif($calling_convention =~ /^(?:__stdcall|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif($calling_convention =~ /^(?:__stdcall|__RPC_STUB|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { if(defined($implemented_return_kind) && $implemented_return_kind =~ /^(?:s_word|word|void)$/) { $implemented_calling_convention = "pascal16"; } else { @@ -101,7 +101,7 @@ sub _check_function($$$$$$) { $implemented_calling_convention = "cdecl"; } elsif($calling_convention =~ /^(?:VFWAPIV|WINAPIV)$/) { $implemented_calling_convention = "varargs"; - } elsif($calling_convention =~ /^(?:__stdcall|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif($calling_convention =~ /^(?:__stdcall|__RPC_STUB|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { if(defined($implemented_return_kind) && $implemented_return_kind eq "longlong") { $implemented_calling_convention = "stdcall"; # FIXME: Check entry flags } else { Index: wine/tools/winapi/winapi_function.pm diff -u -p wine/tools/winapi/winapi_function.pm:1.2 wine/tools/winapi/winapi_function.pm:1.3 --- wine/tools/winapi/winapi_function.pm:1.2 4 Nov 2005 11:14:41 -0000 +++ wine/tools/winapi/winapi_function.pm 4 Nov 2005 11:14:41 -0000 @@ -309,7 +309,7 @@ sub calling_convention16($) { } elsif(/^(?:VFWAPIV|WINAPIV)$/) { if(!defined($suffix)) { return undef; } return "pascal$suffix"; # FIXME: Is this correct? - } elsif(/^(?:__stdcall|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif(/^(?:__stdcall|__RPC_STUB|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { if(!defined($suffix)) { return undef; } return "pascal$suffix"; } elsif($_ eq "__asm") { @@ -327,7 +327,7 @@ sub calling_convention32($) { return "cdecl"; } elsif(/^(?:VFWAPIV|WINAPIV)$/) { return "varargs"; - } elsif(/^(?:__stdcall|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif(/^(?:__stdcall|__RPC_STUB|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { return "stdcall"; } elsif($_ eq "__asm") { return "asm";

1 0

wine/include/wine port.h
by Alexandre Julliard 04 Nov '05

04 Nov '05

ChangeSet ID: 21103 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:14:22 Modified files: include/wine : port.h Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Fix warning about memmove re#definition. Patch: http://cvs.winehq.org/patch.py?id=21103 Old revision New revision Changes Path 1.69 1.70 +1 -0 wine/include/wine/port.h Index: wine/include/wine/port.h diff -u -p wine/include/wine/port.h:1.69 wine/include/wine/port.h:1.70 --- wine/include/wine/port.h:1.69 4 Nov 2005 11:14:22 -0000 +++ wine/include/wine/port.h 4 Nov 2005 11:14:22 -0000 @@ -456,6 +456,7 @@ extern int interlocked_xchg_add( int *de #define interlocked_xchg_add __WINE_NOT_PORTABLE(interlocked_xchg_add) #define lstat __WINE_NOT_PORTABLE(lstat) #define memcpy_unaligned __WINE_NOT_PORTABLE(memcpy_unaligned) +#undef memmove #define memmove __WINE_NOT_PORTABLE(memmove) #define pread __WINE_NOT_PORTABLE(pread) #define pwrite __WINE_NOT_PORTABLE(pwrite)

1 0

wine/dlls/winsock/tests sock.c
by Alexandre Julliard 04 Nov '05

04 Nov '05

ChangeSet ID: 21102 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:14:12 Modified files: dlls/winsock/tests: sock.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Make 4 WSAStringToAddress* tests don't fail on Win9x. Patch: http://cvs.winehq.org/patch.py?id=21102 Old revision New revision Changes Path 1.25 1.26 +17 -8 wine/dlls/winsock/tests/sock.c Index: wine/dlls/winsock/tests/sock.c diff -u -p wine/dlls/winsock/tests/sock.c:1.25 wine/dlls/winsock/tests/sock.c:1.26 --- wine/dlls/winsock/tests/sock.c:1.25 4 Nov 2005 11:14:12 -0000 +++ wine/dlls/winsock/tests/sock.c 4 Nov 2005 11:14:12 -0000 @@ -1179,6 +1179,7 @@ static void test_WSAStringToAddressA(voi { INT ret, len; SOCKADDR_IN sockaddr; + int GLE; CHAR address1[] = "0.0.0.0"; CHAR address2[] = "127.127.127.127"; @@ -1214,8 +1215,10 @@ static void test_WSAStringToAddressA(voi sockaddr.sin_addr.s_addr = 0; ret = WSAStringToAddressA( address3, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); - ok( !ret && sockaddr.sin_addr.s_addr == 0xffffffff, - "WSAStringToAddressA() failed unexpectedly: %d\n", WSAGetLastError() ); + GLE = WSAGetLastError(); + ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff) || + (ret == SOCKET_ERROR && GLE == ERROR_INVALID_PARAMETER), + "WSAStringToAddressA() failed unexpectedly: %d\n", GLE ); len = sizeof(sockaddr); sockaddr.sin_port = 0; @@ -1230,14 +1233,17 @@ static void test_WSAStringToAddressA(voi sockaddr.sin_addr.s_addr = 0; ret = WSAStringToAddressA( address5, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); - ok( !ret && sockaddr.sin_addr.s_addr == 0xffffffff && sockaddr.sin_port == 0xffff, - "WSAStringToAddressA() failed unexpectedly: %d\n", WSAGetLastError() ); + GLE = WSAGetLastError(); + ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff && sockaddr.sin_port == 0xffff) || + (ret == SOCKET_ERROR && GLE == ERROR_INVALID_PARAMETER), + "WSAStringToAddressA() failed unexpectedly: %d\n", GLE ); } static void test_WSAStringToAddressW(void) { INT ret, len; SOCKADDR_IN sockaddr; + int GLE; WCHAR address1[] = { '0','.','0','.','0','.','0', 0 }; WCHAR address2[] = { '1','2','7','.','1','2','7','.','1','2','7','.','1','2','7', 0 }; @@ -1275,8 +1281,10 @@ static void test_WSAStringToAddressW(voi sockaddr.sin_addr.s_addr = 0; ret = WSAStringToAddressW( address3, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); - ok( !ret && sockaddr.sin_addr.s_addr == 0xffffffff, - "WSAStringToAddressW() failed unexpectedly: %d\n", WSAGetLastError() ); + GLE = WSAGetLastError(); + ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff) || + (ret == SOCKET_ERROR && GLE == ERROR_INVALID_PARAMETER), + "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); len = sizeof(sockaddr); sockaddr.sin_port = 0; @@ -1291,8 +1299,9 @@ static void test_WSAStringToAddressW(voi sockaddr.sin_addr.s_addr = 0; ret = WSAStringToAddressW( address5, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); - ok( !ret && sockaddr.sin_addr.s_addr == 0xffffffff && sockaddr.sin_port == 0xffff, - "WSAStringToAddressW() failed unexpectedly: %d\n", WSAGetLastError() ); + ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff && sockaddr.sin_port == 0xffff) || + (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), + "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); } /**************** Main program ***************/

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2005