Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[gvg] 12984: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/shlwapi/Wine-20050111/ Modified: vendor/wine/dlls/shlwapi/Wine-20050111/msgbox.c Modified: vendor/wine/dlls/shlwapi/Wine-20050111/ordinal.c Modified: vendor/wine/dlls/shlwapi/Wine-20050111/regstream.c Modified: vendor/wine/dlls/shlwapi/Wine-20050111/stopwatch.c Modified: vendor/wine/dlls/shlwapi/Wine-20050111/string.c Modified: vendor/wine/dlls/shlwapi/Wine-20050111/thread.c Modified: vendor/wine/dlls/shlwapi/Wine-20050111/url.c Modified: vendor/wine/dlls/shlwapi/Wine-20050111/wsprintf.c Modified: vendor/wine/dlls/shlwapi/current/msgbox.c Modified: vendor/wine/dlls/shlwapi/current/ordinal.c Modified: vendor/wine/dlls/shlwapi/current/regstream.c Modified: vendor/wine/dlls/shlwapi/current/stopwatch.c Modified: vendor/wine/dlls/shlwapi/current/string.c Modified: vendor/wine/dlls/shlwapi/current/thread.c Modified: vendor/wine/dlls/shlwapi/current/url.c Modified: vendor/wine/dlls/shlwapi/current/wsprintf.c _____ Copied: vendor/wine/dlls/shlwapi/Wine-20050111 (from rev 12927, vendor/wine/dlls/shlwapi/current) _____ Modified: vendor/wine/dlls/shlwapi/Wine-20050111/msgbox.c --- vendor/wine/dlls/shlwapi/current/msgbox.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shlwapi/Wine-20050111/msgbox.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -273,8 +273,7 @@ iRetVal = SHMessageBoxCheckW(hWnd, szTextBuff, lpszTitle ? szTitleBuff : NULL, dwType, iRet, szIdBuff); - if (szTextBuff) - HeapFree(GetProcessHeap(), 0, szTextBuff); + HeapFree(GetProcessHeap(), 0, szTextBuff); return iRetVal; } _____ Modified: vendor/wine/dlls/shlwapi/Wine-20050111/ordinal.c --- vendor/wine/dlls/shlwapi/current/ordinal.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shlwapi/Wine-20050111/ordinal.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -42,15 +42,12 @@ #include "shlguid.h" #include "wingdi.h" #include "shlobj.h" -#include "olectl.h" #include "shellapi.h" #include "commdlg.h" #include "wine/unicode.h" -#include "servprov.h" #include "winreg.h" #include "wine/debug.h" #include "shlwapi.h" -#include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -611,7 +608,7 @@ *buflen, NULL, NULL); *buflen = buflenW ? convlen : 0; - if(langbufW) HeapFree(GetProcessHeap(), 0, langbufW); + HeapFree(GetProcessHeap(), 0, langbufW); return retval; } @@ -621,9 +618,9 @@ * Convert a GUID to a string. * * PARAMS - * guid [I] GUID to convert - * str [O] Destination for string - * cmax [I] Length of output buffer + * guid [I] GUID to convert + * lpszDest [O] Destination for string + * cchMax [I] Length of output buffer * * RETURNS * The length of the string created. @@ -651,15 +648,35 @@ /*********************************************************************** ** * @ [SHLWAPI.24] * - * Unicode version of SHStringFromGUIDA. + * Convert a GUID to a string. + * + * PARAMS + * guid [I] GUID to convert + * str [O] Destination for string + * cmax [I] Length of output buffer + * + * RETURNS + * The length of the string created. */ INT WINAPI SHStringFromGUIDW(REFGUID guid, LPWSTR lpszDest, INT cchMax) { - char xguid[40]; - INT iLen = SHStringFromGUIDA(guid, xguid, cchMax); + WCHAR xguid[40]; + INT iLen; + static const WCHAR wszFormat[] = {'{','%','0','8','l','X','-','%','0','4','X','-','%','0','4','X','-', + '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','%', '0','2','X','%','0','2', + 'X','%','0','2','X','%','0','2','X','}',0}; - if (iLen) - MultiByteToWideChar(CP_ACP, 0, xguid, -1, lpszDest, cchMax); + TRACE("(%s,%p,%d)\n", debugstr_guid(guid), lpszDest, cchMax); + + sprintfW(xguid, wszFormat, guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + + iLen = strlenW(xguid) + 1; + + if (iLen > cchMax) + return 0; + memcpy(lpszDest, xguid, iLen*sizeof(WCHAR)); return iLen; } @@ -1939,7 +1956,7 @@ mi.fMask = MIIM_SUBMENU; if (!GetMenuItemInfoA(hMenu, uID, 0, &mi)) - return (HMENU)NULL; + return NULL; return mi.hSubMenu; } @@ -2421,8 +2438,8 @@ wc.cbClsExtra = 0; wc.cbWndExtra = 4; wc.hInstance = shlwapi_hInstance; - wc.hIcon = (HICON)0; - wc.hCursor = LoadCursorA((HINSTANCE)0, (LPSTR)IDC_ARROW); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW; wc.lpszMenuName = NULL; wc.lpszClassName = szClass; @@ -2708,8 +2725,8 @@ wc.cbClsExtra = 0; wc.cbWndExtra = 4; wc.hInstance = shlwapi_hInstance; - wc.hIcon = (HICON)0; - wc.hCursor = LoadCursorA((HINSTANCE)0, (LPSTR)IDC_ARROW); + wc.hIcon = NULL; + wc.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW; wc.lpszMenuName = NULL; wc.lpszClassName = szClass; @@ -2722,10 +2739,10 @@ hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { - SetWindowLongA(hWnd, DWL_MSGRESULT, z); + SetWindowLongW(hWnd, DWL_MSGRESULT, z); if (wndProc) - SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); + SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc); } return hWnd; } _____ Modified: vendor/wine/dlls/shlwapi/Wine-20050111/regstream.c --- vendor/wine/dlls/shlwapi/current/regstream.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shlwapi/Wine-20050111/regstream.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -94,8 +94,7 @@ { TRACE(" destroying SHReg IStream (%p)\n",This); - if (This->pbBuffer) - HeapFree(GetProcessHeap(),0,This->pbBuffer); + HeapFree(GetProcessHeap(),0,This->pbBuffer); if (This->hKey) RegCloseKey(This->hKey); @@ -388,8 +387,7 @@ dwType == REG_BINARY) return IStream_Create(hStrKey, lpBuff, dwLength); - if (lpBuff) - HeapFree (GetProcessHeap(), 0, lpBuff); + HeapFree (GetProcessHeap(), 0, lpBuff); if (hStrKey) RegCloseKey(hStrKey); return NULL; @@ -418,8 +416,7 @@ dwType == REG_BINARY) return IStream_Create(hStrKey, lpBuff, dwLength); - if (lpBuff) - HeapFree (GetProcessHeap(), 0, lpBuff); + HeapFree (GetProcessHeap(), 0, lpBuff); if (hStrKey) RegCloseKey(hStrKey); return NULL; _____ Modified: vendor/wine/dlls/shlwapi/Wine-20050111/stopwatch.c --- vendor/wine/dlls/shlwapi/current/stopwatch.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shlwapi/Wine-20050111/stopwatch.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -32,15 +32,10 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "wine/unicode.h" #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" #include "winreg.h" #include "winternl.h" -#define NO_SHLWAPI_STREAM -#include "shlwapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); _____ Modified: vendor/wine/dlls/shlwapi/Wine-20050111/string.c --- vendor/wine/dlls/shlwapi/current/string.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shlwapi/Wine-20050111/string.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -599,7 +599,7 @@ while (lpszStr <= lpszEnd && *lpszStr) { - if (!ChrCmpIA(*lpszSearch, *lpszStr)) + if (!ChrCmpIW(*lpszSearch, *lpszStr)) { if (!StrCmpNIW(lpszStr, lpszSearch, iLen)) lpszRet = (LPWSTR)lpszStr; @@ -2186,7 +2186,7 @@ return 1; else { - iDiff = SHLWAPI_ChrCmpHelperA(*lpszStr,*lpszComp,NORM_IGNORECASE); + iDiff = SHLWAPI_ChrCmpHelperW(*lpszStr,*lpszComp,NORM_IGNORECASE); if (iDiff > 0) return 1; else if (iDiff < 0) @@ -2208,12 +2208,12 @@ LONGLONG dLimit; double dDivisor; double dNormaliser; - LPCSTR lpszFormat; - CHAR wPrefix; + LPCWSTR lpwszFormat; + WCHAR wPrefix; } SHLWAPI_BYTEFORMATS; /*********************************************************************** ** - * StrFormatByteSize64A [SHLWAPI.@] + * StrFormatByteSizeW [SHLWAPI.@] * * Create a string containing an abbreviated byte count of up to 2^63-1. * @@ -2228,12 +2228,12 @@ * NOTES * There is no StrFormatByteSize64W function, it is called StrFormatByteSizeW(). */ -LPSTR WINAPI StrFormatByteSize64A(LONGLONG llBytes, LPSTR lpszDest, UINT cchMax) +LPWSTR WINAPI StrFormatByteSizeW(LONGLONG llBytes, LPWSTR lpszDest, UINT cchMax) { - static const char szBytes[] = "%ld bytes"; - static const char sz3_0[] = "%3.0f"; - static const char sz3_1[] = "%3.1f"; - static const char sz3_2[] = "%3.2f"; + static const WCHAR wszBytes[] = {'%','l','d',' ','b','y','t','e','s',0}; + static const WCHAR wsz3_0[] = {'%','3','.','0','f',0}; + static const WCHAR wsz3_1[] = {'%','3','.','1','f',0}; + static const WCHAR wsz3_2[] = {'%','3','.','2','f',0}; #define KB ((ULONGLONG)1024) #define MB (KB*KB) @@ -2243,25 +2243,25 @@ static const SHLWAPI_BYTEFORMATS bfFormats[] = { - { 10*KB, 10.24, 100.0, sz3_2, 'K' }, /* 10 KB */ - { 100*KB, 102.4, 10.0, sz3_1, 'K' }, /* 100 KB */ - { 1000*KB, 1024.0, 1.0, sz3_0, 'K' }, /* 1000 KB */ - { 10*MB, 10485.76, 100.0, sz3_2, 'M' }, /* 10 MB */ - { 100*MB, 104857.6, 10.0, sz3_1, 'M' }, /* 100 MB */ - { 1000*MB, 1048576.0, 1.0, sz3_0, 'M' }, /* 1000 MB */ - { 10*GB, 10737418.24, 100.0, sz3_2, 'G' }, /* 10 GB */ - { 100*GB, 107374182.4, 10.0, sz3_1, 'G' }, /* 100 GB */ - { 1000*GB, 1073741824.0, 1.0, sz3_0, 'G' }, /* 1000 GB */ - { 10*TB, 10485.76, 100.0, sz3_2, 'T' }, /* 10 TB */ - { 100*TB, 104857.6, 10.0, sz3_1, 'T' }, /* 100 TB */ - { 1000*TB, 1048576.0, 1.0, sz3_0, 'T' }, /* 1000 TB */ - { 10*PB, 10737418.24, 100.00, sz3_2, 'P' }, /* 10 PB */ - { 100*PB, 107374182.4, 10.00, sz3_1, 'P' }, /* 100 PB */ - { 1000*PB, 1073741824.0, 1.00, sz3_0, 'P' }, /* 1000 PB */ - { 0, 10995116277.76, 100.00, sz3_2, 'E' } /* EB's, catch all */ + { 10*KB, 10.24, 100.0, wsz3_2, 'K' }, /* 10 KB */ + { 100*KB, 102.4, 10.0, wsz3_1, 'K' }, /* 100 KB */ + { 1000*KB, 1024.0, 1.0, wsz3_0, 'K' }, /* 1000 KB */ + { 10*MB, 10485.76, 100.0, wsz3_2, 'M' }, /* 10 MB */ + { 100*MB, 104857.6, 10.0, wsz3_1, 'M' }, /* 100 MB */ + { 1000*MB, 1048576.0, 1.0, wsz3_0, 'M' }, /* 1000 MB */ + { 10*GB, 10737418.24, 100.0, wsz3_2, 'G' }, /* 10 GB */ + { 100*GB, 107374182.4, 10.0, wsz3_1, 'G' }, /* 100 GB */ + { 1000*GB, 1073741824.0, 1.0, wsz3_0, 'G' }, /* 1000 GB */ + { 10*TB, 10485.76, 100.0, wsz3_2, 'T' }, /* 10 TB */ + { 100*TB, 104857.6, 10.0, wsz3_1, 'T' }, /* 100 TB */ + { 1000*TB, 1048576.0, 1.0, wsz3_0, 'T' }, /* 1000 TB */ + { 10*PB, 10737418.24, 100.00, wsz3_2, 'P' }, /* 10 PB */ + { 100*PB, 107374182.4, 10.00, wsz3_1, 'P' }, /* 100 PB */ + { 1000*PB, 1073741824.0, 1.00, wsz3_0, 'P' }, /* 1000 PB */ + { 0, 10995116277.76, 100.00, wsz3_2, 'E' } /* EB's, catch all */ }; - char szBuff[32]; - char szAdd[4]; + WCHAR wszBuff[32]; + WCHAR wszAdd[] = {' ','?','B',0}; double dBytes; UINT i = 0; @@ -2272,7 +2272,7 @@ if (llBytes < 1024) /* 1K */ { - snprintf (lpszDest, cchMax, szBytes, (long)llBytes); + snprintfW(lpszDest, cchMax, wszBytes, (long)llBytes); return lpszDest; } @@ -2298,30 +2298,26 @@ dBytes = floor(dBytes / bfFormats[i].dDivisor) / bfFormats[i].dNormaliser; - sprintf(szBuff, bfFormats[i].lpszFormat, dBytes); - szAdd[0] = ' '; - szAdd[1] = bfFormats[i].wPrefix; - szAdd[2] = 'B'; - szAdd[3] = '\0'; - strcat(szBuff, szAdd); - strncpy(lpszDest, szBuff, cchMax); + sprintfW(wszBuff, bfFormats[i].lpwszFormat, dBytes); + wszAdd[1] = bfFormats[i].wPrefix; + strcatW(wszBuff, wszAdd); + strncpyW(lpszDest, wszBuff, cchMax); return lpszDest; } /*********************************************************************** ** - * StrFormatByteSizeW [SHLWAPI.@] + * StrFormatByteSize64A [SHLWAPI.@] * - * See StrFormatByteSize64A. + * See StrFormatByteSizeW. */ -LPWSTR WINAPI StrFormatByteSizeW(LONGLONG llBytes, LPWSTR lpszDest, - UINT cchMax) +LPSTR WINAPI StrFormatByteSize64A(LONGLONG llBytes, LPSTR lpszDest, UINT cchMax) { - char szBuff[32]; + WCHAR wszBuff[32]; - StrFormatByteSize64A(llBytes, szBuff, sizeof(szBuff)); + StrFormatByteSizeW(llBytes, wszBuff, sizeof(wszBuff)/sizeof(WCHAR)); if (lpszDest) - MultiByteToWideChar(CP_ACP, 0, szBuff, -1, lpszDest, cchMax); + WideCharToMultiByte(CP_ACP, 0, wszBuff, -1, lpszDest, cchMax, 0, 0); return lpszDest; } @@ -2560,6 +2556,7 @@ { SHTruncateString(mem, *lpiLen); lstrcpynA(lpDstStr, mem, *lpiLen + 1); + HeapFree(GetProcessHeap(), 0, mem); return *lpiLen + 1; } HeapFree(GetProcessHeap(), 0, mem); @@ -2568,7 +2565,6 @@ lpDstStr[*lpiLen] = '\0'; return *lpiLen; } - break; default: break; } _____ Modified: vendor/wine/dlls/shlwapi/Wine-20050111/thread.c --- vendor/wine/dlls/shlwapi/current/thread.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shlwapi/Wine-20050111/thread.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -288,7 +288,7 @@ ti.pfnCallback = pfnCallback; ti.pData = pData; ti.bInitCom = dwFlags & CTF_COINIT ? TRUE : FALSE; - ti.hEvent = CreateEventA(NULL,FALSE,FALSE,NULL); + ti.hEvent = CreateEventW(NULL,FALSE,FALSE,NULL); /* Hold references to the current thread and IE process, if desired */ if(dwFlags & CTF_THREAD_REF) _____ Modified: vendor/wine/dlls/shlwapi/Wine-20050111/url.c --- vendor/wine/dlls/shlwapi/current/url.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shlwapi/Wine-20050111/url.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -444,6 +444,7 @@ break; default: FIXME("how did we get here - state=%d\n", state); + HeapFree(GetProcessHeap(), 0, lpszUrlCpy); return E_INVALIDARG; } } @@ -1416,7 +1417,7 @@ * return the same digests for the same URL. */ WideCharToMultiByte(0, 0, pszUrl, -1, szUrl, MAX_PATH, 0, 0); - HashData((PBYTE)szUrl, (int)strlen(szUrl), lpDest, nDestLen); + HashData((const BYTE*)szUrl, (int)strlen(szUrl), lpDest, nDestLen); return S_OK; } @@ -1631,6 +1632,8 @@ DWORD res1; LPCSTR last; + TRACE("(%s %d)\n", debugstr_a(pszUrl), Urlis); + switch (Urlis) { case URLIS_OPAQUE: @@ -1650,6 +1653,8 @@ return (last >= pszUrl && (*last == '/' || *last == '\\' )); case URLIS_URL: + return PathIsURLA(pszUrl); + case URLIS_NOHISTORY: case URLIS_APPLIABLE: case URLIS_HASQUERY: @@ -1671,6 +1676,8 @@ DWORD res1; LPCWSTR last; + TRACE("(%s %d)\n", debugstr_w(pszUrl), Urlis); + switch (Urlis) { case URLIS_OPAQUE: @@ -1690,6 +1697,8 @@ return (last >= pszUrl && (*last == '/' || *last == '\\')); case URLIS_URL: + return PathIsURLW(pszUrl); + case URLIS_NOHISTORY: case URLIS_APPLIABLE: case URLIS_HASQUERY: _____ Modified: vendor/wine/dlls/shlwapi/Wine-20050111/wsprintf.c --- vendor/wine/dlls/shlwapi/current/wsprintf.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shlwapi/Wine-20050111/wsprintf.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -28,8 +28,8 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#define NO_SHLWAPI_REG +#include "shlwapi.h" #include "wine/debug.h" @@ -284,7 +284,7 @@ * Success: The number of characters written. * Failure: -1. */ -INT WINAPI wvnsprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args ) +INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, va_list args ) { WPRINTF_FORMAT format; LPSTR p = buffer; @@ -389,7 +389,7 @@ * * See wvnsprintfA. */ -INT WINAPI wvnsprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args ) +INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, va_list args ) { WPRINTF_FORMAT format; LPWSTR p = buffer; _____ Modified: vendor/wine/dlls/shlwapi/current/msgbox.c --- vendor/wine/dlls/shlwapi/current/msgbox.c 2005-01-12 19:29:52 UTC (rev 12983) +++ vendor/wine/dlls/shlwapi/current/msgbox.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -273,8 +273,7 @@ iRetVal = SHMessageBoxCheckW(hWnd, szTextBuff, lpszTitle ? szTitleBuff : NULL, dwType, iRet, szIdBuff); - if (szTextBuff) - HeapFree(GetProcessHeap(), 0, szTextBuff); + HeapFree(GetProcessHeap(), 0, szTextBuff); return iRetVal; } _____ Modified: vendor/wine/dlls/shlwapi/current/ordinal.c --- vendor/wine/dlls/shlwapi/current/ordinal.c 2005-01-12 19:29:52 UTC (rev 12983) +++ vendor/wine/dlls/shlwapi/current/ordinal.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -42,15 +42,12 @@ #include "shlguid.h" #include "wingdi.h" #include "shlobj.h" -#include "olectl.h" #include "shellapi.h" #include "commdlg.h" #include "wine/unicode.h" -#include "servprov.h" #include "winreg.h" #include "wine/debug.h" #include "shlwapi.h" -#include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -611,7 +608,7 @@ *buflen, NULL, NULL); *buflen = buflenW ? convlen : 0; - if(langbufW) HeapFree(GetProcessHeap(), 0, langbufW); + HeapFree(GetProcessHeap(), 0, langbufW); return retval; } @@ -621,9 +618,9 @@ * Convert a GUID to a string. * * PARAMS - * guid [I] GUID to convert - * str [O] Destination for string - * cmax [I] Length of output buffer + * guid [I] GUID to convert + * lpszDest [O] Destination for string + * cchMax [I] Length of output buffer * * RETURNS * The length of the string created. @@ -651,15 +648,35 @@ /*********************************************************************** ** * @ [SHLWAPI.24] * - * Unicode version of SHStringFromGUIDA. + * Convert a GUID to a string. + * + * PARAMS + * guid [I] GUID to convert + * str [O] Destination for string + * cmax [I] Length of output buffer + * + * RETURNS + * The length of the string created. */ INT WINAPI SHStringFromGUIDW(REFGUID guid, LPWSTR lpszDest, INT cchMax) { - char xguid[40]; - INT iLen = SHStringFromGUIDA(guid, xguid, cchMax); + WCHAR xguid[40]; + INT iLen; + static const WCHAR wszFormat[] = {'{','%','0','8','l','X','-','%','0','4','X','-','%','0','4','X','-', + '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','%', '0','2','X','%','0','2', + 'X','%','0','2','X','%','0','2','X','}',0}; - if (iLen) - MultiByteToWideChar(CP_ACP, 0, xguid, -1, lpszDest, cchMax); + TRACE("(%s,%p,%d)\n", debugstr_guid(guid), lpszDest, cchMax); + + sprintfW(xguid, wszFormat, guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + + iLen = strlenW(xguid) + 1; + + if (iLen > cchMax) + return 0; + memcpy(lpszDest, xguid, iLen*sizeof(WCHAR)); return iLen; } @@ -1939,7 +1956,7 @@ mi.fMask = MIIM_SUBMENU; if (!GetMenuItemInfoA(hMenu, uID, 0, &mi)) - return (HMENU)NULL; + return NULL; return mi.hSubMenu; } @@ -2421,8 +2438,8 @@ wc.cbClsExtra = 0; wc.cbWndExtra = 4; wc.hInstance = shlwapi_hInstance; - wc.hIcon = (HICON)0; - wc.hCursor = LoadCursorA((HINSTANCE)0, (LPSTR)IDC_ARROW); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW; wc.lpszMenuName = NULL; wc.lpszClassName = szClass; @@ -2708,8 +2725,8 @@ wc.cbClsExtra = 0; wc.cbWndExtra = 4; wc.hInstance = shlwapi_hInstance; - wc.hIcon = (HICON)0; - wc.hCursor = LoadCursorA((HINSTANCE)0, (LPSTR)IDC_ARROW); + wc.hIcon = NULL; + wc.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW; wc.lpszMenuName = NULL; wc.lpszClassName = szClass; @@ -2722,10 +2739,10 @@ hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { - SetWindowLongA(hWnd, DWL_MSGRESULT, z); + SetWindowLongW(hWnd, DWL_MSGRESULT, z); if (wndProc) - SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); + SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc); } return hWnd; } _____ Modified: vendor/wine/dlls/shlwapi/current/regstream.c --- vendor/wine/dlls/shlwapi/current/regstream.c 2005-01-12 19:29:52 UTC (rev 12983) +++ vendor/wine/dlls/shlwapi/current/regstream.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -94,8 +94,7 @@ { TRACE(" destroying SHReg IStream (%p)\n",This); - if (This->pbBuffer) - HeapFree(GetProcessHeap(),0,This->pbBuffer); + HeapFree(GetProcessHeap(),0,This->pbBuffer); if (This->hKey) RegCloseKey(This->hKey); @@ -388,8 +387,7 @@ dwType == REG_BINARY) return IStream_Create(hStrKey, lpBuff, dwLength); - if (lpBuff) - HeapFree (GetProcessHeap(), 0, lpBuff); + HeapFree (GetProcessHeap(), 0, lpBuff); if (hStrKey) RegCloseKey(hStrKey); return NULL; @@ -418,8 +416,7 @@ dwType == REG_BINARY) return IStream_Create(hStrKey, lpBuff, dwLength); - if (lpBuff) - HeapFree (GetProcessHeap(), 0, lpBuff); + HeapFree (GetProcessHeap(), 0, lpBuff); if (hStrKey) RegCloseKey(hStrKey); return NULL; _____ Modified: vendor/wine/dlls/shlwapi/current/stopwatch.c --- vendor/wine/dlls/shlwapi/current/stopwatch.c 2005-01-12 19:29:52 UTC (rev 12983) +++ vendor/wine/dlls/shlwapi/current/stopwatch.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -32,15 +32,10 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "wine/unicode.h" #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" #include "winreg.h" #include "winternl.h" -#define NO_SHLWAPI_STREAM -#include "shlwapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); _____ Modified: vendor/wine/dlls/shlwapi/current/string.c --- vendor/wine/dlls/shlwapi/current/string.c 2005-01-12 19:29:52 UTC (rev 12983) +++ vendor/wine/dlls/shlwapi/current/string.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -599,7 +599,7 @@ while (lpszStr <= lpszEnd && *lpszStr) { - if (!ChrCmpIA(*lpszSearch, *lpszStr)) + if (!ChrCmpIW(*lpszSearch, *lpszStr)) { if (!StrCmpNIW(lpszStr, lpszSearch, iLen)) lpszRet = (LPWSTR)lpszStr; @@ -2186,7 +2186,7 @@ return 1; else { - iDiff = SHLWAPI_ChrCmpHelperA(*lpszStr,*lpszComp,NORM_IGNORECASE); + iDiff = SHLWAPI_ChrCmpHelperW(*lpszStr,*lpszComp,NORM_IGNORECASE); if (iDiff > 0) return 1; else if (iDiff < 0) @@ -2208,12 +2208,12 @@ LONGLONG dLimit; double dDivisor; double dNormaliser; - LPCSTR lpszFormat; - CHAR wPrefix; + LPCWSTR lpwszFormat; + WCHAR wPrefix; } SHLWAPI_BYTEFORMATS; /*********************************************************************** ** - * StrFormatByteSize64A [SHLWAPI.@] + * StrFormatByteSizeW [SHLWAPI.@] * * Create a string containing an abbreviated byte count of up to 2^63-1. * @@ -2228,12 +2228,12 @@ * NOTES * There is no StrFormatByteSize64W function, it is called StrFormatByteSizeW(). */ -LPSTR WINAPI StrFormatByteSize64A(LONGLONG llBytes, LPSTR lpszDest, UINT cchMax) +LPWSTR WINAPI StrFormatByteSizeW(LONGLONG llBytes, LPWSTR lpszDest, UINT cchMax) { - static const char szBytes[] = "%ld bytes"; - static const char sz3_0[] = "%3.0f"; - static const char sz3_1[] = "%3.1f"; - static const char sz3_2[] = "%3.2f"; + static const WCHAR wszBytes[] = {'%','l','d',' ','b','y','t','e','s',0}; + static const WCHAR wsz3_0[] = {'%','3','.','0','f',0}; + static const WCHAR wsz3_1[] = {'%','3','.','1','f',0}; + static const WCHAR wsz3_2[] = {'%','3','.','2','f',0}; #define KB ((ULONGLONG)1024) #define MB (KB*KB) @@ -2243,25 +2243,25 @@ static const SHLWAPI_BYTEFORMATS bfFormats[] = { - { 10*KB, 10.24, 100.0, sz3_2, 'K' }, /* 10 KB */ - { 100*KB, 102.4, 10.0, sz3_1, 'K' }, /* 100 KB */ - { 1000*KB, 1024.0, 1.0, sz3_0, 'K' }, /* 1000 KB */ - { 10*MB, 10485.76, 100.0, sz3_2, 'M' }, /* 10 MB */ - { 100*MB, 104857.6, 10.0, sz3_1, 'M' }, /* 100 MB */ - { 1000*MB, 1048576.0, 1.0, sz3_0, 'M' }, /* 1000 MB */ - { 10*GB, 10737418.24, 100.0, sz3_2, 'G' }, /* 10 GB */ - { 100*GB, 107374182.4, 10.0, sz3_1, 'G' }, /* 100 GB */ - { 1000*GB, 1073741824.0, 1.0, sz3_0, 'G' }, /* 1000 GB */ - { 10*TB, 10485.76, 100.0, sz3_2, 'T' }, /* 10 TB */ - { 100*TB, 104857.6, 10.0, sz3_1, 'T' }, /* 100 TB */ - { 1000*TB, 1048576.0, 1.0, sz3_0, 'T' }, /* 1000 TB */ - { 10*PB, 10737418.24, 100.00, sz3_2, 'P' }, /* 10 PB */ - { 100*PB, 107374182.4, 10.00, sz3_1, 'P' }, /* 100 PB */ - { 1000*PB, 1073741824.0, 1.00, sz3_0, 'P' }, /* 1000 PB */ - { 0, 10995116277.76, 100.00, sz3_2, 'E' } /* EB's, catch all */ + { 10*KB, 10.24, 100.0, wsz3_2, 'K' }, /* 10 KB */ + { 100*KB, 102.4, 10.0, wsz3_1, 'K' }, /* 100 KB */ + { 1000*KB, 1024.0, 1.0, wsz3_0, 'K' }, /* 1000 KB */ + { 10*MB, 10485.76, 100.0, wsz3_2, 'M' }, /* 10 MB */ + { 100*MB, 104857.6, 10.0, wsz3_1, 'M' }, /* 100 MB */ + { 1000*MB, 1048576.0, 1.0, wsz3_0, 'M' }, /* 1000 MB */ + { 10*GB, 10737418.24, 100.0, wsz3_2, 'G' }, /* 10 GB */ + { 100*GB, 107374182.4, 10.0, wsz3_1, 'G' }, /* 100 GB */ + { 1000*GB, 1073741824.0, 1.0, wsz3_0, 'G' }, /* 1000 GB */ + { 10*TB, 10485.76, 100.0, wsz3_2, 'T' }, /* 10 TB */ + { 100*TB, 104857.6, 10.0, wsz3_1, 'T' }, /* 100 TB */ + { 1000*TB, 1048576.0, 1.0, wsz3_0, 'T' }, /* 1000 TB */ + { 10*PB, 10737418.24, 100.00, wsz3_2, 'P' }, /* 10 PB */ + { 100*PB, 107374182.4, 10.00, wsz3_1, 'P' }, /* 100 PB */ + { 1000*PB, 1073741824.0, 1.00, wsz3_0, 'P' }, /* 1000 PB */ + { 0, 10995116277.76, 100.00, wsz3_2, 'E' } /* EB's, catch all */ }; - char szBuff[32]; - char szAdd[4]; + WCHAR wszBuff[32]; + WCHAR wszAdd[] = {' ','?','B',0}; double dBytes; UINT i = 0; @@ -2272,7 +2272,7 @@ if (llBytes < 1024) /* 1K */ { - snprintf (lpszDest, cchMax, szBytes, (long)llBytes); + snprintfW(lpszDest, cchMax, wszBytes, (long)llBytes); return lpszDest; } @@ -2298,30 +2298,26 @@ dBytes = floor(dBytes / bfFormats[i].dDivisor) / bfFormats[i].dNormaliser; - sprintf(szBuff, bfFormats[i].lpszFormat, dBytes); - szAdd[0] = ' '; - szAdd[1] = bfFormats[i].wPrefix; - szAdd[2] = 'B'; - szAdd[3] = '\0'; - strcat(szBuff, szAdd); - strncpy(lpszDest, szBuff, cchMax); + sprintfW(wszBuff, bfFormats[i].lpwszFormat, dBytes); + wszAdd[1] = bfFormats[i].wPrefix; + strcatW(wszBuff, wszAdd); + strncpyW(lpszDest, wszBuff, cchMax); return lpszDest; } /*********************************************************************** ** - * StrFormatByteSizeW [SHLWAPI.@] + * StrFormatByteSize64A [SHLWAPI.@] * - * See StrFormatByteSize64A. + * See StrFormatByteSizeW. */ -LPWSTR WINAPI StrFormatByteSizeW(LONGLONG llBytes, LPWSTR lpszDest, - UINT cchMax) +LPSTR WINAPI StrFormatByteSize64A(LONGLONG llBytes, LPSTR lpszDest, UINT cchMax) { - char szBuff[32]; + WCHAR wszBuff[32]; - StrFormatByteSize64A(llBytes, szBuff, sizeof(szBuff)); + StrFormatByteSizeW(llBytes, wszBuff, sizeof(wszBuff)/sizeof(WCHAR)); if (lpszDest) - MultiByteToWideChar(CP_ACP, 0, szBuff, -1, lpszDest, cchMax); + WideCharToMultiByte(CP_ACP, 0, wszBuff, -1, lpszDest, cchMax, 0, 0); return lpszDest; } @@ -2560,6 +2556,7 @@ { SHTruncateString(mem, *lpiLen); lstrcpynA(lpDstStr, mem, *lpiLen + 1); + HeapFree(GetProcessHeap(), 0, mem); return *lpiLen + 1; } HeapFree(GetProcessHeap(), 0, mem); @@ -2568,7 +2565,6 @@ lpDstStr[*lpiLen] = '\0'; return *lpiLen; } - break; default: break; } _____ Modified: vendor/wine/dlls/shlwapi/current/thread.c --- vendor/wine/dlls/shlwapi/current/thread.c 2005-01-12 19:29:52 UTC (rev 12983) +++ vendor/wine/dlls/shlwapi/current/thread.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -288,7 +288,7 @@ ti.pfnCallback = pfnCallback; ti.pData = pData; ti.bInitCom = dwFlags & CTF_COINIT ? TRUE : FALSE; - ti.hEvent = CreateEventA(NULL,FALSE,FALSE,NULL); + ti.hEvent = CreateEventW(NULL,FALSE,FALSE,NULL); /* Hold references to the current thread and IE process, if desired */ if(dwFlags & CTF_THREAD_REF) _____ Modified: vendor/wine/dlls/shlwapi/current/url.c --- vendor/wine/dlls/shlwapi/current/url.c 2005-01-12 19:29:52 UTC (rev 12983) +++ vendor/wine/dlls/shlwapi/current/url.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -444,6 +444,7 @@ break; default: FIXME("how did we get here - state=%d\n", state); + HeapFree(GetProcessHeap(), 0, lpszUrlCpy); return E_INVALIDARG; } } @@ -1416,7 +1417,7 @@ * return the same digests for the same URL. */ WideCharToMultiByte(0, 0, pszUrl, -1, szUrl, MAX_PATH, 0, 0); - HashData((PBYTE)szUrl, (int)strlen(szUrl), lpDest, nDestLen); + HashData((const BYTE*)szUrl, (int)strlen(szUrl), lpDest, nDestLen); return S_OK; } @@ -1631,6 +1632,8 @@ DWORD res1; LPCSTR last; + TRACE("(%s %d)\n", debugstr_a(pszUrl), Urlis); + switch (Urlis) { case URLIS_OPAQUE: @@ -1650,6 +1653,8 @@ return (last >= pszUrl && (*last == '/' || *last == '\\' )); case URLIS_URL: + return PathIsURLA(pszUrl); + case URLIS_NOHISTORY: case URLIS_APPLIABLE: case URLIS_HASQUERY: @@ -1671,6 +1676,8 @@ DWORD res1; LPCWSTR last; + TRACE("(%s %d)\n", debugstr_w(pszUrl), Urlis); + switch (Urlis) { case URLIS_OPAQUE: @@ -1690,6 +1697,8 @@ return (last >= pszUrl && (*last == '/' || *last == '\\')); case URLIS_URL: + return PathIsURLW(pszUrl); + case URLIS_NOHISTORY: case URLIS_APPLIABLE: case URLIS_HASQUERY: _____ Modified: vendor/wine/dlls/shlwapi/current/wsprintf.c --- vendor/wine/dlls/shlwapi/current/wsprintf.c 2005-01-12 19:29:52 UTC (rev 12983) +++ vendor/wine/dlls/shlwapi/current/wsprintf.c 2005-01-12 19:31:38 UTC (rev 12984) @@ -28,8 +28,8 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#define NO_SHLWAPI_REG +#include "shlwapi.h" #include "wine/debug.h" @@ -284,7 +284,7 @@ * Success: The number of characters written. * Failure: -1. */ -INT WINAPI wvnsprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args ) +INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, va_list args ) { WPRINTF_FORMAT format; LPSTR p = buffer; @@ -389,7 +389,7 @@ * * See wvnsprintfA. */ -INT WINAPI wvnsprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args ) +INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, va_list args ) { WPRINTF_FORMAT format; LPWSTR p = buffer;

19 years, 10 months

[gvg] 12983: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/libs/unicode/Wine-20050111/ Modified: vendor/wine/libs/unicode/Wine-20050111/utf8.c Modified: vendor/wine/libs/unicode/current/utf8.c _____ Copied: vendor/wine/libs/unicode/Wine-20050111 (from rev 12927, vendor/wine/libs/unicode/current) _____ Modified: vendor/wine/libs/unicode/Wine-20050111/utf8.c --- vendor/wine/libs/unicode/current/utf8.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/libs/unicode/Wine-20050111/utf8.c 2005-01-12 19:29:52 UTC (rev 12983) @@ -145,7 +145,7 @@ unsigned int res; const char *srcend = src + srclen; - if (!dstlen) return get_length_mbs_utf8( src, srclen ); + if (!dstlen) return get_length_mbs_utf8( (const unsigned char*)src, srclen ); for (count = dstlen; count && (src < srcend); count--, dst++) { _____ Modified: vendor/wine/libs/unicode/current/utf8.c --- vendor/wine/libs/unicode/current/utf8.c 2005-01-12 19:29:11 UTC (rev 12982) +++ vendor/wine/libs/unicode/current/utf8.c 2005-01-12 19:29:52 UTC (rev 12983) @@ -145,7 +145,7 @@ unsigned int res; const char *srcend = src + srclen; - if (!dstlen) return get_length_mbs_utf8( src, srclen ); + if (!dstlen) return get_length_mbs_utf8( (const unsigned char*)src, srclen ); for (count = dstlen; count && (src < srcend); count--, dst++) {

19 years, 10 months

[gvg] 12982: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/winmm/Wine-20050111/ Modified: vendor/wine/dlls/winmm/Wine-20050111/driver.c Modified: vendor/wine/dlls/winmm/Wine-20050111/joystick.c Modified: vendor/wine/dlls/winmm/Wine-20050111/lolvldrv.c Modified: vendor/wine/dlls/winmm/Wine-20050111/mci.c Modified: vendor/wine/dlls/winmm/Wine-20050111/message16.c Deleted: vendor/wine/dlls/winmm/Wine-20050111/midimap/.cvsignore Modified: vendor/wine/dlls/winmm/Wine-20050111/midimap/midimap.c Modified: vendor/wine/dlls/winmm/Wine-20050111/mmio.c Modified: vendor/wine/dlls/winmm/Wine-20050111/mmsystem.c Modified: vendor/wine/dlls/winmm/Wine-20050111/playsound.c Deleted: vendor/wine/dlls/winmm/Wine-20050111/wavemap/.cvsignore Modified: vendor/wine/dlls/winmm/Wine-20050111/wavemap/wavemap.c Modified: vendor/wine/dlls/winmm/Wine-20050111/winemm.h Modified: vendor/wine/dlls/winmm/Wine-20050111/winmm.c Modified: vendor/wine/dlls/winmm/Wine-20050111/winmm.spec Modified: vendor/wine/dlls/winmm/current/driver.c Modified: vendor/wine/dlls/winmm/current/joystick.c Modified: vendor/wine/dlls/winmm/current/lolvldrv.c Modified: vendor/wine/dlls/winmm/current/mci.c Modified: vendor/wine/dlls/winmm/current/message16.c Deleted: vendor/wine/dlls/winmm/current/midimap/.cvsignore Modified: vendor/wine/dlls/winmm/current/midimap/midimap.c Modified: vendor/wine/dlls/winmm/current/mmio.c Modified: vendor/wine/dlls/winmm/current/mmsystem.c Modified: vendor/wine/dlls/winmm/current/playsound.c Deleted: vendor/wine/dlls/winmm/current/wavemap/.cvsignore Modified: vendor/wine/dlls/winmm/current/wavemap/wavemap.c Modified: vendor/wine/dlls/winmm/current/winemm.h Modified: vendor/wine/dlls/winmm/current/winmm.c Modified: vendor/wine/dlls/winmm/current/winmm.spec _____ Copied: vendor/wine/dlls/winmm/Wine-20050111 (from rev 12927, vendor/wine/dlls/winmm/current) _____ Modified: vendor/wine/dlls/winmm/Wine-20050111/driver.c --- vendor/wine/dlls/winmm/current/driver.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/driver.c 2005-01-12 19:29:11 UTC (rev 12982) @@ -368,8 +368,8 @@ ret = OpenDriverA(dn, sn, lParam); - if (dn) HeapFree(GetProcessHeap(), 0, dn); - if (sn) HeapFree(GetProcessHeap(), 0, sn); + HeapFree(GetProcessHeap(), 0, dn); + HeapFree(GetProcessHeap(), 0, sn); return ret; } _____ Modified: vendor/wine/dlls/winmm/Wine-20050111/joystick.c --- vendor/wine/dlls/winmm/current/joystick.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/joystick.c 2005-01-12 19:29:11 UTC (rev 12982) @@ -137,9 +137,9 @@ } /*********************************************************************** *** - * joyGetDevCapsA [WINMM.@] + * joyGetDevCapsW [WINMM.@] */ -MMRESULT WINAPI joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) +MMRESULT WINAPI joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) { if (wID >= MAXJOYSTICK) return JOYERR_PARMS; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; @@ -151,43 +151,49 @@ } /*********************************************************************** *** - * joyGetDevCapsW [WINMM.@] + * joyGetDevCapsA [WINMM.@] */ -MMRESULT WINAPI joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) +MMRESULT WINAPI joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) { - JOYCAPSA jca; - MMRESULT ret = joyGetDevCapsA(wID, &jca, sizeof(jca)); + JOYCAPSW jcw; + MMRESULT ret; - if (ret != JOYERR_NOERROR) return ret; - lpCaps->wMid = jca.wMid; - lpCaps->wPid = jca.wPid; - MultiByteToWideChar( CP_ACP, 0, jca.szPname, -1, lpCaps->szPname, - sizeof(lpCaps->szPname)/sizeof(WCHAR) ); - lpCaps->wXmin = jca.wXmin; - lpCaps->wXmax = jca.wXmax; - lpCaps->wYmin = jca.wYmin; - lpCaps->wYmax = jca.wYmax; - lpCaps->wZmin = jca.wZmin; - lpCaps->wZmax = jca.wZmax; - lpCaps->wNumButtons = jca.wNumButtons; - lpCaps->wPeriodMin = jca.wPeriodMin; - lpCaps->wPeriodMax = jca.wPeriodMax; + if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - if (wSize >= sizeof(JOYCAPSW)) { /* Win95 extensions ? */ - lpCaps->wRmin = jca.wRmin; - lpCaps->wRmax = jca.wRmax; - lpCaps->wUmin = jca.wUmin; - lpCaps->wUmax = jca.wUmax; - lpCaps->wVmin = jca.wVmin; - lpCaps->wVmax = jca.wVmax; - lpCaps->wCaps = jca.wCaps; - lpCaps->wMaxAxes = jca.wMaxAxes; - lpCaps->wNumAxes = jca.wNumAxes; - lpCaps->wMaxButtons = jca.wMaxButtons; - MultiByteToWideChar( CP_ACP, 0, jca.szRegKey, -1, lpCaps->szRegKey, - sizeof(lpCaps->szRegKey)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, jca.szOEMVxD, -1, lpCaps->szOEMVxD, - sizeof(lpCaps->szOEMVxD)/sizeof(WCHAR) ); + ret = joyGetDevCapsW(wID, &jcw, sizeof(jcw)); + + if (ret == JOYERR_NOERROR) + { + lpCaps->wMid = jcw.wMid; + lpCaps->wPid = jcw.wPid; + WideCharToMultiByte( CP_ACP, 0, jcw.szPname, -1, lpCaps->szPname, + sizeof(lpCaps->szPname), NULL, NULL ); + lpCaps->wXmin = jcw.wXmin; + lpCaps->wXmax = jcw.wXmax; + lpCaps->wYmin = jcw.wYmin; + lpCaps->wYmax = jcw.wYmax; + lpCaps->wZmin = jcw.wZmin; + lpCaps->wZmax = jcw.wZmax; + lpCaps->wNumButtons = jcw.wNumButtons; + lpCaps->wPeriodMin = jcw.wPeriodMin; + lpCaps->wPeriodMax = jcw.wPeriodMax; + + if (wSize >= sizeof(JOYCAPSA)) { /* Win95 extensions ? */ + lpCaps->wRmin = jcw.wRmin; + lpCaps->wRmax = jcw.wRmax; + lpCaps->wUmin = jcw.wUmin; + lpCaps->wUmax = jcw.wUmax; + lpCaps->wVmin = jcw.wVmin; + lpCaps->wVmax = jcw.wVmax; + lpCaps->wCaps = jcw.wCaps; + lpCaps->wMaxAxes = jcw.wMaxAxes; + lpCaps->wNumAxes = jcw.wNumAxes; + lpCaps->wMaxButtons = jcw.wMaxButtons; + WideCharToMultiByte( CP_ACP, 0, jcw.szRegKey, -1, lpCaps->szRegKey, + sizeof(lpCaps->szRegKey), NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, jcw.szOEMVxD, -1, lpCaps->szOEMVxD, + sizeof(lpCaps->szOEMVxD), NULL, NULL ); + } } return ret; _____ Modified: vendor/wine/dlls/winmm/Wine-20050111/lolvldrv.c --- vendor/wine/dlls/winmm/current/lolvldrv.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/lolvldrv.c 2005-01-12 19:29:11 UTC (rev 12982) @@ -504,6 +504,7 @@ case DRVM_MAPPER_PREFERRED_GET: /* FIXME: get from registry someday */ *((LPDWORD)dwParam1) = -1; /* No preferred device */ + *((LPDWORD)dwParam2) = 0; break; case DRV_QUERYDEVICEINTERFACE: _____ Modified: vendor/wine/dlls/winmm/Wine-20050111/mci.c --- vendor/wine/dlls/winmm/current/mci.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/mci.c 2005-01-12 19:29:11 UTC (rev 12982) @@ -415,10 +415,8 @@ return FALSE; S_MciCmdTable[uTbl].lpTable = NULL; - if (S_MciCmdTable[uTbl].aVerbs) { - HeapFree(GetProcessHeap(), 0, S_MciCmdTable[uTbl].aVerbs); - S_MciCmdTable[uTbl].aVerbs = 0; - } + HeapFree(GetProcessHeap(), 0, S_MciCmdTable[uTbl].aVerbs); + S_MciCmdTable[uTbl].aVerbs = 0; return TRUE; } @@ -1090,7 +1088,7 @@ if (lpwstrRet) MultiByteToWideChar( CP_ACP, 0, lpstrRet, -1, lpwstrRet, uRetLen ); HeapFree(GetProcessHeap(), 0, lpstrCommand); - if (lpstrRet) HeapFree(GetProcessHeap(), 0, lpstrRet); + HeapFree(GetProcessHeap(), 0, lpstrRet); return ret; } _____ Modified: vendor/wine/dlls/winmm/Wine-20050111/message16.c --- vendor/wine/dlls/winmm/current/message16.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/message16.c 2005-01-12 19:29:11 UTC (rev 12982) @@ -1,7 +1,7 @@ /* -*- tab-width: 8; c-basic-offset: 4 -*- */ /* - * MMSYTEM MCI and low level mapping functions + * MMSYSTEM MCI and low level mapping functions * * Copyright 1999 Eric Pouech * @@ -297,14 +297,14 @@ case MODM_GETDEVCAPS: { - LPMIDIOUTCAPSA moc32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPMIDIOUTCAPS16) + sizeof(MIDIOUTCAPSA)); + LPMIDIOUTCAPSW moc32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPMIDIOUTCAPS16) + sizeof(MIDIOUTCAPSW)); LPMIDIOUTCAPS16 moc16 = MapSL(*lpParam1); if (moc32) { *(LPMIDIOUTCAPS16*)moc32 = moc16; - moc32 = (LPMIDIOUTCAPSA)((LPSTR)moc32 + sizeof(LPMIDIOUTCAPS16)); + moc32 = (LPMIDIOUTCAPSW)((LPSTR)moc32 + sizeof(LPMIDIOUTCAPS16)); *lpParam1 = (DWORD)moc32; - *lpParam2 = sizeof(MIDIOUTCAPSA); + *lpParam2 = sizeof(MIDIOUTCAPSW); ret = WINMM_MAP_OKMEM; } else { @@ -390,13 +390,14 @@ case MODM_GETDEVCAPS: { - LPMIDIOUTCAPSA moc32 = (LPMIDIOUTCAPSA)(*lpParam1); + LPMIDIOUTCAPSW moc32 = (LPMIDIOUTCAPSW)(*lpParam1); LPMIDIOUTCAPS16 moc16 = *(LPMIDIOUTCAPS16*)((LPSTR)moc32 - sizeof(LPMIDIOUTCAPS16)); moc16->wMid = moc32->wMid; moc16->wPid = moc32->wPid; moc16->vDriverVersion = moc32->vDriverVersion; - strcpy(moc16->szPname, moc32->szPname); + WideCharToMultiByte( CP_ACP, 0, moc32->szPname, -1, moc16->szPname, + sizeof(moc16->szPname), NULL, NULL ); moc16->wTechnology = moc32->wTechnology; moc16->wVoices = moc32->wVoices; moc16->wNotes = moc32->wNotes; @@ -455,16 +456,16 @@ break; case MODM_GETDEVCAPS: { - LPMIDIOUTCAPSA moc32 = (LPMIDIOUTCAPSA)*lpParam1; - LPSTR ptr = HeapAlloc( GetProcessHeap(), 0, sizeof(LPMIDIOUTCAPSA)+sizeof(MIDIOUTCAPS16)); + LPMIDIOUTCAPSW moc32 = (LPMIDIOUTCAPSW)*lpParam1; + LPSTR ptr = HeapAlloc( GetProcessHeap(), 0, sizeof(LPMIDIOUTCAPSW)+sizeof(MIDIOUTCAPS16)); if (ptr) { - *(LPMIDIOUTCAPSA*)ptr = moc32; + *(LPMIDIOUTCAPSW*)ptr = moc32; ret = WINMM_MAP_OKMEM; } else { ret = WINMM_MAP_NOMEM; } - *lpParam1 = (DWORD)MapLS(ptr) + sizeof(LPMIDIOUTCAPSA); + *lpParam1 = (DWORD)MapLS(ptr) + sizeof(LPMIDIOUTCAPSW); *lpParam2 = sizeof(MIDIOUTCAPS16); } break; @@ -596,13 +597,14 @@ case MODM_GETDEVCAPS: { LPMIDIOUTCAPS16 moc16 = MapSL(*lpParam1); - LPSTR ptr = (LPSTR)moc16 - sizeof(LPMIDIOUTCAPSA); - LPMIDIOUTCAPSA moc32 = *(LPMIDIOUTCAPSA*)ptr; + LPSTR ptr = (LPSTR)moc16 - sizeof(LPMIDIOUTCAPSW); + LPMIDIOUTCAPSW moc32 = *(LPMIDIOUTCAPSW*)ptr; moc32->wMid = moc16->wMid; moc32->wPid = moc16->wPid; moc32->vDriverVersion = moc16->vDriverVersion; - strcpy(moc32->szPname, moc16->szPname); + WideCharToMultiByte( CP_ACP, 0, moc32->szPname, -1, moc16->szPname, + sizeof(moc16->szPname), NULL, NULL ); moc32->wTechnology = moc16->wTechnology; moc32->wVoices = moc16->wVoices; moc32->wNotes = moc16->wNotes; @@ -723,14 +725,14 @@ break; case WIDM_GETDEVCAPS: { - LPWAVEINCAPSA wic32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPWAVEINCAPS16) + sizeof(WAVEINCAPSA)); + LPWAVEINCAPSW wic32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPWAVEINCAPS16) + sizeof(WAVEINCAPSW)); LPWAVEINCAPS16 wic16 = MapSL(*lpParam1); if (wic32) { *(LPWAVEINCAPS16*)wic32 = wic16; - wic32 = (LPWAVEINCAPSA)((LPSTR)wic32 + sizeof(LPWAVEINCAPS16)); + wic32 = (LPWAVEINCAPSW)((LPSTR)wic32 + sizeof(LPWAVEINCAPS16)); *lpParam1 = (DWORD)wic32; - *lpParam2 = sizeof(WAVEINCAPSA); + *lpParam2 = sizeof(WAVEINCAPSW); ret = WINMM_MAP_OKMEM; } else { @@ -833,13 +835,14 @@ break; case WIDM_GETDEVCAPS: { - LPWAVEINCAPSA wic32 = (LPWAVEINCAPSA)(*lpParam1); + LPWAVEINCAPSW wic32 = (LPWAVEINCAPSW)(*lpParam1); LPWAVEINCAPS16 wic16 = *(LPWAVEINCAPS16*)((LPSTR)wic32 - sizeof(LPWAVEINCAPS16)); wic16->wMid = wic32->wMid; wic16->wPid = wic32->wPid; wic16->vDriverVersion = wic32->vDriverVersion; - strcpy(wic16->szPname, wic32->szPname); + WideCharToMultiByte( CP_ACP, 0, wic32->szPname, -1, wic16->szPname, + sizeof(wic16->szPname), NULL, NULL ); wic16->dwFormats = wic32->dwFormats; wic16->wChannels = wic32->wChannels; HeapFree(GetProcessHeap(), 0, (LPSTR)wic32 - sizeof(LPWAVEINCAPS16)); @@ -1010,16 +1013,16 @@ break; case WIDM_GETDEVCAPS: { - LPWAVEINCAPSA wic32 = (LPWAVEINCAPSA)*lpParam1; - LPSTR ptr = HeapAlloc( GetProcessHeap(), 0 ,sizeof(LPWAVEINCAPSA) + sizeof(WAVEINCAPS16)); + LPWAVEINCAPSW wic32 = (LPWAVEINCAPSW)*lpParam1; + LPSTR ptr = HeapAlloc( GetProcessHeap(), 0 ,sizeof(LPWAVEINCAPSW) + sizeof(WAVEINCAPS16)); if (ptr) { - *(LPWAVEINCAPSA*)ptr = wic32; + *(LPWAVEINCAPSW*)ptr = wic32; ret = WINMM_MAP_OKMEM; } else { ret = WINMM_MAP_NOMEM; } - *lpParam1 = MapLS(ptr) + sizeof(LPWAVEINCAPSA); + *lpParam1 = MapLS(ptr) + sizeof(LPWAVEINCAPSW); *lpParam2 = sizeof(WAVEINCAPS16); } break; @@ -1109,13 +1112,14 @@ case WIDM_GETDEVCAPS: { LPWAVEINCAPS16 wic16 = MapSL(*lpParam1); - LPSTR ptr = (LPSTR)wic16 - sizeof(LPWAVEINCAPSA); - LPWAVEINCAPSA wic32 = *(LPWAVEINCAPSA*)ptr; + LPSTR ptr = (LPSTR)wic16 - sizeof(LPWAVEINCAPSW); + LPWAVEINCAPSW wic32 = *(LPWAVEINCAPSW*)ptr; wic32->wMid = wic16->wMid; wic32->wPid = wic16->wPid; wic32->vDriverVersion = wic16->vDriverVersion; - strcpy(wic32->szPname, wic16->szPname); + WideCharToMultiByte( CP_ACP, 0, wic32->szPname, -1, wic16->szPname, + sizeof(wic16->szPname), NULL, NULL ); wic32->dwFormats = wic16->dwFormats; wic32->wChannels = wic16->wChannels; UnMapLS( *lpParam1 ); @@ -1222,14 +1226,14 @@ case WODM_GETDEVCAPS: { - LPWAVEOUTCAPSA woc32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPWAVEOUTCAPS16) + sizeof(WAVEOUTCAPSA)); + LPWAVEOUTCAPSW woc32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPWAVEOUTCAPS16) + sizeof(WAVEOUTCAPSW)); LPWAVEOUTCAPS16 woc16 = MapSL(*lpParam1); if (woc32) { *(LPWAVEOUTCAPS16*)woc32 = woc16; - woc32 = (LPWAVEOUTCAPSA)((LPSTR)woc32 + sizeof(LPWAVEOUTCAPS16)); + woc32 = (LPWAVEOUTCAPSW)((LPSTR)woc32 + sizeof(LPWAVEOUTCAPS16)); *lpParam1 = (DWORD)woc32; - *lpParam2 = sizeof(WAVEOUTCAPSA); + *lpParam2 = sizeof(WAVEOUTCAPSW); ret = WINMM_MAP_OKMEM; } else { @@ -1341,13 +1345,14 @@ case WODM_GETDEVCAPS: { - LPWAVEOUTCAPSA woc32 = (LPWAVEOUTCAPSA)(*lpParam1); + LPWAVEOUTCAPSW woc32 = (LPWAVEOUTCAPSW)(*lpParam1); LPWAVEOUTCAPS16 woc16 = *(LPWAVEOUTCAPS16*)((LPSTR)woc32 - sizeof(LPWAVEOUTCAPS16)); woc16->wMid = woc32->wMid; woc16->wPid = woc32->wPid; woc16->vDriverVersion = woc32->vDriverVersion; - strcpy(woc16->szPname, woc32->szPname); + WideCharToMultiByte( CP_ACP, 0, woc32->szPname, -1, woc16->szPname, + sizeof(woc16->szPname), NULL, NULL ); woc16->dwFormats = woc32->dwFormats; woc16->wChannels = woc32->wChannels; woc16->dwSupport = woc32->dwSupport; @@ -1416,17 +1421,17 @@ case WODM_GETDEVCAPS: { - LPWAVEOUTCAPSA woc32 = (LPWAVEOUTCAPSA)*lpParam1; + LPWAVEOUTCAPSW woc32 = (LPWAVEOUTCAPSW)*lpParam1; LPSTR ptr = HeapAlloc( GetProcessHeap(), 0, - sizeof(LPWAVEOUTCAPSA) + sizeof(WAVEOUTCAPS16)); + sizeof(LPWAVEOUTCAPSW) + sizeof(WAVEOUTCAPS16)); if (ptr) { - *(LPWAVEOUTCAPSA*)ptr = woc32; + *(LPWAVEOUTCAPSW*)ptr = woc32; ret = WINMM_MAP_OKMEM; } else { ret = WINMM_MAP_NOMEM; } - *lpParam1 = MapLS(ptr) + sizeof(LPWAVEOUTCAPSA); + *lpParam1 = MapLS(ptr) + sizeof(LPWAVEOUTCAPSW); *lpParam2 = sizeof(WAVEOUTCAPS16); } break; @@ -1606,13 +1611,14 @@ case WODM_GETDEVCAPS: { LPWAVEOUTCAPS16 woc16 = MapSL(*lpParam1); - LPSTR ptr = (LPSTR)woc16 - sizeof(LPWAVEOUTCAPSA); - LPWAVEOUTCAPSA woc32 = *(LPWAVEOUTCAPSA*)ptr; + LPSTR ptr = (LPSTR)woc16 - sizeof(LPWAVEOUTCAPSW); + LPWAVEOUTCAPSW woc32 = *(LPWAVEOUTCAPSW*)ptr; woc32->wMid = woc16->wMid; woc32->wPid = woc16->wPid; woc32->vDriverVersion = woc16->vDriverVersion; - strcpy(woc32->szPname, woc16->szPname); + WideCharToMultiByte( CP_ACP, 0, woc32->szPname, -1, woc16->szPname, + sizeof(woc16->szPname), NULL, NULL ); woc32->dwFormats = woc16->dwFormats; woc32->wChannels = woc16->wChannels; woc32->dwSupport = woc16->dwSupport; _____ Deleted: vendor/wine/dlls/winmm/Wine-20050111/midimap/.cvsignore --- vendor/wine/dlls/winmm/current/midimap/.cvsignore 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/midimap/.cvsignore 2005-01-12 19:29:11 UTC (rev 12982) @@ -1,2 +0,0 @@ -Makefile -midimap.drv.dbg.c _____ Modified: vendor/wine/dlls/winmm/Wine-20050111/midimap/midimap.c --- vendor/wine/dlls/winmm/current/midimap/midimap.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/midimap/midimap.c 2005-01-12 19:29:11 UTC (rev 12982) @@ -32,6 +32,7 @@ #include "winuser.h" #include "mmddk.h" #include "winreg.h" +#include "wine/unicode.h" #include "wine/debug.h" /* @@ -80,7 +81,7 @@ typedef struct tagMIDIOUTPORT { - char name[MAXPNAMELEN]; + WCHAR name[MAXPNAMELEN]; int loaded; HMIDIOUT hMidi; unsigned short uDevID; @@ -105,31 +106,36 @@ return TRUE; } -static BOOL MIDIMAP_FindPort(const char* name, unsigned* dev) +static BOOL MIDIMAP_FindPort(const WCHAR* name, unsigned* dev) { for (*dev = 0; *dev < numMidiOutPorts; (*dev)++) { - TRACE("%s\n", midiOutPorts[*dev].name); - if (strcmp(midiOutPorts[*dev].name, name) == 0) + TRACE("%s\n", wine_dbgstr_w(midiOutPorts[*dev].name)); + if (strcmpW(midiOutPorts[*dev].name, name) == 0) return TRUE; } /* try the form #nnn */ if (*name == '#' && isdigit(name[1])) { - *dev = atoi(name + 1); + const WCHAR* ptr = name + 1; + *dev = 0; + do + { + *dev = *dev * 10 + *ptr - '0'; + } while (isdigit(*++ptr)); if (*dev < numMidiOutPorts) return TRUE; } return FALSE; } -static BOOL MIDIMAP_LoadSettingsDefault(MIDIMAPDATA* mom, const char* port) +static BOOL MIDIMAP_LoadSettingsDefault(MIDIMAPDATA* mom, const WCHAR* port) { unsigned i, dev = 0; if (port != NULL && !MIDIMAP_FindPort(port, &dev)) { - ERR("Registry glitch: couldn't find midi out (%s)\n", port); + ERR("Registry glitch: couldn't find midi out (%s)\n", wine_dbgstr_w(port)); dev = 0; } @@ -142,11 +148,11 @@ return TRUE; } -static BOOL MIDIMAP_LoadSettingsScheme(MIDIMAPDATA* mom, const char* scheme) +static BOOL MIDIMAP_LoadSettingsScheme(MIDIMAPDATA* mom, const WCHAR* scheme) { HKEY hSchemesKey, hKey, hPortKey; unsigned i, idx, dev; - char buffer[256], port[256]; + WCHAR buffer[256], port[256]; DWORD type, size, mask; for (i = 0; i < 16; i++) mom->ChannelMap[i] = NULL; @@ -157,18 +163,18 @@ { return FALSE; } - if (RegOpenKeyA(hSchemesKey, scheme, &hKey)) + if (RegOpenKeyW(hSchemesKey, scheme, &hKey)) { RegCloseKey(hSchemesKey); return FALSE; } - for (idx = 0; !RegEnumKeyA(hKey, idx, buffer, sizeof(buffer)); idx++) + for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, sizeof(buffer)); idx++) { - if (RegOpenKeyA(hKey, buffer, &hPortKey)) continue; + if (RegOpenKeyW(hKey, buffer, &hPortKey)) continue; size = sizeof(port); - if (RegQueryValueExA(hPortKey, NULL, 0, &type, port, &size)) continue; + if (RegQueryValueExW(hPortKey, NULL, 0, &type, (void*)port, &size)) continue; if (!MIDIMAP_FindPort(port, &dev)) continue; @@ -206,14 +212,15 @@ else { DWORD type, size, out; - char buffer[256]; + WCHAR buffer[256]; ret = 2; size = sizeof(out); if (!RegQueryValueExA(hKey, "UseScheme", 0, &type, (void*)&out, &size) && out) { + static const WCHAR cs[] = {'C','u','r','r','e','n','t','S','c','h','e','m','e',0}; size = sizeof(buffer); - if (!RegQueryValueExA(hKey, "CurrentScheme", 0, &type, buffer, &size)) + if (!RegQueryValueExW(hKey, cs, 0, &type, (void*)buffer, &size)) { if (!(ret = MIDIMAP_LoadSettingsScheme(mom, buffer))) ret = MIDIMAP_LoadSettingsDefault(mom, NULL); @@ -225,8 +232,9 @@ } if (ret == 2) { + static const WCHAR ci[] = {'C','u','r','r','e','n','t','I','n','s','t','r','u','m','e','n','t',0}; size = sizeof(buffer); - if (!RegQueryValueExA(hKey, "CurrentInstrument", 0, &type, buffer, &size) && *buffer) + if (!RegQueryValueExW(hKey, ci, 0, &type, (void*)buffer, &size) && *buffer) { ret = MIDIMAP_LoadSettingsDefault(mom, buffer); } @@ -404,12 +412,13 @@ return MMSYSERR_NOERROR; } -static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSA lpMidiCaps, DWORD size) +static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD size) { + static const WCHAR name[] = {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}; lpMidiCaps->wMid = 0x00FF; lpMidiCaps->wPid = 0x0001; lpMidiCaps->vDriverVersion = 0x0100; - strcpy(lpMidiCaps->szPname, "Wine midi out mapper"); + lstrcpyW(lpMidiCaps->szPname, name); lpMidiCaps->wTechnology = MOD_MAPPER; lpMidiCaps->wVoices = 0; lpMidiCaps->wNotes = 0; @@ -465,7 +474,7 @@ case MODM_UNPREPARE: return modUnprepare ((MIDIMAPDATA*)dwUser, (LPMIDIHDR)dwParam1, dwParam2); case MODM_RESET: return modReset ((MIDIMAPDATA*)dwUser); - case MODM_GETDEVCAPS: return modGetDevCaps (wDevID, (MIDIMAPDATA*)dwUser, (LPMIDIOUTCAPSA)dwParam1,dwParam2); + case MODM_GETDEVCAPS: return modGetDevCaps (wDevID, (MIDIMAPDATA*)dwUser, (LPMIDIOUTCAPSW)dwParam1,dwParam2); case MODM_GETNUMDEVS: return 1; case MODM_GETVOLUME: return MMSYSERR_NOTSUPPORTED; case MODM_SETVOLUME: return MMSYSERR_NOTSUPPORTED; @@ -484,7 +493,7 @@ */ static DWORD MIDIMAP_drvOpen(LPSTR str) { - MIDIOUTCAPSA moc; + MIDIOUTCAPSW moc; unsigned dev, i; if (midiOutPorts) @@ -495,9 +504,9 @@ numMidiOutPorts * sizeof(MIDIOUTPORT)); for (dev = 0; dev < numMidiOutPorts; dev++) { - if (midiOutGetDevCapsA(dev, &moc, sizeof(moc)) == 0L) + if (midiOutGetDevCapsW(dev, &moc, sizeof(moc)) == 0L) { - strcpy(midiOutPorts[dev].name, moc.szPname); + strcpyW(midiOutPorts[dev].name, moc.szPname); midiOutPorts[dev].loaded = 0; midiOutPorts[dev].hMidi = 0; midiOutPorts[dev].uDevID = dev; _____ Modified: vendor/wine/dlls/winmm/Wine-20050111/mmio.c --- vendor/wine/dlls/winmm/current/mmio.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/mmio.c 2005-01-12 19:29:11 UTC (rev 12982) @@ -703,7 +703,7 @@ { INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); szFn = HeapAlloc( GetProcessHeap(), 0, len ); - if (!szFn) return (HMMIO)NULL; + if (!szFn) return NULL; WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL ); } _____ Modified: vendor/wine/dlls/winmm/Wine-20050111/mmsystem.c --- vendor/wine/dlls/winmm/current/mmsystem.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/mmsystem.c 2005-01-12 19:29:11 UTC (rev 12982) @@ -1940,7 +1940,7 @@ lpMMThd->hTask = 0; if ((dwFlags & 1) == 0 && (GetProcessFlags(GetCurrentThreadId()) & 8) == 0) { - lpMMThd->hEvent = CreateEventA(0, 0, 1, 0); + lpMMThd->hEvent = CreateEventW(NULL, FALSE, TRUE, NULL); TRACE("Let's go crazy... trying new MM thread. lpMMThd=%p\n", lpMMThd); if (lpMMThd->dwFlags & 2) { @@ -2712,7 +2712,6 @@ mmioInfo16.adwInfo[0] = lpmmioinfo->adwInfo[0]; mmioInfo16.adwInfo[1] = lpmmioinfo->adwInfo[1]; mmioInfo16.adwInfo[2] = lpmmioinfo->adwInfo[2]; - mmioInfo16.adwInfo[3] = lpmmioinfo->adwInfo[3]; /* map (lParam1, lParam2) into (lp1, lp2) 32=>16 */ if ((result = MMIO_Map32To16(uMessage, &lp1, &lp2)) != MMSYSERR_NOERROR) return result; @@ -2733,7 +2732,6 @@ lpmmioinfo->adwInfo[0] = mmioInfo16.adwInfo[0]; lpmmioinfo->adwInfo[1] = mmioInfo16.adwInfo[1]; lpmmioinfo->adwInfo[2] = mmioInfo16.adwInfo[2]; - lpmmioinfo->adwInfo[3] = mmioInfo16.adwInfo[3]; return result; } @@ -2777,7 +2775,6 @@ mmioinfo.adwInfo[0] = (DWORD)DosFileHandleToWin32Handle(mmioinfo.adwInfo[0]); mmioinfo.adwInfo[1] = lpmmioinfo16->adwInfo[1]; mmioinfo.adwInfo[2] = lpmmioinfo16->adwInfo[2]; - mmioinfo.adwInfo[3] = lpmmioinfo16->adwInfo[3]; ret = MMIO_Open(szFileName, &mmioinfo, dwOpenFlags, MMIO_PROC_16); MMIO_SetSegmentedBuffer(mmioinfo.hmmio, (SEGPTR)lpmmioinfo16->pchBuffer, FALSE); @@ -2856,7 +2853,6 @@ lpmmioinfo->adwInfo[0] = mmioinfo.adwInfo[0]; lpmmioinfo->adwInfo[1] = mmioinfo.adwInfo[1]; lpmmioinfo->adwInfo[2] = mmioinfo.adwInfo[2]; - lpmmioinfo->adwInfo[3] = mmioinfo.adwInfo[3]; lpmmioinfo->dwReserved1 = 0; lpmmioinfo->dwReserved2 = 0; lpmmioinfo->hmmio = HMMIO_16(mmioinfo.hmmio); @@ -3065,8 +3061,12 @@ MMRESULT16 WINAPI joyGetDevCaps16(UINT16 wID, LPJOYCAPS16 lpCaps, UINT16 wSize) { JOYCAPSA jca; - MMRESULT ret = joyGetDevCapsA(wID, &jca, sizeof(jca)); + MMRESULT ret; + if (lpCaps == NULL) return MMSYSERR_INVALPARAM; + + ret = joyGetDevCapsA(wID, &jca, sizeof(jca)); + if (ret != JOYERR_NOERROR) return ret; lpCaps->wMid = jca.wMid; lpCaps->wPid = jca.wPid; _____ Modified: vendor/wine/dlls/winmm/Wine-20050111/playsound.c --- vendor/wine/dlls/winmm/current/playsound.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/playsound.c 2005-01-12 19:29:11 UTC (rev 12982) @@ -352,7 +352,7 @@ TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&mmckInfo.ckid, (LPSTR)&mmckInfo.fccType, mmckInfo.cksize); - s.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD)PlaySound_Callback, (DWORD)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) @@ -374,9 +374,9 @@ } s.dwEventCount = 1L; /* for first buffer */ + index = 0; do { - index = 0; left = mmckInfo.cksize; mmioSeek(hmmio, mmckInfo.dwDataOffset, SEEK_SET); @@ -410,8 +410,8 @@ errCleanUp: TRACE("Done playing='%s' => %s!\n", debugstr_w(wps->pszSound), bRet ? "ok" : "ko"); CloseHandle(s.hEvent); - if (waveHdr) HeapFree(GetProcessHeap(), 0, waveHdr); - if (lpWaveFormat) HeapFree(GetProcessHeap(), 0, lpWaveFormat); + HeapFree(GetProcessHeap(), 0, waveHdr); + HeapFree(GetProcessHeap(), 0, lpWaveFormat); if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); if (hmmio) mmioClose(hmmio, 0); _____ Deleted: vendor/wine/dlls/winmm/Wine-20050111/wavemap/.cvsignore --- vendor/wine/dlls/winmm/current/wavemap/.cvsignore 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/wavemap/.cvsignore 2005-01-12 19:29:11 UTC (rev 12982) @@ -1,2 +0,0 @@ -Makefile -msacm.drv.dbg.c _____ Modified: vendor/wine/dlls/winmm/Wine-20050111/wavemap/wavemap.c --- vendor/wine/dlls/winmm/current/wavemap/wavemap.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/wavemap/wavemap.c 2005-01-12 19:29:11 UTC (rev 12982) @@ -37,6 +37,7 @@ #include "mmddk.h" #include "mmreg.h" #include "msacm.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wavemap); @@ -269,8 +270,8 @@ WARN("ret = WAVERR_BADFORMAT\n"); return WAVERR_BADFORMAT; } - WARN("ret = MMSYSERR_ERROR\n"); - return MMSYSERR_ERROR; + WARN("ret = 0x%08lx\n", res); + return res; } static DWORD wodClose(WAVEMAPDATA* wom) @@ -422,13 +423,15 @@ return val; } -static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSA lpWaveCaps, DWORD dwParam2) +static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveCaps, DWORD dwParam2) { + static const WCHAR name[] = {'W','i','n','e',' ','w','a','v','e',' ','o','u','t',' ','m','a','p','p','e','r',0}; + TRACE("(%04x %p %p %08lx)\n",wDevID, wom, lpWaveCaps, dwParam2); /* if opened low driver, forward message */ if (WAVEMAP_IsData(wom)) - return waveOutGetDevCapsA((UINT)wom->u.out.hInnerWave, lpWaveCaps, dwParam2); + return waveOutGetDevCapsW((UINT)wom->u.out.hInnerWave, lpWaveCaps, dwParam2); /* else if no drivers, nothing to map so return bad device */ if (waveOutGetNumDevs() == 0) { WARN("bad device id\n"); @@ -436,11 +439,11 @@ } /* otherwise, return caps of mapper itself */ if (wDevID == (UINT)-1 || wDevID == (UINT16)-1) { - WAVEOUTCAPSA woc; + WAVEOUTCAPSW woc; woc.wMid = 0x00FF; woc.wPid = 0x0001; woc.vDriverVersion = 0x0100; - strcpy(woc.szPname, "Wine wave out mapper"); + lstrcpyW(woc.szPname, name); woc.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 | @@ -556,7 +559,7 @@ case WODM_BREAKLOOP: return wodBreakLoop ((WAVEMAPDATA*)dwUser); case WODM_PREPARE: return wodPrepare ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); case WODM_UNPREPARE: return wodUnprepare ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); - case WODM_GETDEVCAPS: return wodGetDevCaps (wDevID, (WAVEMAPDATA*)dwUser, (LPWAVEOUTCAPSA)dwParam1,dwParam2); + case WODM_GETDEVCAPS: return wodGetDevCaps (wDevID, (WAVEMAPDATA*)dwUser, (LPWAVEOUTCAPSW)dwParam1,dwParam2); case WODM_GETNUMDEVS: return 1; case WODM_GETPITCH: return MMSYSERR_NOTSUPPORTED; case WODM_SETPITCH: return MMSYSERR_NOTSUPPORTED; @@ -778,8 +781,8 @@ WARN("ret = WAVERR_BADFORMAT\n"); return WAVERR_BADFORMAT; } - WARN("ret = MMSYSERR_ERROR\n"); - return MMSYSERR_ERROR; + WARN("ret = 0x%08lx\n", res); + return res; } static DWORD widClose(WAVEMAPDATA* wim) @@ -916,13 +919,13 @@ return val; } -static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSA lpWaveCaps, DWORD dwParam2) +static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSW lpWaveCaps, DWORD dwParam2) { TRACE("(%04x, %p %p %08lx)\n", wDevID, wim, lpWaveCaps, dwParam2); /* if opened low driver, forward message */ if (WAVEMAP_IsData(wim)) - return waveInGetDevCapsA((UINT)wim->u.in.hInnerWave, lpWaveCaps, dwParam2); + return waveInGetDevCapsW((UINT)wim->u.in.hInnerWave, lpWaveCaps, dwParam2); /* else if no drivers, nothing to map so return bad device */ if (waveInGetNumDevs() == 0) { WARN("bad device id\n"); @@ -930,11 +933,12 @@ } /* otherwise, return caps of mapper itself */ if (wDevID == (UINT)-1 || wDevID == (UINT16)-1) { - WAVEINCAPSA wic; + WAVEINCAPSW wic; + static const WCHAR init[] = {'W','i','n','e',' ','w','a','v','e',' ','i','n',' ','m','a','p','p','e','r',0}; wic.wMid = 0x00FF; wic.wPid = 0x0001; wic.vDriverVersion = 0x0001; - strcpy(wic.szPname, "Wine wave in mapper"); + strcpyW(wic.szPname, init); wic.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 | @@ -1023,7 +1027,7 @@ case WIDM_ADDBUFFER: return widAddBuffer ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); case WIDM_PREPARE: return widPrepare ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); case WIDM_UNPREPARE: return widUnprepare ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); - case WIDM_GETDEVCAPS: return widGetDevCaps (wDevID, (WAVEMAPDATA*)dwUser, (LPWAVEINCAPSA)dwParam1, dwParam2); + case WIDM_GETDEVCAPS: return widGetDevCaps (wDevID, (WAVEMAPDATA*)dwUser, (LPWAVEINCAPSW)dwParam1, dwParam2); case WIDM_GETNUMDEVS: return 1; case WIDM_GETPOS: return widGetPosition ((WAVEMAPDATA*)dwUser, (LPMMTIME)dwParam1, dwParam2); case WIDM_RESET: return widReset ((WAVEMAPDATA*)dwUser); _____ Modified: vendor/wine/dlls/winmm/Wine-20050111/winemm.h --- vendor/wine/dlls/winmm/current/winemm.h 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/winemm.h 2005-01-12 19:29:11 UTC (rev 12982) @@ -267,7 +267,7 @@ DWORD cMidi, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD fdwOpen, BOOL bFrom32); UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, - const LPWAVEFORMATEX lpFormat, DWORD_PTR dwCallback, + LPCWAVEFORMATEX lpFormat, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags, BOOL bFrom32); HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, _____ Modified: vendor/wine/dlls/winmm/Wine-20050111/winmm.c --- vendor/wine/dlls/winmm/current/winmm.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/winmm/Wine-20050111/winmm.c 2005-01-12 19:29:11 UTC (rev 12982) @@ -95,8 +95,8 @@ WINMM_IData->hWinMM32Instance = hInstDLL; InitializeCriticalSection(&WINMM_IData->cs); WINMM_IData->cs.DebugInfo->Spare[1] = (DWORD)"WINMM_IData"; - WINMM_IData->psStopEvent = CreateEventA(NULL, TRUE, FALSE, NULL); - WINMM_IData->psLastEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + WINMM_IData->psStopEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + WINMM_IData->psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); TRACE("Created IData (%p)\n", WINMM_IData); return TRUE; } @@ -291,14 +291,25 @@ */ UINT WINAPI mixerGetDevCapsA(UINT_PTR uDeviceID, LPMIXERCAPSA lpCaps, UINT uSize) { - LPWINE_MLD wmld; + MIXERCAPSW micW; + UINT ret; - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; + if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_MIXER, TRUE)) == NULL) - return MMSYSERR_BADDEVICEID; + ret = mixerGetDevCapsW(uDeviceID, &micW, sizeof(micW)); - return MMDRV_Message(wmld, MXDM_GETDEVCAPS, (DWORD_PTR)lpCaps, uSize, TRUE); + if (ret == MMSYSERR_NOERROR) { + MIXERCAPSA micA; + micA.wMid = micW.wMid; + micA.wPid = micW.wPid; + micA.vDriverVersion = micW.vDriverVersion; + WideCharToMultiByte( CP_ACP, 0, micW.szPname, -1, micA.szPname, + sizeof(micA.szPname), NULL, NULL ); + micA.fdwSupport = micW.fdwSupport; + micA.cDestinations = micW.cDestinations; + memcpy(lpCaps, &micA, min(uSize, sizeof(micA))); + } + return ret; } /*********************************************************************** *** @@ -306,24 +317,14 @@ */ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize) { - MIXERCAPSA micA; - UINT ret; + LPWINE_MLD wmld; - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; + if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - ret = mixerGetDevCapsA(uDeviceID, &micA, sizeof(micA)); - if (ret == MMSYSERR_NOERROR) { - MIXERCAPSW micW; - micW.wMid = micA.wMid; - micW.wPid = micA.wPid; - micW.vDriverVersion = micA.vDriverVersion; - MultiByteToWideChar( CP_ACP, 0, micA.szPname, -1, micW.szPname, - sizeof(micW.szPname)/sizeof(WCHAR) ); - micW.fdwSupport = micA.fdwSupport; - micW.cDestinations = micA.cDestinations; - memcpy(lpCaps, &micW, min(uSize, sizeof(micW))); - } - return ret; + if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_MIXER, TRUE)) == NULL) + return MMSYSERR_BADDEVICEID; + + return MMDRV_Message(wmld, MXDM_GETDEVCAPS, (DWORD_PTR)lpCaps, uSize, TRUE); } UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, @@ -404,75 +405,76 @@ } /*********************************************************************** *** - * mixerGetControlDetailsA [WINMM.@] + * mixerGetControlDetailsW [WINMM.@] */ -UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA, +UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW, DWORD fdwDetails) { LPWINE_MIXER lpwm; UINT uRet = MMSYSERR_NOERROR; - TRACE("(%p, %p, %08lx)\n", hmix, lpmcdA, fdwDetails); + TRACE("(%p, %p, %08lx)\n", hmix, lpmcdW, fdwDetails); if ((uRet = MIXER_GetDev(hmix, fdwDetails, &lpwm)) != MMSYSERR_NOERROR) return uRet; - if (lpmcdA == NULL || lpmcdA->cbStruct != sizeof(*lpmcdA)) + if (lpmcdW == NULL || lpmcdW->cbStruct != sizeof(*lpmcdW)) return MMSYSERR_INVALPARAM; - return MMDRV_Message(&lpwm->mld, MXDM_GETCONTROLDETAILS, (DWORD_PTR)lpmcdA, + return MMDRV_Message(&lpwm->mld, MXDM_GETCONTROLDETAILS, (DWORD_PTR)lpmcdW, fdwDetails, TRUE); } /*********************************************************************** *** - * mixerGetControlDetailsW [WINMM.@] + * mixerGetControlDetailsA [WINMM.@] */ -UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, DWORD fdwDetails) +UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA, + DWORD fdwDetails) { DWORD ret = MMSYSERR_NOTENABLED; - TRACE("(%p, %p, %08lx)\n", hmix, lpmcd, fdwDetails); + TRACE("(%p, %p, %08lx)\n", hmix, lpmcdA, fdwDetails); - if (lpmcd == NULL || lpmcd->cbStruct != sizeof(*lpmcd)) + if (lpmcdA == NULL || lpmcdA->cbStruct != sizeof(*lpmcdA)) return MMSYSERR_INVALPARAM; switch (fdwDetails & MIXER_GETCONTROLDETAILSF_QUERYMASK) { case MIXER_GETCONTROLDETAILSF_VALUE: - /* can savely use W structure as it is, no string inside */ - ret = mixerGetControlDetailsA(hmix, lpmcd, fdwDetails); + /* can savely use A structure as it is, no string inside */ + ret = mixerGetControlDetailsW(hmix, lpmcdA, fdwDetails); break; case MIXER_GETCONTROLDETAILSF_LISTTEXT: { - MIXERCONTROLDETAILS_LISTTEXTW *pDetailsW = (MIXERCONTROLDETAILS_LISTTEXTW *)lpmcd->paDetails; - MIXERCONTROLDETAILS_LISTTEXTA *pDetailsA; - int size = max(1, lpmcd->cChannels) * sizeof(MIXERCONTROLDETAILS_LISTTEXTA); + MIXERCONTROLDETAILS_LISTTEXTA *pDetailsA = (MIXERCONTROLDETAILS_LISTTEXTA *)lpmcdA->paDetails; + MIXERCONTROLDETAILS_LISTTEXTW *pDetailsW; + int size = max(1, lpmcdA->cChannels) * sizeof(MIXERCONTROLDETAILS_LISTTEXTW); unsigned int i; - if (lpmcd->u.cMultipleItems != 0) { - size *= lpmcd->u.cMultipleItems; + if (lpmcdA->u.cMultipleItems != 0) { + size *= lpmcdA->u.cMultipleItems; } - pDetailsA = (MIXERCONTROLDETAILS_LISTTEXTA *)HeapAlloc(GetProcessHeap(), 0, size); - lpmcd->paDetails = pDetailsA; - lpmcd->cbDetails = sizeof(MIXERCONTROLDETAILS_LISTTEXTA); + pDetailsW = (MIXERCONTROLDETAILS_LISTTEXTW *)HeapAlloc(GetProcessHeap(), 0, size); + lpmcdA->paDetails = pDetailsW; + lpmcdA->cbDetails = sizeof(MIXERCONTROLDETAILS_LISTTEXTW); /* set up lpmcd->paDetails */ - ret = mixerGetControlDetailsA(hmix, lpmcd, fdwDetails); + ret = mixerGetControlDetailsW(hmix, lpmcdA, fdwDetails); /* copy from lpmcd->paDetails back to paDetailsW; */ - if(ret == MMSYSERR_NOERROR) { - for(i=0;i<lpmcd->u.cMultipleItems*lpmcd->cChannels;i++) { - pDetailsW->dwParam1 = pDetailsA->dwParam1; - pDetailsW->dwParam2 = pDetailsA->dwParam2; - MultiByteToWideChar( CP_ACP, 0, pDetailsA->szName, -1, - pDetailsW->szName, - sizeof(pDetailsW->szName)/sizeof(WCHAR) ); + if (ret == MMSYSERR_NOERROR) { + for (i = 0; i < lpmcdA->u.cMultipleItems * lpmcdA->cChannels; i++) { + pDetailsA->dwParam1 = pDetailsW->dwParam1; + pDetailsA->dwParam2 = pDetailsW->dwParam2; + WideCharToMultiByte( CP_ACP, 0, pDetailsW->szName, -1, + pDetailsA->szName, + sizeof(pDetailsA->szName), NULL, NULL ); pDetailsA++; pDetailsW++; } - pDetailsA -= lpmcd->u.cMultipleItems*lpmcd->cChannels; - pDetailsW -= lpmcd->u.cMultipleItems*lpmcd->cChannels; + pDetailsA -= lpmcdA->u.cMultipleItems * lpmcdA->cChannels; + pDetailsW -= lpmcdA->u.cMultipleItems * lpmcdA->cChannels; } - HeapFree(GetProcessHeap(), 0, pDetailsA); - lpmcd->paDetails = pDetailsW; - lpmcd->cbDetails = sizeof(MIXERCONTROLDETAILS_LISTTEXTW); + HeapFree(GetProcessHeap(), 0, pDetailsW); + lpmcdA->paDetails = pDetailsA; + lpmcdA->cbDetails = sizeof(MIXERCONTROLDETAILS_LISTTEXTA); } break; default: [truncated at 1000 lines; 2363 more skipped]

19 years, 10 months

[gvg] 12981: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/urlmon/Wine-20050111/ Modified: vendor/wine/dlls/urlmon/Wine-20050111/umon.c Modified: vendor/wine/dlls/urlmon/current/umon.c _____ Copied: vendor/wine/dlls/urlmon/Wine-20050111 (from rev 12927, vendor/wine/dlls/urlmon/current) _____ Modified: vendor/wine/dlls/urlmon/Wine-20050111/umon.c --- vendor/wine/dlls/urlmon/current/umon.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/urlmon/Wine-20050111/umon.c 2005-01-12 19:28:53 UTC (rev 12981) @@ -123,9 +123,7 @@ /* destroy the object if there's no more reference on it */ if (ref == 0) { - if (This->URLName!=NULL) - HeapFree(GetProcessHeap(),0,This->URLName); - + HeapFree(GetProcessHeap(),0,This->URLName); HeapFree(GetProcessHeap(),0,This); } @@ -186,8 +184,7 @@ res = IStream_Read(pStm, &len, sizeof(ULONG), &got); if(SUCCEEDED(res)) { if(got == sizeof(ULONG)) { - if(This->URLName) - HeapFree(GetProcessHeap(), 0, This->URLName); + HeapFree(GetProcessHeap(), 0, This->URLName); This->URLName=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(len+1)); if(!This->URLName) res = E_OUTOFMEMORY; @@ -324,6 +321,7 @@ IBindStatusCallback *pbscb; BINDINFO bi; DWORD bindf; + IStream *pstr; FIXME("(%p)->(%p,%p,%s,%p): stub\n",This,pbc,pmkToLeft,debugstr_guid(riid),ppvObject); if(pmkToLeft) { @@ -339,32 +337,31 @@ We also need to implement IStream ourselves so that IStream_Read can return E_PENDING */ - hres = CreateStreamOnHGlobal(0, TRUE, (IStream**)ppvObject); + hres = CreateStreamOnHGlobal(0, TRUE, &pstr); - if(SUCCEEDED(hres)) { - TRACE("Created dummy stream...\n"); + TRACE("Created dummy stream...\n"); - hres = IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown**)&pbscb); - if(SUCCEEDED(hres)) { - TRACE("Got IBindStatusCallback...\n"); + hres = IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown**)&pbscb); + if(SUCCEEDED(hres)) { + TRACE("Got IBindStatusCallback...\n"); - memset(&bi, 0, sizeof(bi)); - bi.cbSize = sizeof(bi); - bindf = 0; - hres = IBindStatusCallback_GetBindInfo(pbscb, &bindf, &bi); - if(SUCCEEDED(hres)) { - URL_COMPONENTSW url; - WCHAR *host, *path; - DWORD len, lensz = sizeof(len), total_read = 0; - LARGE_INTEGER last_read_pos; - FORMATETC fmt; - STGMEDIUM stg; + memset(&bi, 0, sizeof(bi)); + bi.cbSize = sizeof(bi); + bindf = 0; + hres = IBindStatusCallback_GetBindInfo(pbscb, &bindf, &bi); + if(SUCCEEDED(hres)) { + URL_COMPONENTSW url; + WCHAR *host, *path; + DWORD len, lensz = sizeof(len), total_read = 0; + LARGE_INTEGER last_read_pos; + FORMATETC fmt; + STGMEDIUM stg; - TRACE("got bindinfo. bindf = %08lx extrainfo = %s bindinfof = %08lx bindverb = %08lx iid %s\n", - bindf, debugstr_w(bi.szExtraInfo), bi.grfBindInfoF, bi.dwBindVerb, debugstr_guid(&bi.iid)); - hres = IBindStatusCallback_OnStartBinding(pbscb, 0, (IBinding*)&This->lpvtbl2); - TRACE("OnStartBinding rets %08lx\n", hres); + TRACE("got bindinfo. bindf = %08lx extrainfo = %s bindinfof = %08lx bindverb = %08lx iid %s\n", + bindf, debugstr_w(bi.szExtraInfo), bi.grfBindInfoF, bi.dwBindVerb, debugstr_guid(&bi.iid)); + hres = IBindStatusCallback_OnStartBinding(pbscb, 0, (IBinding*)&This->lpvtbl2); + TRACE("OnStartBinding rets %08lx\n", hres); #if 0 if(!registered_wndclass) { @@ -377,80 +374,81 @@ URLMON_hInstance, NULL); #endif - memset(&url, 0, sizeof(url)); - url.dwStructSize = sizeof(url); - url.dwSchemeLength = url.dwHostNameLength = url.dwUrlPathLength = 1; - InternetCrackUrlW(This->URLName, 0, 0, &url); - host = HeapAlloc(GetProcessHeap(), 0, (url.dwHostNameLength + 1) * sizeof(WCHAR)); - memcpy(host, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); - host[url.dwHostNameLength] = '\0'; - path = HeapAlloc(GetProcessHeap(), 0, (url.dwUrlPathLength + 1) * sizeof(WCHAR)); - memcpy(path, url.lpszUrlPath, url.dwUrlPathLength * sizeof(WCHAR)); - path[url.dwUrlPathLength] = '\0'; + memset(&url, 0, sizeof(url)); + url.dwStructSize = sizeof(url); + url.dwSchemeLength = url.dwHostNameLength = url.dwUrlPathLength = 1; + InternetCrackUrlW(This->URLName, 0, 0, &url); + host = HeapAlloc(GetProcessHeap(), 0, (url.dwHostNameLength + 1) * sizeof(WCHAR)); + memcpy(host, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); + host[url.dwHostNameLength] = '\0'; + path = HeapAlloc(GetProcessHeap(), 0, (url.dwUrlPathLength + 1) * sizeof(WCHAR)); + memcpy(path, url.lpszUrlPath, url.dwUrlPathLength * sizeof(WCHAR)); + path[url.dwUrlPathLength] = '\0'; - This->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0 /*INTERNET_FLAG_ASYNC*/); -/* InternetSetStatusCallback(This->hinternet, URLMON_InternetCallback);*/ + This->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0 /*INTERNET_FLAG_ASYNC*/); +/* InternetSetStatusCallback(This->hinternet, URLMON_InternetCallback);*/ - This->hconnect = InternetConnectW(This->hinternet, host, INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, - INTERNET_SERVICE_HTTP, 0, (DWORD)This); - This->hrequest = HttpOpenRequestW(This->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD)This); + This->hconnect = InternetConnectW(This->hinternet, host, INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, (DWORD)This); + This->hrequest = HttpOpenRequestW(This->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD)This); - hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, 0x22, NULL); - hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_FINDINGRESOURCE, NULL); - hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_CONNECTING, NULL); - hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_SENDINGREQUEST, NULL); - hres = E_OUTOFMEMORY; /* FIXME */ - if(HttpSendRequestW(This->hrequest, NULL, 0, NULL, 0)) { + hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, 0x22, NULL); + hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_FINDINGRESOURCE, NULL); + hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_CONNECTING, NULL); + hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_SENDINGREQUEST, NULL); + hres = E_OUTOFMEMORY; /* FIXME */ + if(HttpSendRequestW(This->hrequest, NULL, 0, NULL, 0)) { + len = 0; + HttpQueryInfoW(This->hrequest, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &len, &lensz, NULL); - len = 0; - HttpQueryInfoW(This->hrequest, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &len, &lensz, NULL); + TRACE("res = %ld gle = %08lx url len = %ld\n", hres, GetLastError(), len); - TRACE("res = %ld gle = %08lx url len = %ld\n", hres, GetLastError(), len); + last_read_pos.u.LowPart = last_read_pos.u.HighPart = 0; + fmt.cfFormat = 0; + fmt.ptd = NULL; + fmt.dwAspect = 0; + fmt.lindex = -1; + fmt.tymed = TYMED_ISTREAM; + stg.tymed = TYMED_ISTREAM; + stg.u.pstm = pstr; + stg.pUnkForRelease = NULL; - last_read_pos.u.LowPart = last_read_pos.u.HighPart = 0; - fmt.cfFormat = 0; - fmt.ptd = NULL; - fmt.dwAspect = 0; - fmt.lindex = -1; - fmt.tymed = TYMED_ISTREAM; - stg.tymed = TYMED_ISTREAM; - stg.u.pstm = *(IStream**)ppvObject; - stg.pUnkForRelease = NULL; - - while(1) { - char buf[4096]; - DWORD bufread; - DWORD written; - if(InternetReadFile(This->hrequest, buf, sizeof(buf), &bufread)) { - TRACE("read %ld bytes %s...\n", bufread, debugstr_an(buf, 10)); - if(bufread == 0) break; - IStream_Write(*(IStream**)ppvObject, buf, bufread, &written); - total_read += bufread; - IStream_Seek(*(IStream**)ppvObject, last_read_pos, STREAM_SEEK_SET, NULL); - hres = IBindStatusCallback_OnProgress(pbscb, total_read, len, (total_read == bufread) ? - BINDSTATUS_BEGINDOWNLOADDATA : - BINDSTATUS_DOWNLOADINGDATA, NULL); - hres = IBindStatusCallback_OnDataAvailable(pbscb, - (total_read == bufread) ? BSCF_FIRSTDATANOTIFICATION : - BSCF_INTERMEDIATEDATANOTIFICATION, - total_read, &fmt, &stg); - last_read_pos.u.LowPart += bufread; /* FIXME */ - } else - break; + while(1) { + char buf[4096]; + DWORD bufread; + DWORD written; + if(InternetReadFile(This->hrequest, buf, sizeof(buf), &bufread)) { + TRACE("read %ld bytes %s...\n", bufread, debugstr_an(buf, 10)); + if(bufread == 0) break; + IStream_Write(pstr, buf, bufread, &written); + total_read += bufread; + IStream_Seek(pstr, last_read_pos, STREAM_SEEK_SET, NULL); + hres = IBindStatusCallback_OnProgress(pbscb, total_read, len, (total_read == bufread) ? + BINDSTATUS_BEGINDOWNLOADDATA : + BINDSTATUS_DOWNLOADINGDATA, NULL); + hres = IBindStatusCallback_OnDataAvailable(pbscb, + (total_read == bufread) ? BSCF_FIRSTDATANOTIFICATION : + BSCF_INTERMEDIATEDATANOTIFICATION, + total_read, &fmt, &stg); + last_read_pos.u.LowPart += bufread; /* FIXME */ + } else + break; } - hres = IBindStatusCallback_OnProgress(pbscb, total_read, len, BINDSTATUS_ENDDOWNLOADDATA, NULL); - hres = IBindStatusCallback_OnDataAvailable(pbscb, BSCF_LASTDATANOTIFICATION, total_read, &fmt, &stg); - TRACE("OnDataAvail rets %08lx\n", hres); - hres = IBindStatusCallback_OnStopBinding(pbscb, S_OK, NULL); - TRACE("OnStop rets %08lx\n", hres); - hres = S_OK; - } - InternetCloseHandle(This->hrequest); - InternetCloseHandle(This->hconnect); - InternetCloseHandle(This->hinternet); - } - } + hres = IBindStatusCallback_OnProgress(pbscb, total_read, len, BINDSTATUS_ENDDOWNLOADDATA, NULL); + hres = IBindStatusCallback_OnDataAvailable(pbscb, BSCF_LASTDATANOTIFICATION, total_read, &fmt, &stg); + TRACE("OnDataAvail rets %08lx\n", hres); + hres = IBindStatusCallback_OnStopBinding(pbscb, S_OK, NULL); + TRACE("OnStop rets %08lx\n", hres); + hres = S_OK; + } + InternetCloseHandle(This->hrequest); + InternetCloseHandle(This->hconnect); + InternetCloseHandle(This->hinternet); + IBindStatusCallback_Release(pbscb); + } + } } + *ppvObject = (VOID*)pstr; return hres; } @@ -752,7 +750,7 @@ static HRESULT WINAPI URLMonikerImpl_IBinding_GetBindResult(IBinding* iface, CLSID* pclsidProtocol, DWORD* pdwResult, LPOLESTR* pszResult, DWORD* pdwReserved) { ICOM_THIS_MULTI(URLMonikerImpl, lpvtbl2, iface); - FIXME("(%p)->(%s, %p, %p, %p): stub\n", This, debugstr_guid(pclsidProtocol), pdwResult, pszResult, pdwReserved); + FIXME("(%p)->(%p, %p, %p, %p): stub\n", This, pclsidProtocol, pdwResult, pszResult, pdwReserved); return E_NOTIMPL; } @@ -882,8 +880,36 @@ HRESULT WINAPI CreateAsyncBindCtx(DWORD reserved, IBindStatusCallback *callback, IEnumFORMATETC *format, IBindCtx **pbind) { - FIXME("stub.\n"); - return E_INVALIDARG; + HRESULT hres; + BIND_OPTS bindopts; + IBindCtx *bctx; + + TRACE("(%08lx %p %p %p)\n", reserved, callback, format, pbind); + + if(!callback) + return E_INVALIDARG; + if(format) + FIXME("format is not supported yet\n"); + + hres = CreateBindCtx(0, &bctx); + if(FAILED(hres)) + return hres; + + bindopts.cbStruct = sizeof(BIND_OPTS); + bindopts.grfFlags = BIND_MAYBOTHERUSER; + bindopts.grfMode = STGM_READWRITE | STGM_SHARE_EXCLUSIVE; + bindopts.dwTickCountDeadline = 0; + IBindCtx_SetBindOptions(bctx, &bindopts); + + hres = IBindCtx_RegisterObjectParam(bctx, (LPOLESTR)BSCBHolder, (IUnknown*)callback); + if(FAILED(hres)) { + IBindCtx_Release(bctx); + return hres; + } + + *pbind = bctx; + + return S_OK; } /*********************************************************************** * CreateAsyncBindCtxEx (URLMON.@) @@ -892,7 +918,7 @@ * * FIXME * Not implemented. - */ + */ HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options, IBindStatusCallback *callback, IEnumFORMATETC *format, IBindCtx** pbind, DWORD reserved) _____ Modified: vendor/wine/dlls/urlmon/current/umon.c --- vendor/wine/dlls/urlmon/current/umon.c 2005-01-12 19:28:33 UTC (rev 12980) +++ vendor/wine/dlls/urlmon/current/umon.c 2005-01-12 19:28:53 UTC (rev 12981) @@ -123,9 +123,7 @@ /* destroy the object if there's no more reference on it */ if (ref == 0) { - if (This->URLName!=NULL) - HeapFree(GetProcessHeap(),0,This->URLName); - + HeapFree(GetProcessHeap(),0,This->URLName); HeapFree(GetProcessHeap(),0,This); } @@ -186,8 +184,7 @@ res = IStream_Read(pStm, &len, sizeof(ULONG), &got); if(SUCCEEDED(res)) { if(got == sizeof(ULONG)) { - if(This->URLName) - HeapFree(GetProcessHeap(), 0, This->URLName); + HeapFree(GetProcessHeap(), 0, This->URLName); This->URLName=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(len+1)); if(!This->URLName) res = E_OUTOFMEMORY; @@ -324,6 +321,7 @@ IBindStatusCallback *pbscb; BINDINFO bi; DWORD bindf; + IStream *pstr; FIXME("(%p)->(%p,%p,%s,%p): stub\n",This,pbc,pmkToLeft,debugstr_guid(riid),ppvObject); if(pmkToLeft) { @@ -339,32 +337,31 @@ We also need to implement IStream ourselves so that IStream_Read can return E_PENDING */ - hres = CreateStreamOnHGlobal(0, TRUE, (IStream**)ppvObject); + hres = CreateStreamOnHGlobal(0, TRUE, &pstr); - if(SUCCEEDED(hres)) { - TRACE("Created dummy stream...\n"); + TRACE("Created dummy stream...\n"); - hres = IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown**)&pbscb); - if(SUCCEEDED(hres)) { - TRACE("Got IBindStatusCallback...\n"); + hres = IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown**)&pbscb); + if(SUCCEEDED(hres)) { + TRACE("Got IBindStatusCallback...\n"); - memset(&bi, 0, sizeof(bi)); - bi.cbSize = sizeof(bi); - bindf = 0; - hres = IBindStatusCallback_GetBindInfo(pbscb, &bindf, &bi); - if(SUCCEEDED(hres)) { - URL_COMPONENTSW url; - WCHAR *host, *path; - DWORD len, lensz = sizeof(len), total_read = 0; - LARGE_INTEGER last_read_pos; - FORMATETC fmt; - STGMEDIUM stg; + memset(&bi, 0, sizeof(bi)); + bi.cbSize = sizeof(bi); + bindf = 0; + hres = IBindStatusCallback_GetBindInfo(pbscb, &bindf, &bi); + if(SUCCEEDED(hres)) { + URL_COMPONENTSW url; + WCHAR *host, *path; + DWORD len, lensz = sizeof(len), total_read = 0; + LARGE_INTEGER last_read_pos; + FORMATETC fmt; + STGMEDIUM stg; - TRACE("got bindinfo. bindf = %08lx extrainfo = %s bindinfof = %08lx bindverb = %08lx iid %s\n", - bindf, debugstr_w(bi.szExtraInfo), bi.grfBindInfoF, bi.dwBindVerb, debugstr_guid(&bi.iid)); - hres = IBindStatusCallback_OnStartBinding(pbscb, 0, (IBinding*)&This->lpvtbl2); - TRACE("OnStartBinding rets %08lx\n", hres); + TRACE("got bindinfo. bindf = %08lx extrainfo = %s bindinfof = %08lx bindverb = %08lx iid %s\n", + bindf, debugstr_w(bi.szExtraInfo), bi.grfBindInfoF, bi.dwBindVerb, debugstr_guid(&bi.iid)); + hres = IBindStatusCallback_OnStartBinding(pbscb, 0, (IBinding*)&This->lpvtbl2); + TRACE("OnStartBinding rets %08lx\n", hres); #if 0 if(!registered_wndclass) { @@ -377,80 +374,81 @@ URLMON_hInstance, NULL); #endif - memset(&url, 0, sizeof(url)); - url.dwStructSize = sizeof(url); - url.dwSchemeLength = url.dwHostNameLength = url.dwUrlPathLength = 1; - InternetCrackUrlW(This->URLName, 0, 0, &url); - host = HeapAlloc(GetProcessHeap(), 0, (url.dwHostNameLength + 1) * sizeof(WCHAR)); - memcpy(host, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); - host[url.dwHostNameLength] = '\0'; - path = HeapAlloc(GetProcessHeap(), 0, (url.dwUrlPathLength + 1) * sizeof(WCHAR)); - memcpy(path, url.lpszUrlPath, url.dwUrlPathLength * sizeof(WCHAR)); - path[url.dwUrlPathLength] = '\0'; + memset(&url, 0, sizeof(url)); + url.dwStructSize = sizeof(url); + url.dwSchemeLength = url.dwHostNameLength = url.dwUrlPathLength = 1; + InternetCrackUrlW(This->URLName, 0, 0, &url); + host = HeapAlloc(GetProcessHeap(), 0, (url.dwHostNameLength + 1) * sizeof(WCHAR)); + memcpy(host, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); + host[url.dwHostNameLength] = '\0'; + path = HeapAlloc(GetProcessHeap(), 0, (url.dwUrlPathLength + 1) * sizeof(WCHAR)); + memcpy(path, url.lpszUrlPath, url.dwUrlPathLength * sizeof(WCHAR)); + path[url.dwUrlPathLength] = '\0'; - This->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0 /*INTERNET_FLAG_ASYNC*/); -/* InternetSetStatusCallback(This->hinternet, URLMON_InternetCallback);*/ + This->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0 /*INTERNET_FLAG_ASYNC*/); +/* InternetSetStatusCallback(This->hinternet, URLMON_InternetCallback);*/ - This->hconnect = InternetConnectW(This->hinternet, host, INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, - INTERNET_SERVICE_HTTP, 0, (DWORD)This); - This->hrequest = HttpOpenRequestW(This->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD)This); + This->hconnect = InternetConnectW(This->hinternet, host, INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, (DWORD)This); + This->hrequest = HttpOpenRequestW(This->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD)This); - hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, 0x22, NULL); - hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_FINDINGRESOURCE, NULL); - hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_CONNECTING, NULL); - hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_SENDINGREQUEST, NULL); - hres = E_OUTOFMEMORY; /* FIXME */ - if(HttpSendRequestW(This->hrequest, NULL, 0, NULL, 0)) { + hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, 0x22, NULL); + hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_FINDINGRESOURCE, NULL); + hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_CONNECTING, NULL); + hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_SENDINGREQUEST, NULL); + hres = E_OUTOFMEMORY; /* FIXME */ + if(HttpSendRequestW(This->hrequest, NULL, 0, NULL, 0)) { + len = 0; + HttpQueryInfoW(This->hrequest, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &len, &lensz, NULL); - len = 0; - HttpQueryInfoW(This->hrequest, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &len, &lensz, NULL); + TRACE("res = %ld gle = %08lx url len = %ld\n", hres, GetLastError(), len); - TRACE("res = %ld gle = %08lx url len = %ld\n", hres, GetLastError(), len); + last_read_pos.u.LowPart = last_read_pos.u.HighPart = 0; + fmt.cfFormat = 0; + fmt.ptd = NULL; + fmt.dwAspect = 0; + fmt.lindex = -1; + fmt.tymed = TYMED_ISTREAM; + stg.tymed = TYMED_ISTREAM; + stg.u.pstm = pstr; + stg.pUnkForRelease = NULL; - last_read_pos.u.LowPart = last_read_pos.u.HighPart = 0; - fmt.cfFormat = 0; - fmt.ptd = NULL; - fmt.dwAspect = 0; - fmt.lindex = -1; - fmt.tymed = TYMED_ISTREAM; - stg.tymed = TYMED_ISTREAM; - stg.u.pstm = *(IStream**)ppvObject; - stg.pUnkForRelease = NULL; - - while(1) { - char buf[4096]; - DWORD bufread; - DWORD written; - if(InternetReadFile(This->hrequest, buf, sizeof(buf), &bufread)) { - TRACE("read %ld bytes %s...\n", bufread, debugstr_an(buf, 10)); - if(bufread == 0) break; - IStream_Write(*(IStream**)ppvObject, buf, bufread, &written); - total_read += bufread; - IStream_Seek(*(IStream**)ppvObject, last_read_pos, STREAM_SEEK_SET, NULL); - hres = IBindStatusCallback_OnProgress(pbscb, total_read, len, (total_read == bufread) ? - BINDSTATUS_BEGINDOWNLOADDATA : - BINDSTATUS_DOWNLOADINGDATA, NULL); - hres = IBindStatusCallback_OnDataAvailable(pbscb, - (total_read == bufread) ? BSCF_FIRSTDATANOTIFICATION : - BSCF_INTERMEDIATEDATANOTIFICATION, - total_read, &fmt, &stg); - last_read_pos.u.LowPart += bufread; /* FIXME */ - } else - break; + while(1) { + char buf[4096]; + DWORD bufread; + DWORD written; + if(InternetReadFile(This->hrequest, buf, sizeof(buf), &bufread)) { + TRACE("read %ld bytes %s...\n", bufread, debugstr_an(buf, 10)); + if(bufread == 0) break; + IStream_Write(pstr, buf, bufread, &written); + total_read += bufread; + IStream_Seek(pstr, last_read_pos, STREAM_SEEK_SET, NULL); + hres = IBindStatusCallback_OnProgress(pbscb, total_read, len, (total_read == bufread) ? + BINDSTATUS_BEGINDOWNLOADDATA : + BINDSTATUS_DOWNLOADINGDATA, NULL); + hres = IBindStatusCallback_OnDataAvailable(pbscb, + (total_read == bufread) ? BSCF_FIRSTDATANOTIFICATION : + BSCF_INTERMEDIATEDATANOTIFICATION, + total_read, &fmt, &stg); + last_read_pos.u.LowPart += bufread; /* FIXME */ + } else + break; } - hres = IBindStatusCallback_OnProgress(pbscb, total_read, len, BINDSTATUS_ENDDOWNLOADDATA, NULL); - hres = IBindStatusCallback_OnDataAvailable(pbscb, BSCF_LASTDATANOTIFICATION, total_read, &fmt, &stg); - TRACE("OnDataAvail rets %08lx\n", hres); - hres = IBindStatusCallback_OnStopBinding(pbscb, S_OK, NULL); - TRACE("OnStop rets %08lx\n", hres); - hres = S_OK; - } - InternetCloseHandle(This->hrequest); - InternetCloseHandle(This->hconnect); - InternetCloseHandle(This->hinternet); - } - } + hres = IBindStatusCallback_OnProgress(pbscb, total_read, len, BINDSTATUS_ENDDOWNLOADDATA, NULL); + hres = IBindStatusCallback_OnDataAvailable(pbscb, BSCF_LASTDATANOTIFICATION, total_read, &fmt, &stg); + TRACE("OnDataAvail rets %08lx\n", hres); + hres = IBindStatusCallback_OnStopBinding(pbscb, S_OK, NULL); + TRACE("OnStop rets %08lx\n", hres); + hres = S_OK; + } + InternetCloseHandle(This->hrequest); + InternetCloseHandle(This->hconnect); + InternetCloseHandle(This->hinternet); + IBindStatusCallback_Release(pbscb); + } + } } + *ppvObject = (VOID*)pstr; return hres; } @@ -752,7 +750,7 @@ static HRESULT WINAPI URLMonikerImpl_IBinding_GetBindResult(IBinding* iface, CLSID* pclsidProtocol, DWORD* pdwResult, LPOLESTR* pszResult, DWORD* pdwReserved) { ICOM_THIS_MULTI(URLMonikerImpl, lpvtbl2, iface); - FIXME("(%p)->(%s, %p, %p, %p): stub\n", This, debugstr_guid(pclsidProtocol), pdwResult, pszResult, pdwReserved); + FIXME("(%p)->(%p, %p, %p, %p): stub\n", This, pclsidProtocol, pdwResult, pszResult, pdwReserved); return E_NOTIMPL; } @@ -882,8 +880,36 @@ HRESULT WINAPI CreateAsyncBindCtx(DWORD reserved, IBindStatusCallback *callback, IEnumFORMATETC *format, IBindCtx **pbind) { - FIXME("stub.\n"); - return E_INVALIDARG; + HRESULT hres; + BIND_OPTS bindopts; + IBindCtx *bctx; + + TRACE("(%08lx %p %p %p)\n", reserved, callback, format, pbind); + + if(!callback) + return E_INVALIDARG; + if(format) + FIXME("format is not supported yet\n"); + + hres = CreateBindCtx(0, &bctx); + if(FAILED(hres)) + return hres; + + bindopts.cbStruct = sizeof(BIND_OPTS); + bindopts.grfFlags = BIND_MAYBOTHERUSER; + bindopts.grfMode = STGM_READWRITE | STGM_SHARE_EXCLUSIVE; + bindopts.dwTickCountDeadline = 0; + IBindCtx_SetBindOptions(bctx, &bindopts); + + hres = IBindCtx_RegisterObjectParam(bctx, (LPOLESTR)BSCBHolder, (IUnknown*)callback); + if(FAILED(hres)) { + IBindCtx_Release(bctx); + return hres; + } + + *pbind = bctx; + + return S_OK; } /*********************************************************************** * CreateAsyncBindCtxEx (URLMON.@) @@ -892,7 +918,7 @@ * * FIXME * Not implemented. - */ + */ HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options, IBindStatusCallback *callback, IEnumFORMATETC *format, IBindCtx** pbind, DWORD reserved)

19 years, 10 months

[gvg] 12980: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/shdocvw/Wine-20050111/ Modified: vendor/wine/dlls/shdocvw/Wine-20050111/shdocvw_main.c Modified: vendor/wine/dlls/shdocvw/current/shdocvw_main.c _____ Copied: vendor/wine/dlls/shdocvw/Wine-20050111 (from rev 12927, vendor/wine/dlls/shdocvw/current) _____ Modified: vendor/wine/dlls/shdocvw/Wine-20050111/shdocvw_main.c --- vendor/wine/dlls/shdocvw/current/shdocvw_main.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shdocvw/Wine-20050111/shdocvw_main.c 2005-01-12 19:28:33 UTC (rev 12980) @@ -414,7 +414,6 @@ SHDOCVW_TryDownloadMozillaControl(); bTried = TRUE; } - return TRUE; } /*********************************************************************** ** _____ Modified: vendor/wine/dlls/shdocvw/current/shdocvw_main.c --- vendor/wine/dlls/shdocvw/current/shdocvw_main.c 2005-01-12 19:26:53 UTC (rev 12979) +++ vendor/wine/dlls/shdocvw/current/shdocvw_main.c 2005-01-12 19:28:33 UTC (rev 12980) @@ -414,7 +414,6 @@ SHDOCVW_TryDownloadMozillaControl(); bTried = TRUE; } - return TRUE; } /*********************************************************************** **

19 years, 10 months

[gvg] 12979: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/shell32/Wine-20050111/ Modified: vendor/wine/dlls/shell32/Wine-20050111/autocomplete.c Modified: vendor/wine/dlls/shell32/Wine-20050111/brsfolder.c Modified: vendor/wine/dlls/shell32/Wine-20050111/changenotify.c Modified: vendor/wine/dlls/shell32/Wine-20050111/cpanelfolder.c Modified: vendor/wine/dlls/shell32/Wine-20050111/enumidlist.c Modified: vendor/wine/dlls/shell32/Wine-20050111/folders.c Modified: vendor/wine/dlls/shell32/Wine-20050111/iconcache.c Modified: vendor/wine/dlls/shell32/Wine-20050111/pidl.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32.spec Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ca.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Cn.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Cs.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Da.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_De.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_En.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Eo.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Es.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Fi.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Fr.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Hu.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_It.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ja.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ko.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Nl.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_No.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Pl.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Pt.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ru.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Si.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Sk.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Sv.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Uk.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Wa.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Zh.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_main.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shelllink.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shellole.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shellord.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shellreg.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shfldr_mycomp.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shlexec.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shlfileop.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shlfolder.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shlfsbind.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shlview.c Modified: vendor/wine/dlls/shell32/Wine-20050111/systray.c Modified: vendor/wine/dlls/shell32/Wine-20050111/undocshell.h Modified: vendor/wine/dlls/shell32/Wine-20050111/version.h Modified: vendor/wine/dlls/shell32/current/autocomplete.c Modified: vendor/wine/dlls/shell32/current/brsfolder.c Modified: vendor/wine/dlls/shell32/current/changenotify.c Modified: vendor/wine/dlls/shell32/current/cpanelfolder.c Modified: vendor/wine/dlls/shell32/current/enumidlist.c Modified: vendor/wine/dlls/shell32/current/folders.c Modified: vendor/wine/dlls/shell32/current/iconcache.c Modified: vendor/wine/dlls/shell32/current/pidl.c Modified: vendor/wine/dlls/shell32/current/shell32.spec Modified: vendor/wine/dlls/shell32/current/shell32_Ca.rc Modified: vendor/wine/dlls/shell32/current/shell32_Cn.rc Modified: vendor/wine/dlls/shell32/current/shell32_Cs.rc Modified: vendor/wine/dlls/shell32/current/shell32_Da.rc Modified: vendor/wine/dlls/shell32/current/shell32_De.rc Modified: vendor/wine/dlls/shell32/current/shell32_En.rc Modified: vendor/wine/dlls/shell32/current/shell32_Eo.rc Modified: vendor/wine/dlls/shell32/current/shell32_Es.rc Modified: vendor/wine/dlls/shell32/current/shell32_Fi.rc Modified: vendor/wine/dlls/shell32/current/shell32_Fr.rc Modified: vendor/wine/dlls/shell32/current/shell32_Hu.rc Modified: vendor/wine/dlls/shell32/current/shell32_It.rc Modified: vendor/wine/dlls/shell32/current/shell32_Ja.rc Modified: vendor/wine/dlls/shell32/current/shell32_Ko.rc Modified: vendor/wine/dlls/shell32/current/shell32_Nl.rc Modified: vendor/wine/dlls/shell32/current/shell32_No.rc Modified: vendor/wine/dlls/shell32/current/shell32_Pl.rc Modified: vendor/wine/dlls/shell32/current/shell32_Pt.rc Modified: vendor/wine/dlls/shell32/current/shell32_Ru.rc Modified: vendor/wine/dlls/shell32/current/shell32_Si.rc Modified: vendor/wine/dlls/shell32/current/shell32_Sk.rc Modified: vendor/wine/dlls/shell32/current/shell32_Sv.rc Modified: vendor/wine/dlls/shell32/current/shell32_Uk.rc Modified: vendor/wine/dlls/shell32/current/shell32_Wa.rc Modified: vendor/wine/dlls/shell32/current/shell32_Zh.rc Modified: vendor/wine/dlls/shell32/current/shell32_main.c Modified: vendor/wine/dlls/shell32/current/shelllink.c Modified: vendor/wine/dlls/shell32/current/shellole.c Modified: vendor/wine/dlls/shell32/current/shellord.c Modified: vendor/wine/dlls/shell32/current/shellreg.c Modified: vendor/wine/dlls/shell32/current/shfldr_mycomp.c Modified: vendor/wine/dlls/shell32/current/shlexec.c Modified: vendor/wine/dlls/shell32/current/shlfileop.c Modified: vendor/wine/dlls/shell32/current/shlfolder.c Modified: vendor/wine/dlls/shell32/current/shlfsbind.c Modified: vendor/wine/dlls/shell32/current/shlview.c Modified: vendor/wine/dlls/shell32/current/systray.c Modified: vendor/wine/dlls/shell32/current/undocshell.h Modified: vendor/wine/dlls/shell32/current/version.h _____ Copied: vendor/wine/dlls/shell32/Wine-20050111 (from rev 12927, vendor/wine/dlls/shell32/current) _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/autocomplete.c --- vendor/wine/dlls/shell32/current/autocomplete.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/autocomplete.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -187,10 +187,8 @@ if (!--(This->ref)) { TRACE(" destroying IAutoComplete(%p)\n",This); - if (This->quickComplete) - HeapFree(GetProcessHeap(), 0, This->quickComplete); - if (This->txtbackup) - HeapFree(GetProcessHeap(), 0, This->txtbackup); + HeapFree(GetProcessHeap(), 0, This->quickComplete); + HeapFree(GetProcessHeap(), 0, This->txtbackup); if (This->hwndListBox) DestroyWindow(This->hwndListBox); if (This->enumstr) _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/brsfolder.c --- vendor/wine/dlls/shell32/current/brsfolder.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/brsfolder.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -330,7 +330,10 @@ if (SUCCEEDED(IShellFolder_BindToObject(lptvid->lpsfParent, lptvid->lpi,0,(REFIID)&IID_IShellFolder,(LPVOID *)&lpsf2))) { FillTreeView( lpsf2, lptvid->lpifq, pnmtv->itemNew.hItem, lptvid->pEnumIL); } - TreeView_SortChildren(hwndTreeView, pnmtv->itemNew.hItem, FALSE); + /* My Computer is already sorted and trying to do a simple text + * sort will only mess things up */ + if (!_ILIsMyComputer(lptvid->lpi)) + TreeView_SortChildren(hwndTreeView, pnmtv->itemNew.hItem, FALSE); } break; case TVN_SELCHANGEDA: @@ -491,10 +494,7 @@ WideCharToMultiByte(CP_ACP, 0, bi.pszDisplayName, -1, lpbi->pszDisplayName, MAX_PATH, 0, NULL); HeapFree(GetProcessHeap(), 0, bi.pszDisplayName); } - if (bi.lpszTitle) - { - HeapFree(GetProcessHeap(), 0, (LPVOID)bi.lpszTitle); - } + HeapFree(GetProcessHeap(), 0, (LPVOID)bi.lpszTitle); lpbi->iImage = bi.iImage; return lpid; } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/changenotify.c --- vendor/wine/dlls/shell32/current/changenotify.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/changenotify.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -27,9 +27,7 @@ #include "winbase.h" #include "wine/debug.h" #include "wingdi.h" -#include "pidl.h" #include "shell32_main.h" -#include "undocshell.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/cpanelfolder.c --- vendor/wine/dlls/shell32/current/cpanelfolder.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/cpanelfolder.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -47,7 +47,6 @@ #include "shell32_main.h" #include "shresdef.h" #include "shlwapi.h" -#include "shellfolder.h" #include "wine/debug.h" #include "debughlp.h" #include "shfldr.h" _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/enumidlist.c --- vendor/wine/dlls/shell32/current/enumidlist.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/enumidlist.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -28,13 +28,9 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" -#include "undocshell.h" #include "shlwapi.h" -#include "winerror.h" -#include "objbase.h" #include "pidl.h" -#include "shlguid.h" #include "enumidlist.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/folders.c --- vendor/wine/dlls/shell32/current/folders.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/folders.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -34,10 +34,8 @@ #include "undocshell.h" #include "shlguid.h" #include "winreg.h" -#include "shlwapi.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "pidl.h" #include "shell32_main.h" _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/iconcache.c --- vendor/wine/dlls/shell32/current/iconcache.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/iconcache.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -43,7 +43,6 @@ #include "pidl.h" #include "shell32_main.h" #include "undocshell.h" -#include "shlwapi.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -403,15 +402,6 @@ } /*********************************************************************** ** - * ExtractIconEx [SHELL32.@] - */ -UINT WINAPI ExtractIconExAW(LPCVOID lpszFile, INT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIcons) -{ if (SHELL_OsIsUnicode()) - return ExtractIconExW ( lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons); - return ExtractIconExA ( lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons); -} - -/********************************************************************** *** * ExtractIconExW [SHELL32.@] * RETURNS * 0 no icon found @@ -430,15 +420,18 @@ */ UINT WINAPI ExtractIconExA(LPCSTR lpszFile, INT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIcons) { - UINT ret; + UINT ret = 0; INT len = MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, NULL, 0); LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); TRACE("%s %i %p %p %i\n", lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons); - MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, lpwstrFile, len); - ret = ExtractIconExW (lpwstrFile, nIconIndex, phiconLarge, phiconSmall, nIcons); - HeapFree(GetProcessHeap(), 0, lpwstrFile); + if (lpwstrFile) + { + MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, lpwstrFile, len); + ret = ExtractIconExW(lpwstrFile, nIconIndex, phiconLarge, phiconSmall, nIcons); + HeapFree(GetProcessHeap(), 0, lpwstrFile); + } return ret; } @@ -450,43 +443,55 @@ */ HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath, LPWORD lpiIcon) { - HICON hIcon; - WORD wDummyIcon = 0; - - TRACE("\n"); + HICON hIcon = NULL; + INT len = MultiByteToWideChar(CP_ACP, 0, lpIconPath, -1, NULL, 0); + LPWSTR lpIconPathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if(lpiIcon == NULL) - lpiIcon = &wDummyIcon; + TRACE("%p %s %p\n", hInst, debugstr_a(lpIconPath), lpiIcon); - hIcon = ExtractIconA(hInst, lpIconPath, *lpiIcon); + if (lpIconPathW) + { + MultiByteToWideChar(CP_ACP, 0, lpIconPath, -1, lpIconPathW, len); + hIcon = ExtractAssociatedIconW(hInst, lpIconPathW, lpiIcon); + HeapFree(GetProcessHeap(), 0, lpIconPathW); + } + return hIcon; +} - if( hIcon < (HICON)2 ) - { if( hIcon == (HICON)1 ) /* no icons found in given file */ - { char tempPath[0x80]; - HINSTANCE uRet = FindExecutableA(lpIconPath,NULL,tempPath); +HICON WINAPI ExtractAssociatedIconW(HINSTANCE hInst, LPWSTR lpIconPath, LPWORD lpiIcon) +{ + HICON hIcon = NULL; + WORD wDummyIcon = 0; - if( uRet > (HINSTANCE)32 && tempPath[0] ) - { strcpy(lpIconPath,tempPath); - hIcon = ExtractIconA(hInst, lpIconPath, *lpiIcon); - if( hIcon > (HICON)2 ) - return hIcon; - } - else hIcon = 0; - } + TRACE("%p %s %p\n", hInst, debugstr_w(lpIconPath), lpiIcon); - if( hIcon == (HICON)1 ) - *lpiIcon = 2; /* MSDOS icon - we found .exe but no icons in it */ - else - *lpiIcon = 6; /* generic icon - found nothing */ + if(lpiIcon == NULL) + lpiIcon = &wDummyIcon; - if (GetModuleFileNameA(hInst, lpIconPath, 0x80)) - { - /* terminate string (GetModuleFileName doesn't do if buffer is too small) */ - lpIconPath[0x80 - 1] = '\0'; - hIcon = LoadIconA( hInst, MAKEINTRESOURCEA(*lpiIcon)); - } - } - return hIcon; + hIcon = ExtractIconW(hInst, lpIconPath, *lpiIcon); + + if( hIcon < (HICON)2 ) + { if( hIcon == (HICON)1 ) /* no icons found in given file */ + { WCHAR tempPath[MAX_PATH]; + HINSTANCE uRet = FindExecutableW(lpIconPath,NULL,tempPath); + + if( uRet > (HINSTANCE)32 && tempPath[0] ) + { lstrcpyW(lpIconPath,tempPath); + hIcon = ExtractIconW(hInst, lpIconPath, *lpiIcon); + if( hIcon > (HICON)2 ) + return hIcon; + } + } + + if( hIcon == (HICON)1 ) + *lpiIcon = 2; /* MSDOS icon - we found .exe but no icons in it */ + else + *lpiIcon = 6; /* generic icon - found nothing */ + + if (GetModuleFileNameW(hInst, lpIconPath, MAX_PATH)) + hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(*lpiIcon)); + } + return hIcon; } /*********************************************************************** ** _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/pidl.c --- vendor/wine/dlls/shell32/current/pidl.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/pidl.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -47,7 +47,6 @@ #include "shlwapi.h" #include "pidl.h" -#include "debughlp.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(pidl); @@ -1058,7 +1057,7 @@ _ILParsePathW(wPath, NULL, TRUE, &pidl, NULL); - if (wPath) HeapFree(GetProcessHeap(), 0, wPath); + HeapFree(GetProcessHeap(), 0, wPath); TRACE("%s %p\n", debugstr_a(lpszPath), pidl); return pidl; } @@ -1366,18 +1365,6 @@ } /*********************************************************************** ** - * SHGetPathFromIDList [SHELL32.@][NT 4.0: SHELL32.219] - */ -BOOL WINAPI SHGetPathFromIDListAW(LPCITEMIDLIST pidl,LPVOID pszPath) -{ - TRACE_(shell)("(pidl=%p,%p)\n",pidl,pszPath); - - if (SHELL_OsIsUnicode()) - return SHGetPathFromIDListW(pidl,pszPath); - return SHGetPathFromIDListA(pidl,pszPath); -} - -/********************************************************************** *** * SHBindToParent [shell version 5.0] */ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32.spec --- vendor/wine/dlls/shell32/current/shell32.spec 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32.spec 2005-01-12 19:26:53 UTC (rev 12979) @@ -169,9 +169,9 @@ 175 stdcall SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW 176 stdcall SHSetInstanceExplorer (long) 177 stub DAD_SetDragImageFromListView - 178 stub SHObjectProperties - 179 stub SHGetNewLinkInfoA - 180 stub SHGetNewLinkInfoW + 178 stdcall SHObjectProperties(long long wstr wstr) + 179 stdcall SHGetNewLinkInfoA(str str ptr long long) + 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) 181 stdcall RegisterShellHook(long long) 182 varargs ShellMessageBoxW(long long long str long) 183 varargs ShellMessageBoxA(long long long str long) @@ -182,9 +182,9 @@ 188 stdcall ShellDDEInit(long) 189 stdcall ILCreateFromPathA(str) 190 stdcall ILCreateFromPathW(wstr) - 191 stub SHUpdateImageA + 191 stdcall SHUpdateImageA(str long long long) 192 stdcall SHUpdateImageW(wstr long long long) - 193 stub SHHandleUpdateImage + 193 stdcall SHHandleUpdateImage(ptr) 194 stub SHCreatePropSheetExtArrayEx 195 stdcall SHFree(ptr) 196 stdcall SHAlloc(long) @@ -206,7 +206,7 @@ 212 stub Printers_AddPrinterPropPages 213 stub Printers_RegisterWindowW 214 stub Printers_UnregisterWindow - 215 stub SHStartNetConnectionDialog + 215 stdcall SHStartNetConnectionDialog(long str long) 243 stdcall @(long long) shell32_243 244 stdcall SHInitRestricted(ptr ptr) 247 stdcall SHGetDataFromIDListA (ptr ptr long ptr long) @@ -235,15 +235,15 @@ 288 stdcall ShellAboutA(long str str long) 289 stdcall ShellAboutW(long wstr wstr long) 290 stdcall ShellExecuteA(long str str str str long) - 291 stdcall ShellExecuteEx (long) ShellExecuteExAW + 291 stdcall ShellExecuteEx (long) ShellExecuteExA 292 stdcall ShellExecuteExA (long) 293 stdcall ShellExecuteExW (long) 294 stdcall ShellExecuteW (long wstr wstr wstr wstr long) 296 stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA 297 stdcall Shell_NotifyIconA(long ptr) 298 stdcall Shell_NotifyIconW(long ptr) - 299 stub Shl1632_ThunkData32 - 300 stub Shl3216_ThunkData32 +#299 stub Shl1632_ThunkData32 +#300 stub Shl3216_ThunkData32 301 stdcall StrChrA(str long) shlwapi.StrChrA 302 stdcall StrChrIA(str long) shlwapi.StrChrIA 303 stdcall StrChrIW(wstr long) shlwapi.StrChrIW @@ -338,12 +338,12 @@ @ stdcall DoEnvironmentSubstW(wstr wstr) @ stub DragQueryFileAorW @ stdcall DuplicateIcon(long long) -@ stdcall ExtractAssociatedIconA(long ptr long) +@ stdcall ExtractAssociatedIconA(long str ptr) @ stdcall ExtractAssociatedIconExA(long str long long) @ stdcall ExtractAssociatedIconExW(long wstr long long) -@ stub ExtractAssociatedIconW +@ stdcall ExtractAssociatedIconW(long wstr ptr) @ stdcall ExtractIconA(long str long) -@ stdcall ExtractIconEx(ptr long ptr ptr long)ExtractIconExAW +@ stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExA @ stdcall ExtractIconExA(str long ptr ptr long) @ stdcall ExtractIconExW(wstr long ptr ptr long) @ stdcall ExtractIconW(long wstr long) @@ -376,21 +376,21 @@ @ stdcall SHCreateDirectoryExA(long str ptr) @ stdcall SHCreateDirectoryExW(long wstr ptr) @ stub ShellHookProc -@ stub SHEmptyRecycleBinA -@ stub SHEmptyRecycleBinW -@ stdcall SHFileOperation(ptr)SHFileOperationAW +@ stdcall SHEmptyRecycleBinA(long str long) +@ stdcall SHEmptyRecycleBinW(long wstr long) +@ stdcall SHFileOperation(ptr) SHFileOperationA @ stdcall SHFileOperationA(ptr) @ stdcall SHFileOperationW(ptr) -@ stub SHFormatDrive +@ stdcall SHFormatDrive(long long long long) @ stdcall SHFreeNameMappings(ptr) @ stdcall SHGetDesktopFolder(ptr) -@ stdcall SHGetFileInfo(ptr long ptr long long)SHGetFileInfoAW +@ stdcall SHGetFileInfo(ptr long ptr long long) SHGetFileInfoA @ stdcall SHGetFileInfoA(ptr long ptr long long) @ stdcall SHGetFileInfoW(ptr long ptr long long) @ stdcall SHGetInstanceExplorer(long) @ stdcall SHGetMalloc(ptr) -@ stub SHGetNewLinkInfo -@ stdcall SHGetPathFromIDList(ptr ptr)SHGetPathFromIDListAW +@ stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA +@ stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA @ stdcall SHGetPathFromIDListA(ptr ptr) @ stdcall SHGetPathFromIDListW(ptr ptr) @ stdcall SHGetSettings(ptr long) @@ -399,8 +399,8 @@ @ stub SHHelpShortcuts_RunDLLA @ stub SHHelpShortcuts_RunDLLW @ stdcall SHLoadInProc(long) -@ stub SHQueryRecycleBinA -@ stub SHQueryRecycleBinW +@ stdcall SHQueryRecycleBinA(str ptr) +@ stdcall SHQueryRecycleBinW(wstr ptr) @ stub SHUpdateRecycleBinIcon @ stub WOWShellExecute _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ca.rc --- vendor/wine/dlls/shell32/current/shell32_Ca.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Ca.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@ CAPTION "Quant a %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "D'Acord", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "D'Acord", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine ha estat construit per:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Cn.rc --- vendor/wine/dlls/shell32/current/shell32_Cn.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Cn.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -24,10 +24,11 @@ CAPTION "¹ØÓÚ %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "È·¶¨", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "È·¶¨", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Cs.rc --- vendor/wine/dlls/shell32/current/shell32_Cs.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Cs.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -110,10 +110,11 @@ CAPTION "O aplikaci %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine je d¡lem:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Da.rc --- vendor/wine/dlls/shell32/current/shell32_Da.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Da.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@ CAPTION "Om %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine havde ikke været mulig uden hjælp fra disse personer:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_De.rc --- vendor/wine/dlls/shell32/current/shell32_De.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_De.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -110,10 +110,11 @@ CAPTION "Informationen über %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "WINE wurde für Sie gekeltert von:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_En.rc --- vendor/wine/dlls/shell32/current/shell32_En.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_En.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -109,10 +109,11 @@ CAPTION "About %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Eo.rc --- vendor/wine/dlls/shell32/current/shell32_Eo.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Eo.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@ CAPTION "Pri %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "Enorde", 1, 153, 130, 50, 12 + DEFPUSHBUTTON "Enorde", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Es.rc --- vendor/wine/dlls/shell32/current/shell32_Es.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Es.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -110,10 +110,11 @@ CAPTION "Acerca de %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "Aceptar", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "Aceptar", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine está disponible gracias a:", 98, 8, 55, 137, 10 } @@ -187,3 +188,35 @@ IDS_SHUTDOWN_TITLE "Apagar" IDS_SHUTDOWN_PROMPT "¿Desea terminar su sesión Wine?" } + +/* shell folder path default values */ +STRINGTABLE DISCARDABLE +{ + IDS_PROGRAMS "Menú Inicio\\Programas" + IDS_PERSONAL "Mis documentos" + IDS_FAVORITES "Favoritos" + IDS_STARTUP "Menú Inicio\\Programas\\Inicio" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Menú Inicio" + IDS_MYMUSIC "Mis documentos\\Mi música" + IDS_MYVIDEO "Mis documentos\\Mis vídeos" + IDS_DESKTOPDIRECTORY "Escritorio" + IDS_NETHOOD "Entorno de red" + IDS_TEMPLATES "Templates" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Configuración local\\Datos de programa" + IDS_INTERNET_CACHE "Archivos temporales de Internet" + IDS_COOKIES "Cookies" + IDS_HISTORY "Historial" + IDS_PROGRAM_FILES "Archivos de programa" + IDS_MYPICTURES "Mis documentos\\Mis imágenes" + IDS_PROGRAM_FILES_COMMON "Archivos de programa\\Archivos comunes" + IDS_COMMON_DOCUMENTS "Documentos" + IDS_ADMINTOOLS "Menú Inicio\\Programas\\Accesorios\\Herramientas del sistema" + IDS_COMMON_MUSIC "Documentos\\Mi música" + IDS_COMMON_PICTURES "Documentos\\Mis imágenes" + IDS_COMMON_VIDEO "Documentos\\Mis vídeos" + IDS_CDBURN_AREA "Configuración local\\Datos de programa\\Microsoft\\CD Burning" +} _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Fi.rc --- vendor/wine/dlls/shell32/current/shell32_Fi.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Fi.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@ CAPTION "Tietoja: %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine:n tekijät:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Fr.rc --- vendor/wine/dlls/shell32/current/shell32_Fr.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Fr.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -112,10 +112,11 @@ CAPTION "À propos de %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine est une réalisation de :", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Hu.rc --- vendor/wine/dlls/shell32/current/shell32_Hu.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Hu.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@ CAPTION "A %s-rõl" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "A WINE-t írták:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_It.rc --- vendor/wine/dlls/shell32/current/shell32_It.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_It.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -110,10 +110,11 @@ CAPTION "Informazioni su %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine è disponibile grazie a:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ja.rc --- vendor/wine/dlls/shell32/current/shell32_Ja.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Ja.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -103,10 +103,11 @@ CAPTION "%s ,É,Â,¢,Ä" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ko.rc --- vendor/wine/dlls/shell32/current/shell32_Ko.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Ko.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@ CAPTION "%s¿¡ °üÇÏ¿©" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "È®ÀÎ", 1, 153, 130, 50, 12 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Nl.rc --- vendor/wine/dlls/shell32/current/shell32_Nl.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Nl.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@ CAPTION "Info %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine is geschreven door:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_No.rc --- vendor/wine/dlls/shell32/current/shell32_No.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_No.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@ CAPTION "Om %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Pl.rc --- vendor/wine/dlls/shell32/current/shell32_Pl.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Pl.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -110,10 +110,11 @@ CAPTION "O %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Mo¿esz korzystaæ z Wine'a dziêki:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Pt.rc --- vendor/wine/dlls/shell32/current/shell32_Pt.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Pt.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -110,10 +110,11 @@ CAPTION "Sobre %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine foi disponibilizado por:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ru.rc --- vendor/wine/dlls/shell32/current/shell32_Ru.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Ru.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@ CAPTION "Î %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Ðàçðàáîò÷èêè Wine:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Si.rc --- vendor/wine/dlls/shell32/current/shell32_Si.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Si.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@ CAPTION "O %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "V redu", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "V redu", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine so ustvarili:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Sk.rc --- vendor/wine/dlls/shell32/current/shell32_Sk.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Sk.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@ CAPTION "O programe %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Víno pre vás pripravili:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Sv.rc --- vendor/wine/dlls/shell32/current/shell32_Sv.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Sv.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@ CAPTION "Om %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine hade inte varit möjligt utan dessa personer:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Uk.rc --- vendor/wine/dlls/shell32/current/shell32_Uk.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Uk.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -109,10 +109,11 @@ CAPTION "Ïðî %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Ðîçðîáíèêè Wine:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Wa.rc --- vendor/wine/dlls/shell32/current/shell32_Wa.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Wa.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -28,10 +28,11 @@ CAPTION "Å dfait di %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "I Va", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "I Va", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine a estu fwait par:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Zh.rc --- vendor/wine/dlls/shell32/current/shell32_Zh.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Zh.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -24,10 +24,10 @@ CAPTION "êPì¶ %s" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "´_¶¨", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "´_¶¨", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 174, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 35, 10, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 } _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_main.c --- vendor/wine/dlls/shell32/current/shell32_main.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_main.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -543,21 +543,6 @@ } /*********************************************************************** ** - * SHGetFileInfo [SHELL32.@] - */ -DWORD WINAPI SHGetFileInfoAW( - LPCVOID path, - DWORD dwFileAttributes, - LPVOID psfi, - UINT sizeofpsfi, - UINT flags) -{ - if(SHELL_OsIsUnicode()) - return SHGetFileInfoW(path, dwFileAttributes, psfi, sizeofpsfi, flags ); - return SHGetFileInfoA(path, dwFileAttributes, psfi, sizeofpsfi, flags ); -} - -/********************************************************************** *** * DuplicateIcon [SHELL32.@] */ HICON WINAPI DuplicateIcon( HINSTANCE hInstance, HICON hIcon) @@ -631,7 +616,8 @@ HFONT hFont; } ABOUT_INFO; -#define IDC_STATIC_TEXT 100 +#define IDC_STATIC_TEXT1 100 +#define IDC_STATIC_TEXT2 101 #define IDC_LISTBOX 99 #define IDC_WINE_TEXT 98 @@ -754,7 +740,8 @@ GetWindowTextW( hWnd, Template, sizeof(Template)/sizeof(WCHAR) ); sprintfW( AppTitle, Template, info->szApp ); SetWindowTextW( hWnd, AppTitle ); - SetWindowTextW( GetDlgItem(hWnd, IDC_STATIC_TEXT), info->szOtherStuff ); + SetWindowTextW( GetDlgItem(hWnd, IDC_STATIC_TEXT1), info->szApp ); + SetWindowTextW( GetDlgItem(hWnd, IDC_STATIC_TEXT2), info->szOtherStuff ); hWndCtl = GetDlgItem(hWnd, IDC_LISTBOX); SendMessageW( hWndCtl, WM_SETREDRAW, 0, 0 ); SendMessageW( hWndCtl, WM_SETFONT, (WPARAM)info->hFont, 0 ); @@ -825,8 +812,8 @@ ret = ShellAboutW(hWnd, appW, otherW, hIcon); - if (otherW) HeapFree(GetProcessHeap(), 0, otherW); - if (appW) HeapFree(GetProcessHeap(), 0, appW); + HeapFree(GetProcessHeap(), 0, otherW); + HeapFree(GetProcessHeap(), 0, appW); return ret; } @@ -842,10 +829,12 @@ HRSRC hRes; LPVOID template; BOOL bRet; + static const WCHAR wszSHELL_ABOUT_MSGBOX[] = + {'S','H','E','L','L','_','A','B','O','U','T','_','M','S','G','B','O','X' ,0}; TRACE("\n"); - if(!(hRes = FindResourceA(shell32_hInstance, "SHELL_ABOUT_MSGBOX", (LPSTR)RT_DIALOG))) + if(!(hRes = FindResourceW(shell32_hInstance, wszSHELL_ABOUT_MSGBOX, (LPWSTR)RT_DIALOG))) return FALSE; if(!(template = (LPVOID)LoadResource(shell32_hInstance, hRes))) return FALSE; _____ Modified: vendor/wine/dlls/shell32/Wine-20050111/shelllink.c --- vendor/wine/dlls/shell32/current/shelllink.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shelllink.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -993,21 +993,12 @@ TRACE("-- destroying IShellLink(%p)\n",This); - if (This->sIcoPath) - HeapFree(GetProcessHeap(), 0, This->sIcoPath); + HeapFree(GetProcessHeap(), 0, This->sIcoPath); + HeapFree(GetProcessHeap(), 0, This->sArgs); + HeapFree(GetProcessHeap(), 0, This->sWorkDir); + HeapFree(GetProcessHeap(), 0, This->sDescription); + HeapFree(GetProcessHeap(),0,This->sPath); - if (This->sArgs) - HeapFree(GetProcessHeap(), 0, This->sArgs); - - if (This->sWorkDir) - HeapFree(GetProcessHeap(), 0, This->sWorkDir); - - if (This->sDescription) [truncated at 1000 lines; 1893 more skipped]

19 years, 10 months

[gvg] 12978: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/rpcrt4/Wine-20050111/ Modified: vendor/wine/dlls/rpcrt4/Wine-20050111/ndr_midl.c Modified: vendor/wine/dlls/rpcrt4/Wine-20050111/rpc_binding.c Modified: vendor/wine/dlls/rpcrt4/Wine-20050111/rpc_message.c Modified: vendor/wine/dlls/rpcrt4/Wine-20050111/rpc_server.c Modified: vendor/wine/dlls/rpcrt4/Wine-20050111/rpcrt4.spec Modified: vendor/wine/dlls/rpcrt4/Wine-20050111/rpcrt4_main.c Modified: vendor/wine/dlls/rpcrt4/current/ndr_midl.c Modified: vendor/wine/dlls/rpcrt4/current/rpc_binding.c Modified: vendor/wine/dlls/rpcrt4/current/rpc_message.c Modified: vendor/wine/dlls/rpcrt4/current/rpc_server.c Modified: vendor/wine/dlls/rpcrt4/current/rpcrt4.spec Modified: vendor/wine/dlls/rpcrt4/current/rpcrt4_main.c _____ Copied: vendor/wine/dlls/rpcrt4/Wine-20050111 (from rev 12927, vendor/wine/dlls/rpcrt4/current) _____ Modified: vendor/wine/dlls/rpcrt4/Wine-20050111/ndr_midl.c --- vendor/wine/dlls/rpcrt4/current/ndr_midl.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/rpcrt4/Wine-20050111/ndr_midl.c 2005-01-12 19:26:13 UTC (rev 12978) @@ -100,6 +100,13 @@ HRESULT hr; TRACE("(%p,%p)\n", This, pStubMsg); + + if (!pStubMsg->pRpcChannelBuffer) + { + WARN("Trying to use disconnected proxy %p\n", This); + RpcRaiseException(RPC_E_DISCONNECTED); + } + pStubMsg->dwStubPhase = PROXY_SENDRECEIVE; hr = IRpcChannelBuffer_SendReceive(pStubMsg->pRpcChannelBuffer, (RPCOLEMESSAGE*)pStubMsg->RpcMsg, _____ Modified: vendor/wine/dlls/rpcrt4/Wine-20050111/rpc_binding.c --- vendor/wine/dlls/rpcrt4/current/rpc_binding.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/rpcrt4/Wine-20050111/rpc_binding.c 2005-01-12 19:26:13 UTC (rev 12978) @@ -96,7 +96,7 @@ void RPCRT4_strfree(LPSTR src) { - if (src) HeapFree(GetProcessHeap(), 0, src); + HeapFree(GetProcessHeap(), 0, src); } RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPSTR Protseq, LPSTR NetworkAddr, LPSTR Endpoint, LPSTR NetworkOptions, RpcBinding* Binding) @@ -147,7 +147,7 @@ RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); HeapFree(GetProcessHeap(), 0, pname); memset(&Connection->ovl, 0, sizeof(Connection->ovl)); - Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) { WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError()); if (GetLastError() == ERROR_PIPE_CONNECTED) { @@ -171,7 +171,7 @@ RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); HeapFree(GetProcessHeap(), 0, pname); memset(&Connection->ovl, 0, sizeof(Connection->ovl)); - Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) { WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError()); if (GetLastError() == ERROR_PIPE_CONNECTED) { @@ -223,7 +223,7 @@ /* pipe is connected; change to message-read mode. */ dwMode = PIPE_READMODE_MESSAGE; SetNamedPipeHandleState(conn, &dwMode, NULL, NULL); - Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); Connection->conn = conn; } /* protseq=ncacn_np: named pipes */ @@ -257,7 +257,7 @@ /* pipe is connected; change to message-read mode. */ dwMode = PIPE_READMODE_MESSAGE; SetNamedPipeHandleState(conn, &dwMode, NULL, NULL); - Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); Connection->conn = conn; } else { ERR("protseq %s not supported\n", Connection->Protseq); _____ Modified: vendor/wine/dlls/rpcrt4/Wine-20050111/rpc_message.c --- vendor/wine/dlls/rpcrt4/current/rpc_message.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/rpcrt4/Wine-20050111/rpc_message.c 2005-01-12 19:26:13 UTC (rev 12978) @@ -447,8 +447,7 @@ * it, we'll leave deallocating the original buffer to the RPC server */ pMsg->Buffer = HeapAlloc(GetProcessHeap(), 0, pMsg->BufferLength); } else { - if (pMsg->Buffer) - HeapFree(GetProcessHeap(), 0, pMsg->Buffer); + HeapFree(GetProcessHeap(), 0, pMsg->Buffer); pMsg->Buffer = HeapAlloc(GetProcessHeap(), 0, pMsg->BufferLength); } TRACE("Buffer=%p\n", pMsg->Buffer); @@ -463,9 +462,7 @@ { TRACE("(%p) Buffer=%p\n", pMsg, pMsg->Buffer); /* FIXME: pfnFree? */ - if (pMsg->Buffer != NULL) { - HeapFree(GetProcessHeap(), 0, pMsg->Buffer); - } + HeapFree(GetProcessHeap(), 0, pMsg->Buffer); pMsg->Buffer = NULL; return S_OK; } _____ Modified: vendor/wine/dlls/rpcrt4/Wine-20050111/rpc_server.c --- vendor/wine/dlls/rpcrt4/current/rpc_server.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/rpcrt4/Wine-20050111/rpc_server.c 2005-01-12 19:26:13 UTC (rev 12978) @@ -422,7 +422,7 @@ #endif msg = NULL; } - if (msg) HeapFree(GetProcessHeap(), 0, msg); + HeapFree(GetProcessHeap(), 0, msg); RPCRT4_DestroyConnection(conn); return 0; } @@ -542,8 +542,8 @@ EnterCriticalSection(&listen_cs); if (! ++listen_count) { - if (!mgr_event) mgr_event = CreateEventA(NULL, TRUE, FALSE, NULL); - if (!server_sem) server_sem = CreateSemaphoreA(NULL, 0, MAX_THREADS, NULL); + if (!mgr_event) mgr_event = CreateEventW(NULL, TRUE, FALSE, NULL); + if (!server_sem) server_sem = CreateSemaphoreW(NULL, 0, MAX_THREADS, NULL); if (!worker_tls) worker_tls = TlsAlloc(); std_listen = TRUE; server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, NULL, 0, NULL); _____ Modified: vendor/wine/dlls/rpcrt4/Wine-20050111/rpcrt4.spec --- vendor/wine/dlls/rpcrt4/current/rpcrt4.spec 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/rpcrt4/Wine-20050111/rpcrt4.spec 2005-01-12 19:26:13 UTC (rev 12978) @@ -1,5 +1,5 @@ -@ stub DceErrorInqTextA -@ stub DceErrorInqTextW +@ stdcall DceErrorInqTextA (long ptr) +@ stdcall DceErrorInqTextW (long ptr) @ stdcall -private DllRegisterServer() RPCRT4_DllRegisterServer @ stub MesBufferHandleReset _____ Modified: vendor/wine/dlls/rpcrt4/Wine-20050111/rpcrt4_main.c --- vendor/wine/dlls/rpcrt4/current/rpcrt4_main.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/rpcrt4/Wine-20050111/rpcrt4_main.c 2005-01-12 19:26:13 UTC (rev 12978) @@ -748,3 +748,53 @@ return TRUE; } + +/* DceErrorInqText + * + * Notes + * 1. On passing a NULL pointer the code does bomb out. + * 2. The size of the required buffer is not defined in the documentation. + * It appears to be 256. + * 3. The function is defined to return RPC_S_INVALID_ARG but I don't know + * of any value for which it does. + * 4. The MSDN documentation currently declares that the second argument is + * unsigned char *, even for the W version. I don't believe it. + */ + +#define MAX_RPC_ERROR_TEXT 256 + +RPC_STATUS RPC_ENTRY DceErrorInqTextW (unsigned long e, unsigned short *buffer) +{ + DWORD count; + count = FormatMessageW (FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, e, 0, buffer, MAX_RPC_ERROR_TEXT, NULL); + if (!count) + { + count = FormatMessageW (FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, RPC_S_NOT_RPC_ERROR, 0, buffer, MAX_RPC_ERROR_TEXT, NULL); + if (!count) + { + ERR ("Failed to translate error"); + return RPC_S_INVALID_ARG; + } + } + return RPC_S_OK; +} + +RPC_STATUS RPC_ENTRY DceErrorInqTextA (unsigned long e, unsigned char *buffer) +{ + RPC_STATUS status; + WCHAR bufferW [MAX_RPC_ERROR_TEXT]; + if ((status = DceErrorInqTextW (e, bufferW)) == RPC_S_OK) + { + if (!WideCharToMultiByte(CP_ACP, 0, bufferW, -1, buffer, MAX_RPC_ERROR_TEXT, + NULL, NULL)) + { + ERR ("Failed to translate error"); + status = RPC_S_INVALID_ARG; + } + } + return status; +} _____ Modified: vendor/wine/dlls/rpcrt4/current/ndr_midl.c --- vendor/wine/dlls/rpcrt4/current/ndr_midl.c 2005-01-12 19:25:54 UTC (rev 12977) +++ vendor/wine/dlls/rpcrt4/current/ndr_midl.c 2005-01-12 19:26:13 UTC (rev 12978) @@ -100,6 +100,13 @@ HRESULT hr; TRACE("(%p,%p)\n", This, pStubMsg); + + if (!pStubMsg->pRpcChannelBuffer) + { + WARN("Trying to use disconnected proxy %p\n", This); + RpcRaiseException(RPC_E_DISCONNECTED); + } + pStubMsg->dwStubPhase = PROXY_SENDRECEIVE; hr = IRpcChannelBuffer_SendReceive(pStubMsg->pRpcChannelBuffer, (RPCOLEMESSAGE*)pStubMsg->RpcMsg, _____ Modified: vendor/wine/dlls/rpcrt4/current/rpc_binding.c --- vendor/wine/dlls/rpcrt4/current/rpc_binding.c 2005-01-12 19:25:54 UTC (rev 12977) +++ vendor/wine/dlls/rpcrt4/current/rpc_binding.c 2005-01-12 19:26:13 UTC (rev 12978) @@ -96,7 +96,7 @@ void RPCRT4_strfree(LPSTR src) { - if (src) HeapFree(GetProcessHeap(), 0, src); + HeapFree(GetProcessHeap(), 0, src); } RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPSTR Protseq, LPSTR NetworkAddr, LPSTR Endpoint, LPSTR NetworkOptions, RpcBinding* Binding) @@ -147,7 +147,7 @@ RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); HeapFree(GetProcessHeap(), 0, pname); memset(&Connection->ovl, 0, sizeof(Connection->ovl)); - Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) { WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError()); if (GetLastError() == ERROR_PIPE_CONNECTED) { @@ -171,7 +171,7 @@ RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); HeapFree(GetProcessHeap(), 0, pname); memset(&Connection->ovl, 0, sizeof(Connection->ovl)); - Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) { WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError()); if (GetLastError() == ERROR_PIPE_CONNECTED) { @@ -223,7 +223,7 @@ /* pipe is connected; change to message-read mode. */ dwMode = PIPE_READMODE_MESSAGE; SetNamedPipeHandleState(conn, &dwMode, NULL, NULL); - Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); Connection->conn = conn; } /* protseq=ncacn_np: named pipes */ @@ -257,7 +257,7 @@ /* pipe is connected; change to message-read mode. */ dwMode = PIPE_READMODE_MESSAGE; SetNamedPipeHandleState(conn, &dwMode, NULL, NULL); - Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); Connection->conn = conn; } else { ERR("protseq %s not supported\n", Connection->Protseq); _____ Modified: vendor/wine/dlls/rpcrt4/current/rpc_message.c --- vendor/wine/dlls/rpcrt4/current/rpc_message.c 2005-01-12 19:25:54 UTC (rev 12977) +++ vendor/wine/dlls/rpcrt4/current/rpc_message.c 2005-01-12 19:26:13 UTC (rev 12978) @@ -447,8 +447,7 @@ * it, we'll leave deallocating the original buffer to the RPC server */ pMsg->Buffer = HeapAlloc(GetProcessHeap(), 0, pMsg->BufferLength); } else { - if (pMsg->Buffer) - HeapFree(GetProcessHeap(), 0, pMsg->Buffer); + HeapFree(GetProcessHeap(), 0, pMsg->Buffer); pMsg->Buffer = HeapAlloc(GetProcessHeap(), 0, pMsg->BufferLength); } TRACE("Buffer=%p\n", pMsg->Buffer); @@ -463,9 +462,7 @@ { TRACE("(%p) Buffer=%p\n", pMsg, pMsg->Buffer); /* FIXME: pfnFree? */ - if (pMsg->Buffer != NULL) { - HeapFree(GetProcessHeap(), 0, pMsg->Buffer); - } + HeapFree(GetProcessHeap(), 0, pMsg->Buffer); pMsg->Buffer = NULL; return S_OK; } _____ Modified: vendor/wine/dlls/rpcrt4/current/rpc_server.c --- vendor/wine/dlls/rpcrt4/current/rpc_server.c 2005-01-12 19:25:54 UTC (rev 12977) +++ vendor/wine/dlls/rpcrt4/current/rpc_server.c 2005-01-12 19:26:13 UTC (rev 12978) @@ -422,7 +422,7 @@ #endif msg = NULL; } - if (msg) HeapFree(GetProcessHeap(), 0, msg); + HeapFree(GetProcessHeap(), 0, msg); RPCRT4_DestroyConnection(conn); return 0; } @@ -542,8 +542,8 @@ EnterCriticalSection(&listen_cs); if (! ++listen_count) { - if (!mgr_event) mgr_event = CreateEventA(NULL, TRUE, FALSE, NULL); - if (!server_sem) server_sem = CreateSemaphoreA(NULL, 0, MAX_THREADS, NULL); + if (!mgr_event) mgr_event = CreateEventW(NULL, TRUE, FALSE, NULL); + if (!server_sem) server_sem = CreateSemaphoreW(NULL, 0, MAX_THREADS, NULL); if (!worker_tls) worker_tls = TlsAlloc(); std_listen = TRUE; server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, NULL, 0, NULL); _____ Modified: vendor/wine/dlls/rpcrt4/current/rpcrt4.spec --- vendor/wine/dlls/rpcrt4/current/rpcrt4.spec 2005-01-12 19:25:54 UTC (rev 12977) +++ vendor/wine/dlls/rpcrt4/current/rpcrt4.spec 2005-01-12 19:26:13 UTC (rev 12978) @@ -1,5 +1,5 @@ -@ stub DceErrorInqTextA -@ stub DceErrorInqTextW +@ stdcall DceErrorInqTextA (long ptr) +@ stdcall DceErrorInqTextW (long ptr) @ stdcall -private DllRegisterServer() RPCRT4_DllRegisterServer @ stub MesBufferHandleReset _____ Modified: vendor/wine/dlls/rpcrt4/current/rpcrt4_main.c --- vendor/wine/dlls/rpcrt4/current/rpcrt4_main.c 2005-01-12 19:25:54 UTC (rev 12977) +++ vendor/wine/dlls/rpcrt4/current/rpcrt4_main.c 2005-01-12 19:26:13 UTC (rev 12978) @@ -748,3 +748,53 @@ return TRUE; } + +/* DceErrorInqText + * + * Notes + * 1. On passing a NULL pointer the code does bomb out. + * 2. The size of the required buffer is not defined in the documentation. + * It appears to be 256. + * 3. The function is defined to return RPC_S_INVALID_ARG but I don't know + * of any value for which it does. + * 4. The MSDN documentation currently declares that the second argument is + * unsigned char *, even for the W version. I don't believe it. + */ + +#define MAX_RPC_ERROR_TEXT 256 + +RPC_STATUS RPC_ENTRY DceErrorInqTextW (unsigned long e, unsigned short *buffer) +{ + DWORD count; + count = FormatMessageW (FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, e, 0, buffer, MAX_RPC_ERROR_TEXT, NULL); + if (!count) + { + count = FormatMessageW (FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, RPC_S_NOT_RPC_ERROR, 0, buffer, MAX_RPC_ERROR_TEXT, NULL); + if (!count) + { + ERR ("Failed to translate error"); + return RPC_S_INVALID_ARG; + } + } + return RPC_S_OK; +} + +RPC_STATUS RPC_ENTRY DceErrorInqTextA (unsigned long e, unsigned char *buffer) +{ + RPC_STATUS status; + WCHAR bufferW [MAX_RPC_ERROR_TEXT]; + if ((status = DceErrorInqTextW (e, bufferW)) == RPC_S_OK) + { + if (!WideCharToMultiByte(CP_ACP, 0, bufferW, -1, buffer, MAX_RPC_ERROR_TEXT, + NULL, NULL)) + { + ERR ("Failed to translate error"); + status = RPC_S_INVALID_ARG; + } + } + return status; +}

19 years, 10 months

[gvg] 12977: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/richedit/Wine-20050111/ Modified: vendor/wine/dlls/richedit/Wine-20050111/reader.c Modified: vendor/wine/dlls/richedit/Wine-20050111/richedit.c Modified: vendor/wine/dlls/richedit/Wine-20050111/rtf2text.h Modified: vendor/wine/dlls/richedit/current/reader.c Modified: vendor/wine/dlls/richedit/current/richedit.c Modified: vendor/wine/dlls/richedit/current/rtf2text.h _____ Copied: vendor/wine/dlls/richedit/Wine-20050111 (from rev 12927, vendor/wine/dlls/richedit/current) _____ Modified: vendor/wine/dlls/richedit/Wine-20050111/reader.c --- vendor/wine/dlls/richedit/current/reader.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/richedit/Wine-20050111/reader.c 2005-01-12 19:25:54 UTC (rev 12977) @@ -98,9 +98,9 @@ static void ReadInfoGroup (RTF_Info *); static void ReadPictGroup (RTF_Info *); static void ReadObjGroup (RTF_Info *); -static void LookupInit (); +static void LookupInit (void); static void Lookup (RTF_Info *, char *); -static int Hash (); +static int Hash (char*); static void CharSetInit (RTF_Info *); static void ReadCharSetMaps (RTF_Info *); @@ -2451,7 +2451,7 @@ * Initialize lookup table hash values. Only need to do this once. */ -static void LookupInit() +static void LookupInit(void) { static int inited = 0; RTFKey *rp; @@ -2546,8 +2546,7 @@ void RTFFree(char *p) { - if (p != (char *) NULL) - HeapFree(RICHED32_hHeap, 0, p); + HeapFree(RICHED32_hHeap, 0, p); } _____ Modified: vendor/wine/dlls/richedit/Wine-20050111/richedit.c --- vendor/wine/dlls/richedit/current/richedit.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/richedit/Wine-20050111/richedit.c 2005-01-12 19:25:54 UTC (rev 12977) @@ -778,7 +778,7 @@ ZeroMemory(&wndClass, sizeof(WNDCLASSA)); wndClass.style = CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; - wndClass.lpfnWndProc = (WNDPROC)RICHED32_WindowProc; + wndClass.lpfnWndProc = RICHED32_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = RTFInfoOffset + sizeof(RTFControl_Info*); wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); _____ Modified: vendor/wine/dlls/richedit/Wine-20050111/rtf2text.h --- vendor/wine/dlls/richedit/current/rtf2text.h 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/richedit/Wine-20050111/rtf2text.h 2005-01-12 19:25:54 UTC (rev 12977) @@ -1,2 +1,2 @@ -void WriterInit (); -int BeginFile (); +void WriterInit (RTF_Info *); +int BeginFile (RTF_Info *); _____ Modified: vendor/wine/dlls/richedit/current/reader.c --- vendor/wine/dlls/richedit/current/reader.c 2005-01-12 19:25:27 UTC (rev 12976) +++ vendor/wine/dlls/richedit/current/reader.c 2005-01-12 19:25:54 UTC (rev 12977) @@ -98,9 +98,9 @@ static void ReadInfoGroup (RTF_Info *); static void ReadPictGroup (RTF_Info *); static void ReadObjGroup (RTF_Info *); -static void LookupInit (); +static void LookupInit (void); static void Lookup (RTF_Info *, char *); -static int Hash (); +static int Hash (char*); static void CharSetInit (RTF_Info *); static void ReadCharSetMaps (RTF_Info *); @@ -2451,7 +2451,7 @@ * Initialize lookup table hash values. Only need to do this once. */ -static void LookupInit() +static void LookupInit(void) { static int inited = 0; RTFKey *rp; @@ -2546,8 +2546,7 @@ void RTFFree(char *p) { - if (p != (char *) NULL) - HeapFree(RICHED32_hHeap, 0, p); + HeapFree(RICHED32_hHeap, 0, p); } _____ Modified: vendor/wine/dlls/richedit/current/richedit.c --- vendor/wine/dlls/richedit/current/richedit.c 2005-01-12 19:25:27 UTC (rev 12976) +++ vendor/wine/dlls/richedit/current/richedit.c 2005-01-12 19:25:54 UTC (rev 12977) @@ -778,7 +778,7 @@ ZeroMemory(&wndClass, sizeof(WNDCLASSA)); wndClass.style = CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; - wndClass.lpfnWndProc = (WNDPROC)RICHED32_WindowProc; + wndClass.lpfnWndProc = RICHED32_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = RTFInfoOffset + sizeof(RTFControl_Info*); wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); _____ Modified: vendor/wine/dlls/richedit/current/rtf2text.h --- vendor/wine/dlls/richedit/current/rtf2text.h 2005-01-12 19:25:27 UTC (rev 12976) +++ vendor/wine/dlls/richedit/current/rtf2text.h 2005-01-12 19:25:54 UTC (rev 12977) @@ -1,2 +1,2 @@ -void WriterInit (); -int BeginFile (); +void WriterInit (RTF_Info *); +int BeginFile (RTF_Info *);

19 years, 10 months

[gvg] 12976: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/olepro32/Wine-20050111/ _____ Copied: vendor/wine/dlls/olepro32/Wine-20050111 (from rev 12927, vendor/wine/dlls/olepro32/current)

19 years, 10 months

[gvg] 12975: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/oledlg/Wine-20050111/ _____ Copied: vendor/wine/dlls/oledlg/Wine-20050111 (from rev 12927, vendor/wine/dlls/oledlg/current)

19 years, 10 months

← Newer
1
...
37
38
39
40
41
42
43
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005