Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 63082: [DBGHELP] - Fix order of operations for assignment in symt_fill_sym_info. Patch by Víctor Martínez CORE-8114 #resolve
by tfaber＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: tfaber Date: Wed Apr 30 18:59:39 2014 New Revision: 63082 URL: http://svn.reactos.org/svn/reactos?rev=63082&view=rev Log: [DBGHELP] - Fix order of operations for assignment in symt_fill_sym_info. Patch by Víctor Martínez CORE-8114 #resolve Modified: trunk/reactos/dll/win32/dbghelp/symbol.c Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] Wed Apr 30 18:59:39 2014 @@ -703,8 +703,8 @@ if (sym_info->MaxNameLen) { if (sym->tag != SymTagPublicSymbol || !(dbghelp_options & SYMOPT_UNDNAME) || - (sym_info->NameLen = UnDecorateSymbolName(name, sym_info->Name, - sym_info->MaxNameLen, UNDNAME_NAME_ONLY) == 0)) + ((sym_info->NameLen = UnDecorateSymbolName(name, sym_info->Name, + sym_info->MaxNameLen, UNDNAME_NAME_ONLY)) == 0)) { sym_info->NameLen = min(strlen(name), sym_info->MaxNameLen - 1); memcpy(sym_info->Name, name, sym_info->NameLen);

1 0

[pschweitzer] 63081: [FASTFAT] Disable SL_OPEN_TARGET_DIRECTORY for the moment. CORE-8128 #resolve
by pschweitzer＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: pschweitzer Date: Wed Apr 30 18:48:03 2014 New Revision: 63081 URL: http://svn.reactos.org/svn/reactos?rev=63081&view=rev Log: [FASTFAT] Disable SL_OPEN_TARGET_DIRECTORY for the moment. CORE-8128 #resolve Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Wed Apr 30 18:48:03 2014 @@ -462,7 +462,11 @@ RequestedDisposition = ((Stack->Parameters.Create.Options >> 24) & 0xff); RequestedOptions = Stack->Parameters.Create.Options & FILE_VALID_OPTION_FLAGS; PagingFileCreate = (Stack->Flags & SL_OPEN_PAGING_FILE) ? TRUE : FALSE; +#if 0 OpenTargetDir = (Stack->Flags & SL_OPEN_TARGET_DIRECTORY) ? TRUE : FALSE; +#else + OpenTargetDir = FALSE; +#endif FileObject = Stack->FileObject; DeviceExt = DeviceObject->DeviceExtension;

1 0

[akhaldi] 63080: [MPLAY32][MSPAINT][NOTEPAD][REGEDIT][WINHLP32] * Fix some format string / argument mismatches. By Andre Guibert de Bruet. CORE-7995
by akhaldi＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: akhaldi Date: Wed Apr 30 18:41:39 2014 New Revision: 63080 URL: http://svn.reactos.org/svn/reactos?rev=63080&view=rev Log: [MPLAY32][MSPAINT][NOTEPAD][REGEDIT][WINHLP32] * Fix some format string / argument mismatches. By Andre Guibert de Bruet. CORE-7995 Modified: trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/mspaint/registry.c trunk/reactos/base/applications/mspaint/winproc.c trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/winhlp32/hlpfile.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Wed Apr 30 18:41:39 2014 @@ -112,7 +112,7 @@ LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR)); } - _stprintf(szTempMessage, _T("MMSYS%u: %s"), dwError, szErrorMessage); + _stprintf(szTempMessage, _T("MMSYS%lu: %s"), dwError, szErrorMessage); MessageBox(hwnd, szTempMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION); } Modified: trunk/reactos/base/applications/mspaint/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/registry.c [iso-8859-1] Wed Apr 30 18:41:39 2014 @@ -31,8 +31,8 @@ RegSetValueEx(hDesktop, _T("Wallpaper"), 0, REG_SZ, (LPBYTE) FileName, _tcslen(FileName) * sizeof(TCHAR)); - _stprintf(szStyle, _T("%i"), dwStyle); - _stprintf(szTile, _T("%i"), dwTile); + _stprintf(szStyle, _T("%lu"), dwStyle); + _stprintf(szTile, _T("%lu"), dwTile); RegSetValueEx(hDesktop, _T("WallpaperStyle"), 0, REG_SZ, (LPBYTE) szStyle, _tcslen(szStyle) * sizeof(TCHAR)); Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Wed Apr 30 18:41:39 2014 @@ -595,7 +595,7 @@ if (!drawing) { TCHAR coordStr[100]; - _stprintf(coordStr, _T("%d, %d"), xNow, yNow); + _stprintf(coordStr, _T("%ld, %ld"), xNow, yNow); SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr); } } @@ -634,7 +634,7 @@ case TOOL_SHAPE: { TCHAR coordStr[100]; - _stprintf(coordStr, _T("%d, %d"), xNow, yNow); + _stprintf(coordStr, _T("%ld, %ld"), xNow, yNow); SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr); break; } @@ -648,7 +648,7 @@ TCHAR sizeStr[100]; if ((activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) yRel = xRel; - _stprintf(sizeStr, _T("%d x %d"), xRel, yRel); + _stprintf(sizeStr, _T("%ld x %ld"), xRel, yRel); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); } } @@ -661,7 +661,7 @@ TCHAR sizeStr[100]; if ((activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) yRel = xRel; - _stprintf(sizeStr, _T("%d x %d"), xRel, yRel); + _stprintf(sizeStr, _T("%ld x %ld"), xRel, yRel); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); } } Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Wed Apr 30 18:41:39 2014 @@ -965,7 +965,7 @@ switch(uMsg) { case WM_INITDIALOG: hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER); - _sntprintf(szText, SIZEOF(szText), _T("%d"), lParam); + _sntprintf(szText, SIZEOF(szText), _T("%ld"), lParam); SetWindowText(hTextBox, szText); break; case WM_COMMAND: Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] Wed Apr 30 18:41:39 2014 @@ -893,7 +893,7 @@ status = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, (LPSTR) &lpMsgBuf, 0, NULL); if (!status) { - fprintf(stderr,"%S: Cannot display message for error %ld, status %ld\n", + fprintf(stderr,"%S: Cannot display message for error %lu, status %lu\n", getAppName(), error_code, GetLastError()); exit(1); } Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] Wed Apr 30 18:41:39 2014 @@ -1049,7 +1049,7 @@ ptr = beg + 2; /* for type and pack */ mm = fetch_ushort(&ptr); /* mapping mode */ - sprintf(tmp, "{\\pict\\wmetafile%d\\picw%d\\pich%d", + sprintf(tmp, "{\\pict\\wmetafile%u\\picw%u\\pich%u", mm, GET_USHORT(ptr, 0), GET_USHORT(ptr, 2)); if (!HLPFILE_RtfAddControl(rd, tmp)) return FALSE; ptr += 4; @@ -1465,11 +1465,10 @@ } /* FIXME: missing at least colors, also bold attribute looses information */ - sprintf(tmp, "\\f%d\\cf%d\\fs%d%s%s%s%s", + sprintf(tmp, "\\f%u\\cf%u\\fs%u%s%s%s%s", font, font + 2, fs, page->file->fonts[font].LogFont.lfWeight > 400 ? "\\b" : "\\b0", - page->file->fonts[font].LogFont.lfItalic ? "\\i" : "\\i0", - page->file->fonts[font].LogFont.lfUnderline ? "\\ul" : "\\ul0", + page->file->fonts[font].LogFont.lfItalic ? "\\i" : "\\i0", page->file->fonts[font].LogFont.lfUnderline ? "\\ul" : "\\ul0", page->file->fonts[font].LogFont.lfStrikeOut ? "\\strike" : "\\strike0"); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; }

1 0

[akhaldi] 63079: [README.WINE] * Mark some modules as up to date. CORE-8080
by akhaldi＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: akhaldi Date: Wed Apr 30 13:19:57 2014 New Revision: 63079 URL: http://svn.reactos.org/svn/reactos?rev=63079&view=rev Log: [README.WINE] * Mark some modules as up to date. CORE-8080 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 30 13:19:57 2014 @@ -48,9 +48,9 @@ reactos/dll/directx/wine/quartz # Synced to Wine-1.7.17 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.17 -reactos/dll/win32/activeds # Synced to Wine-1.7.1 +reactos/dll/win32/activeds # Synced to Wine-1.7.17 reactos/dll/win32/actxprxy # Synced to Wine-1.7.17 -reactos/dll/win32/advpack # Synced to Wine-1.7.1 +reactos/dll/win32/advpack # Synced to Wine-1.7.17 reactos/dll/win32/atl # Synced to Wine-1.7.17 reactos/dll/win32/atl100 # Synced to Wine-1.7.17 reactos/dll/win32/atl80 # Synced to Wine-1.7.17 @@ -58,142 +58,142 @@ reactos/dll/win32/bcrypt # Synced to Wine-1.7.17 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.7.17 -reactos/dll/win32/clusapi # Synced to Wine-1.7.1 -reactos/dll/win32/comcat # Synced to Wine-1.7.1 +reactos/dll/win32/clusapi # Synced to Wine-1.7.17 +reactos/dll/win32/comcat # Synced to Wine-1.7.17 reactos/dll/win32/comctl32 # Synced to Wine-1.7.17 reactos/dll/win32/comdlg32 # Synced to Wine-1.7.17 -reactos/dll/win32/compstui # Synced to Wine-1.7.1 -reactos/dll/win32/credui # Synced to Wine-1.7.1 +reactos/dll/win32/compstui # Synced to Wine-1.7.17 +reactos/dll/win32/credui # Synced to Wine-1.7.17 reactos/dll/win32/crypt32 # Synced to Wine-1.7.17 -reactos/dll/win32/cryptdlg # Synced to Wine-1.7.1 -reactos/dll/win32/cryptdll # Synced to Wine-1.7.1 +reactos/dll/win32/cryptdlg # Synced to Wine-1.7.17 +reactos/dll/win32/cryptdll # Synced to Wine-1.7.17 reactos/dll/win32/cryptnet # Synced to Wine-1.7.17 -reactos/dll/win32/cryptui # Synced to Wine-1.7.1 +reactos/dll/win32/cryptui # Synced to Wine-1.7.17 reactos/dll/win32/dbghelp # Synced to Wine-1.7.17 -reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 +reactos/dll/win32/dciman32 # Synced to Wine-1.7.17 reactos/dll/win32/dwmapi # Synced to Wine-1.7.17 -reactos/dll/win32/faultrep # Synced to Wine-1.7.1 -reactos/dll/win32/fusion # Synced to Wine-1.7.1 +reactos/dll/win32/faultrep # Synced to Wine-1.7.17 +reactos/dll/win32/fusion # Synced to Wine-1.7.17 reactos/dll/win32/gdiplus # Synced to Wine-1.7.17 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.17 reactos/dll/win32/hlink # Synced to Wine-1.7.17 reactos/dll/win32/hnetcfg # Synced to Wine-1.7.17 -reactos/dll/win32/httpapi # Synced to Wine-1.7.1 -reactos/dll/win32/iccvid # Synced to Wine-1.7.1 +reactos/dll/win32/httpapi # Synced to Wine-1.7.17 +reactos/dll/win32/iccvid # Synced to Wine-1.7.17 reactos/dll/win32/icmp # Out of sync reactos/dll/win32/ieframe # Synced to Wine-1.7.17 -reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.17 reactos/dll/win32/imagehlp # Synced to Wine-1.7.17 -reactos/dll/win32/imm32 # Synced to Wine-1.7.1 +reactos/dll/win32/imm32 # Synced to Wine-1.7.17 reactos/dll/win32/inetcomm # Synced to Wine-1.7.17 reactos/dll/win32/inetmib1 # Synced to Wine-1.7.1 -reactos/dll/win32/initpki # Synced to Wine-1.7.1 +reactos/dll/win32/initpki # Synced to Wine-1.7.17 reactos/dll/win32/inseng # Synced to Wine-1.7.17 reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to Wine-1.7.1 +reactos/dll/win32/itircl # Synced to Wine-1.7.17 reactos/dll/win32/itss # Synced to Wine-1.7.17 reactos/dll/win32/jscript # Synced to Wine-1.7.17 -reactos/dll/win32/loadperf # Synced to Wine-1.7.1 +reactos/dll/win32/loadperf # Synced to Wine-1.7.17 reactos/dll/win32/localspl # Synced to Wine-1.7.17 -reactos/dll/win32/localui # Synced to Wine-1.7.1 -reactos/dll/win32/lz32 # Synced to Wine-1.7.1 +reactos/dll/win32/localui # Synced to Wine-1.7.17 +reactos/dll/win32/lz32 # Synced to Wine-1.7.17 reactos/dll/win32/mapi32 # Synced to Wine-1.7.17 -reactos/dll/win32/mciavi32 # Synced to Wine-1.7.1 -reactos/dll/win32/mcicda # Synced to Wine-1.7.1 +reactos/dll/win32/mciavi32 # Synced to Wine-1.7.17 +reactos/dll/win32/mcicda # Synced to Wine-1.7.17 reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.17 -reactos/dll/win32/mciseq # Synced to Wine-1.7.1 -reactos/dll/win32/mciwave # Synced to Wine-1.7.1 +reactos/dll/win32/mciseq # Synced to Wine-1.7.17 +reactos/dll/win32/mciwave # Synced to Wine-1.7.17 reactos/dll/win32/mlang # Synced to Wine-1.7.17 reactos/dll/win32/mmdevapi # Synced to Wine-1.7.1 -reactos/dll/win32/mpr # Synced to Wine-1.7.1 -reactos/dll/win32/mprapi # Synced to Wine-1.7.1 +reactos/dll/win32/mpr # Synced to Wine-1.7.17 +reactos/dll/win32/mprapi # Synced to Wine-1.7.17 reactos/dll/win32/msacm32 # Synced to Wine-1.7.17 reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.17 reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.17 -reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 +reactos/dll/win32/mscat32 # Synced to Wine-1.7.17 reactos/dll/win32/mscms # Synced to Wine-1.7.17 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to Wine-1.7.17 -reactos/dll/win32/msftedit # Synced to Wine-1.7.1 -reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1 +reactos/dll/win32/msftedit # Synced to Wine-1.7.17 +reactos/dll/win32/msg711.acm # Synced to Wine-1.7.17 reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.17 reactos/dll/win32/mshtml # Synced to Wine-1.7.17 reactos/dll/win32/mshtml.tlb # Synced to Wine-1.7.17 reactos/dll/win32/msi # Synced to Wine-1.7.17 -reactos/dll/win32/msimg32 # Synced to Wine-1.7.1 +reactos/dll/win32/msimg32 # Synced to Wine-1.7.17 reactos/dll/win32/msimtf # Synced to Wine-1.7.17 -reactos/dll/win32/msisip # Synced to Wine-1.7.1 -reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.1 -reactos/dll/win32/msnet32 # Synced to Wine-1.7.1 +reactos/dll/win32/msisip # Synced to Wine-1.7.17 +reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.17 +reactos/dll/win32/msnet32 # Synced to Wine-1.7.17 reactos/dll/win32/msrle32 # Synced to Wine-1.7.17 -reactos/dll/win32/mssign32 # Synced to Wine-1.7.1 -reactos/dll/win32/mssip32 # Synced to Wine-1.7.1 +reactos/dll/win32/mssign32 # Synced to Wine-1.7.17 +reactos/dll/win32/mssip32 # Synced to Wine-1.7.17 reactos/dll/win32/mstask # Synced to Wine-1.7.17 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Synced to Wine-1.7.1 +reactos/dll/win32/msvfw32 # Synced to Wine-1.7.17 reactos/dll/win32/msvidc32 # Synced to Wine-1.7.17 reactos/dll/win32/msxml # Synced to Wine-1.7.17 reactos/dll/win32/msxml2 # Synced to Wine-1.7.17 reactos/dll/win32/msxml3 # Synced to Wine-1.7.17 reactos/dll/win32/msxml4 # Synced to Wine-1.7.17 reactos/dll/win32/msxml6 # Synced to Wine-1.7.17 -reactos/dll/win32/nddeapi # Synced to Wine-1.7.1 +reactos/dll/win32/nddeapi # Synced to Wine-1.7.17 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 -reactos/dll/win32/ntdsapi # Synced to Wine-1.7.1 -reactos/dll/win32/ntprint # Synced to Wine-1.7.1 +reactos/dll/win32/ntdsapi # Synced to Wine-1.7.17 +reactos/dll/win32/ntprint # Synced to Wine-1.7.17 reactos/dll/win32/objsel # Synced to Wine-1.7.17 reactos/dll/win32/odbc32 # Synced to Wine-1.7.17. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Synced to Wine-1.7.1 +reactos/dll/win32/odbccp32 # Synced to Wine-1.7.17 reactos/dll/win32/ole32 # Synced to Wine-1.7.17 reactos/dll/win32/oleacc # Synced to Wine-1.7.17 reactos/dll/win32/oleaut32 # Synced to Wine-1.7.17 -reactos/dll/win32/olecli32 # Synced to Wine-1.7.1 -reactos/dll/win32/oledlg # Synced to Wine-1.7.1 -reactos/dll/win32/olepro32 # Synced to Wine-1.7.1 -reactos/dll/win32/olesvr32 # Synced to Wine-1.7.1 -reactos/dll/win32/olethk32 # Synced to Wine-1.7.1 -reactos/dll/win32/pdh # Synced to Wine-1.7.1 -reactos/dll/win32/pidgen # Synced to Wine-1.7.1 +reactos/dll/win32/olecli32 # Synced to Wine-1.7.17 +reactos/dll/win32/oledlg # Synced to Wine-1.7.17 +reactos/dll/win32/olepro32 # Synced to Wine-1.7.17 +reactos/dll/win32/olesvr32 # Synced to Wine-1.7.17 +reactos/dll/win32/olethk32 # Synced to Wine-1.7.17 +reactos/dll/win32/pdh # Synced to Wine-1.7.17 +reactos/dll/win32/pidgen # Synced to Wine-1.7.17 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to Wine-1.7.1 +reactos/dll/win32/printui # Synced to Wine-1.7.17 reactos/dll/win32/propsys # Synced to Wine-1.7.17 reactos/dll/win32/pstorec # Synced to Wine-1.7.17 reactos/dll/win32/qmgr # Synced to Wine-1.7.17 reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.17 -reactos/dll/win32/query # Synced to Wine-1.7.1 -reactos/dll/win32/rasapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/resutils # Synced to Wine-1.7.1 +reactos/dll/win32/query # Synced to Wine-1.7.17 +reactos/dll/win32/rasapi32 # Synced to Wine-1.7.17 +reactos/dll/win32/resutils # Synced to Wine-1.7.17 reactos/dll/win32/riched20 # Synced to Wine-1.7.17 -reactos/dll/win32/riched32 # Synced to Wine-1.7.1 +reactos/dll/win32/riched32 # Synced to Wine-1.7.17 reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.17 -reactos/dll/win32/rsabase # Synced to Wine-1.7.1 +reactos/dll/win32/rsabase # Synced to Wine-1.7.17 reactos/dll/win32/rsaenh # Synced to Wine-1.7.17 -reactos/dll/win32/sccbase # Synced to Wine-1.7.1 -reactos/dll/win32/schannel # Synced to Wine-1.7.1 +reactos/dll/win32/sccbase # Synced to Wine-1.7.17 +reactos/dll/win32/schannel # Synced to Wine-1.7.17 reactos/dll/win32/scrrun # Synced to Wine-1.7.17 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to Wine-1.7.1 +reactos/dll/win32/sensapi # Synced to Wine-1.7.17 reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to Wine-1.7.1 +reactos/dll/win32/shdoclc # Synced to Wine-1.7.17 reactos/dll/win32/shdocvw # Synced to Wine-1.7.17 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Synced to Wine-1.7.1 +reactos/dll/win32/shfolder # Synced to Wine-1.7.17 reactos/dll/win32/shlwapi # Synced to Wine-1.7.17 -reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 -reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 -reactos/dll/win32/softpub # Synced to Wine-1.7.1 -reactos/dll/win32/spoolss # Synced to Wine-1.7.1 +reactos/dll/win32/slbcsp # Synced to Wine-1.7.17 +reactos/dll/win32/snmpapi # Synced to Wine-1.7.17 +reactos/dll/win32/softpub # Synced to Wine-1.7.17 +reactos/dll/win32/spoolss # Synced to Wine-1.7.17 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.7.17 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.7.17 reactos/dll/win32/sti # Synced to Wine-1.7.17 -reactos/dll/win32/sxs # Synced to Wine-1.7.1 +reactos/dll/win32/sxs # Synced to Wine-1.7.17 reactos/dll/win32/tapi32 # Synced to Wine-1.7.17 -reactos/dll/win32/traffic # Synced to Wine-1.7.1 +reactos/dll/win32/traffic # Synced to Wine-1.7.17 reactos/dll/win32/twain_32 # Synced to Wine-1.7.17 reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) -reactos/dll/win32/updspapi # Synced to Wine-1.7.1 +reactos/dll/win32/updspapi # Synced to Wine-1.7.17 reactos/dll/win32/url # Synced to Wine-1.7.17 reactos/dll/win32/urlmon # Synced to Wine-1.7.17 reactos/dll/win32/usp10 # Synced to Wine-1.7.17 @@ -204,8 +204,8 @@ reactos/dll/win32/wbemprox # Synced to Wine-1.7.17 reactos/dll/win32/wer # Autosync reactos/dll/win32/windowscodecs # Synced to Wine-1.7.17 -reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.1 -reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.1 +reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.17 +reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.17 reactos/dll/win32/wing32 # Out of sync reactos/dll/win32/winhttp # Synced to Wine-1.7.17 reactos/dll/win32/wininet # Synced to Wine-1.7.17 @@ -217,10 +217,10 @@ reactos/dll/win32/wmi # Synced to Wine-1.7.17 reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.17 reactos/dll/win32/wuapi # Synced to Wine-1.7.17 -reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.1 -reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1 -reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1 -reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.17 +reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.17 +reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.17 +reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.17 reactos/dll/win32/xmllite # Synced to Wine-1.7.17 reactos/dll/cpl/inetcpl # Synced to Wine-1.7.1

1 0

[akhaldi] 63078: [STI] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: akhaldi Date: Wed Apr 30 13:07:53 2014 New Revision: 63078 URL: http://svn.reactos.org/svn/reactos?rev=63078&view=rev Log: [STI] * Sync with Wine 1.7.17. CORE-8080 Added: trunk/reactos/dll/win32/sti/sti_wia.rgs - copied unchanged from r63057, trunk/reactos/dll/win32/sti/sti.rgs Removed: trunk/reactos/dll/win32/sti/sti.rgs Modified: trunk/reactos/dll/win32/sti/sti.rc trunk/reactos/dll/win32/sti/sti_wia.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/sti/sti.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti.rc?rev=6… ============================================================================== --- trunk/reactos/dll/win32/sti/sti.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti.rc [iso-8859-1] Wed Apr 30 13:07:53 2014 @@ -1 +1 @@ -1 WINE_REGISTRY "sti.rgs" +1 WINE_REGISTRY sti_wia.rgs Removed: trunk/reactos/dll/win32/sti/sti.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti.rgs?rev=… ============================================================================== --- trunk/reactos/dll/win32/sti/sti.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti.rgs (removed) @@ -1,37 +0,0 @@ -HKCR -{ - NoRemove Interface - { - '{5EB2502A-8CF1-11D1-BF92-0060081ED811}' = s 'IWiaDevMgr' - { - NumMethods = s 12 - ProxyStubClsid32 = s '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' - } - '{5E38B83C-8CF1-11D1-BF92-0060081ED811}' = s 'IEnumWIA_DEV_INFO' - { - NumMethods = s 3 - ProxyStubClsid32 = s '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' - } - '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' = s 'IWiaItem' - { - NumMethods = s 3 - ProxyStubClsid32 = s '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' - } - '{AE6287B0-0084-11D2-973B-00A0C9068F2E}' = s 'IWiaEventCallback' - { - NumMethods = s 4 - ProxyStubClsid32 = s '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' - } - } - NoRemove CLSID - { - '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' = s 'PSFactoryBuffer' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{B323F8E0-2E68-11D0-90EA-00AA0060F86C}' = s 'StillImage' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - } -} Modified: trunk/reactos/dll/win32/sti/sti_wia.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti_wia.idl?… ============================================================================== --- trunk/reactos/dll/win32/sti/sti_wia.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti_wia.idl [iso-8859-1] Wed Apr 30 13:07:53 2014 @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy +#pragma makedep register + #include "wia_lh.idl" [ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 30 13:07:53 2014 @@ -187,7 +187,7 @@ reactos/dll/win32/spoolss # Synced to Wine-1.7.1 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.7.17 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.7.17 -reactos/dll/win32/sti # Synced to Wine-1.7.1 +reactos/dll/win32/sti # Synced to Wine-1.7.17 reactos/dll/win32/sxs # Synced to Wine-1.7.1 reactos/dll/win32/tapi32 # Synced to Wine-1.7.17 reactos/dll/win32/traffic # Synced to Wine-1.7.1

1 0

[akhaldi] 63077: [STDOLE2.TLB][STDOLE32.TLB] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: akhaldi Date: Wed Apr 30 13:05:05 2014 New Revision: 63077 URL: http://svn.reactos.org/svn/reactos?rev=63077&view=rev Log: [STDOLE2.TLB][STDOLE32.TLB] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/stdole2.tlb/std_ole_v2.idl trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/stdole2.tlb/std_ole_v2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/std_… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/std_ole_v2.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole2.tlb/std_ole_v2.idl [iso-8859-1] Wed Apr 30 13:05:05 2014 @@ -18,4 +18,6 @@ * */ +#pragma makedep regtypelib + #include "stdole2.idl" Modified: trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] Wed Apr 30 13:05:05 2014 @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ + +#pragma makedep regtypelib [ uuid(00020430-0000-0000-C000-000000000046), Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 30 13:05:05 2014 @@ -185,8 +185,8 @@ reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 reactos/dll/win32/softpub # Synced to Wine-1.7.1 reactos/dll/win32/spoolss # Synced to Wine-1.7.1 -reactos/dll/win32/stdole2.tlb # Synced to Wine-1.7.1 -reactos/dll/win32/stdole32.tlb # Synced to Wine-1.7.1 +reactos/dll/win32/stdole2.tlb # Synced to Wine-1.7.17 +reactos/dll/win32/stdole32.tlb # Synced to Wine-1.7.17 reactos/dll/win32/sti # Synced to Wine-1.7.1 reactos/dll/win32/sxs # Synced to Wine-1.7.1 reactos/dll/win32/tapi32 # Synced to Wine-1.7.17

1 0

[akhaldi] 63076: [SNMPAPI_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: akhaldi Date: Wed Apr 30 13:01:50 2014 New Revision: 63076 URL: http://svn.reactos.org/svn/reactos?rev=63076&view=rev Log: [SNMPAPI_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/snmpapi/util.c Modified: trunk/rostests/winetests/snmpapi/util.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/snmpapi/util.c?… ============================================================================== --- trunk/rostests/winetests/snmpapi/util.c [iso-8859-1] (original) +++ trunk/rostests/winetests/snmpapi/util.c [iso-8859-1] Wed Apr 30 13:01:50 2014 @@ -32,7 +32,7 @@ static void InitFunctionPtrs(void) { - HMODULE hSnmpapi = GetModuleHandle("snmpapi.dll"); + HMODULE hSnmpapi = GetModuleHandleA("snmpapi.dll"); #define SNMPAPI_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hSnmpapi, #func); \

1 0

[akhaldi] 63075: [SHDOCVW] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: akhaldi Date: Wed Apr 30 13:00:35 2014 New Revision: 63075 URL: http://svn.reactos.org/svn/reactos?rev=63075&view=rev Log: [SHDOCVW] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_v1.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_v1.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw_v1.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw_v1.idl [iso-8859-1] Wed Apr 30 13:00:35 2014 @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep regtypelib + #include "exdisp.idl" Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 30 13:00:35 2014 @@ -177,7 +177,7 @@ reactos/dll/win32/sensapi # Synced to Wine-1.7.1 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to Wine-1.7.1 -reactos/dll/win32/shdocvw # Synced to Wine-1.7.1 +reactos/dll/win32/shdocvw # Synced to Wine-1.7.17 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to Wine-1.7.1 reactos/dll/win32/shlwapi # Synced to Wine-1.7.17

1 0

[akhaldi] 63074: [RICHED32_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: akhaldi Date: Wed Apr 30 12:57:41 2014 New Revision: 63074 URL: http://svn.reactos.org/svn/reactos?rev=63074&view=rev Log: [RICHED32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/riched32/editor.c Modified: trunk/rostests/winetests/riched32/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched32/editor… ============================================================================== --- trunk/rostests/winetests/riched32/editor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched32/editor.c [iso-8859-1] Wed Apr 30 12:57:41 2014 @@ -35,9 +35,9 @@ static HMODULE hmoduleRichEdit; -static HWND new_window(LPCTSTR lpClassName, DWORD dwStyle, HWND parent) { +static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; - hwnd = CreateWindow(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL + hwnd = CreateWindowA(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL |WS_VISIBLE, 0, 0, 500, 60, parent, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); @@ -107,16 +107,16 @@ char buf[1024] = {0}; LRESULT result; - result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) testitems[i].itemtext); + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)testitems[i].itemtext); ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); - result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); - ok (result == lstrlen(buf), + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); + ok (result == lstrlenA(buf), "[%d] WM_GETTEXT returned %ld instead of expected %u\n", - i, result, lstrlen(buf)); + i, result, lstrlenA(buf)); result = strcmp(testitems[i].itemtext, buf); ok (result == 0, "[%d] WM_SETTEXT round trip: strcmp = %ld\n", i, result); - result = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + result = SendMessageA(hwndRichEdit, EM_GETLINECOUNT, 0, 0); ok (result == (rtl ? testitems[i].lines_rtl : testitems[i].lines) || broken(testitems[i].lines_broken && result == testitems[i].lines_broken), "[%d] EM_GETLINECOUNT returned %ld, expected %d\n", i, result, testitems[i].lines); @@ -133,17 +133,17 @@ int result; /* Test for WM_GETTEXTLENGTH */ - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text3); - result = SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == lstrlen(text3), + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == lstrlenA(text3), "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", - result, lstrlen(text3)); - - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text4); - result = SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == lstrlen(text4), + result, lstrlenA(text3)); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text4); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == lstrlenA(text4), "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", - result, lstrlen(text4)); + result, lstrlenA(text4)); DestroyWindow(hwndRichEdit); } @@ -199,10 +199,10 @@ es.dwCookie = (DWORD_PTR)&streamText0; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; - SendMessage(hwndRichEdit, EM_STREAMIN, + SendMessageA(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); - result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok (result == 12, "EM_STREAMIN: Test 0 returned %ld, expected 12\n", result); result = strcmp (buffer,"TestSomeText"); @@ -214,10 +214,10 @@ es.dwCookie = (DWORD_PTR)&streamText0a; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; - SendMessage(hwndRichEdit, EM_STREAMIN, + SendMessageA(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); - result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok (result == 12, "EM_STREAMIN: Test 0-a returned %ld, expected 12\n", result); result = strcmp (buffer,"TestSomeText"); @@ -229,10 +229,10 @@ es.dwCookie = (DWORD_PTR)&streamText0b; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; - SendMessage(hwndRichEdit, EM_STREAMIN, + SendMessageA(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); - result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok (result == 14, "EM_STREAMIN: Test 0-b returned %ld, expected 14\n", result); result = strcmp (buffer,"TestSomeText\r\n"); @@ -243,10 +243,10 @@ es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; - SendMessage(hwndRichEdit, EM_STREAMIN, + SendMessageA(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); - result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok (result == 12, "EM_STREAMIN: Test 1 returned %ld, expected 12\n", result); result = strcmp (buffer,"TestSomeText"); @@ -257,10 +257,10 @@ es.dwCookie = (DWORD_PTR)&streamText2; es.dwError = 0; - SendMessage(hwndRichEdit, EM_STREAMIN, + SendMessageA(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); - result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); todo_wine { ok (result == 9, "EM_STREAMIN: Test 2 returned %ld, expected 9\n", result); @@ -274,10 +274,10 @@ es.dwCookie = (DWORD_PTR)&streamText3; es.dwError = 0; - SendMessage(hwndRichEdit, EM_STREAMIN, + SendMessageA(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); - result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok (result == 0, "EM_STREAMIN: Test 3 returned %ld, expected 0\n", result); ok (strlen(buffer) == 0, @@ -313,26 +313,26 @@ const char * TestItem2 = "TestSomeText\r"; const char * TestItem3 = "TestSomeText\r\n"; - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem1); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem1); p = buf; es.dwCookie = (DWORD_PTR)&p; es.dwError = 0; es.pfnCallback = test_WM_SETTEXT_esCallback; memset(buf, 0, sizeof(buf)); - SendMessage(hwndRichEdit, EM_STREAMOUT, + SendMessageA(hwndRichEdit, EM_STREAMOUT, (WPARAM)(SF_TEXT), (LPARAM)&es); r = strlen(buf); ok(r == 12, "streamed text length is %d, expecting 12\n", r); ok(strcmp(buf, TestItem1) == 0, "streamed text different, got %s\n", buf); - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem2); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem2); p = buf; es.dwCookie = (DWORD_PTR)&p; es.dwError = 0; es.pfnCallback = test_WM_SETTEXT_esCallback; memset(buf, 0, sizeof(buf)); - SendMessage(hwndRichEdit, EM_STREAMOUT, + SendMessageA(hwndRichEdit, EM_STREAMOUT, (WPARAM)(SF_TEXT), (LPARAM)&es); r = strlen(buf); @@ -340,13 +340,13 @@ ok(strcmp(buf, TestItem2) == 0, "streamed text different, got %s\n", buf); - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem3); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem3); p = buf; es.dwCookie = (DWORD_PTR)&p; es.dwError = 0; es.pfnCallback = test_WM_SETTEXT_esCallback; memset(buf, 0, sizeof(buf)); - SendMessage(hwndRichEdit, EM_STREAMOUT, + SendMessageA(hwndRichEdit, EM_STREAMOUT, (WPARAM)(SF_TEXT), (LPARAM)&es); r = strlen(buf); ok(r == 14, "streamed text length is %d, expecting 14\n", r); @@ -388,8 +388,8 @@ BOOL broken_os = FALSE; BOOL rtl = is_rtl(); - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); - linecount = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text); + linecount = SendMessageA(hwndRichEdit, EM_GETLINECOUNT, 0, 0); if (linecount == 4) { broken_os = TRUE; @@ -420,7 +420,7 @@ /* EM_GETLINE appends a "\r\0" to the end of the line * nCopied counts up to and including the '\r' */ - nCopied = SendMessage(hwndRichEdit, EM_GETLINE, gl[i].line, (LPARAM) dest); + nCopied = SendMessageA(hwndRichEdit, EM_GETLINE, gl[i].line, (LPARAM)dest); ok(nCopied == expected_nCopied, "%d: %d!=%d\n", i, nCopied, expected_nCopied); /* two special cases since a parameter is passed via dest */ @@ -482,9 +482,9 @@ int i; LRESULT result; - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); - - result = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text); + + result = SendMessageA(hwndRichEdit, EM_GETLINECOUNT, 0, 0); if (result == 4) { win_skip("Win9x, WinME and NT4 don't handle '\\r only' correctly\n"); return; @@ -492,7 +492,7 @@ ok(result == 9, "Incorrect line count of %ld\n", result); for (i = 0; i < sizeof(offset_test)/sizeof(offset_test[0]); i++) { - result = SendMessage(hwndRichEdit, EM_LINELENGTH, offset_test[i][0], 0); + result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test[i][0], 0); ok(result == offset_test[i][1], "Length of line at offset %d is %ld, expected %d\n", offset_test[i][0], result, offset_test[i][1]); } @@ -512,28 +512,28 @@ LRESULT result; TEXTRANGEA textRange; - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); textRange.lpstrText = buffer; textRange.chrg.cpMin = 4; textRange.chrg.cpMax = 12; - result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); ok(result == 8, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect1, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); textRange.lpstrText = buffer; textRange.chrg.cpMin = 8; textRange.chrg.cpMax = 12; - result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); ok(result == 4, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); textRange.lpstrText = buffer; textRange.chrg.cpMin = 4; textRange.chrg.cpMax = 11; - result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect3, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); @@ -552,17 +552,17 @@ char buffer[1024] = {0}; LRESULT result; - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); - - SendMessage(hwndRichEdit, EM_SETSEL, 4, 12); - result = SendMessage(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + + SendMessageA(hwndRichEdit, EM_SETSEL, 4, 12); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); ok(result == 8, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect1, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); - - SendMessage(hwndRichEdit, EM_SETSEL, 4, 11); - result = SendMessage(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); + + SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); @@ -670,12 +670,12 @@ static void check_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *f, int id) { int findloc; - FINDTEXT ft; + FINDTEXTA ft; memset(&ft, 0, sizeof(ft)); ft.chrg.cpMin = f->start; ft.chrg.cpMax = f->end; ft.lpstrText = f->needle; - findloc = SendMessage(hwnd, EM_FINDTEXT, f->flags, (LPARAM) &ft); + findloc = SendMessageA(hwnd, EM_FINDTEXT, f->flags, (LPARAM)&ft); ok(findloc == f->expected_loc, "EM_FINDTEXT(%s,%d) '%s' in range(%d,%d), flags %08x, got start at %d, expected %d\n", name, id, f->needle, f->start, f->end, f->flags, findloc, f->expected_loc); @@ -684,7 +684,7 @@ static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f, int id) { int findloc; - FINDTEXTEX ft; + FINDTEXTEXA ft; int expected_end_loc; memset(&ft, 0, sizeof(ft)); @@ -692,7 +692,7 @@ ft.chrg.cpMax = f->end; ft.lpstrText = f->needle; ft.chrgText.cpMax = 0xdeadbeef; - findloc = SendMessage(hwnd, EM_FINDTEXTEX, f->flags, (LPARAM) &ft); + findloc = SendMessageA(hwnd, EM_FINDTEXTEX, f->flags, (LPARAM)&ft); ok(findloc == f->expected_loc, "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", name, id, f->needle, f->start, f->end, f->flags, findloc); @@ -726,13 +726,13 @@ run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests, sizeof(find_tests)/sizeof(struct find_s)); - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) haystack); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)haystack); /* Haystack text */ run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, sizeof(find_tests2)/sizeof(struct find_s)); - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) haystack2); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)haystack2); /* Haystack text 2 (with EOL characters) */ run_tests_EM_FINDTEXT(hwndRichEdit, "3", find_tests3, @@ -764,8 +764,8 @@ for (i = 0; i < 50; i++) { /* Do not modify the string; it is exactly 16 characters long. */ - SendMessage(hwndRichEdit, EM_SETSEL, 0, 0); - SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"0123456789ABCD\r\n"); + SendMessageA(hwndRichEdit, EM_SETSEL, 0, 0); + SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"0123456789ABCD\r\n"); } /* @@ -783,7 +783,7 @@ for (i = 0; i < 50; i++) { /* All the lines are 16 characters long */ - result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, i * 16); + result = SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, i * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); if (i == 0) { @@ -808,13 +808,13 @@ } /* Testing position at end of text */ - result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 50 * 16); + result = SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 50 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 50 * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, 50 * height); ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); /* Testing position way past end of text */ - result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 55 * 16); + result = SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 55 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 50 * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, 50 * height); @@ -822,11 +822,11 @@ /* Testing that vertical scrolling does, in fact, have an effect on EM_POSFROMCHAR */ - SendMessage(hwndRichEdit, EM_SCROLL, SB_LINEDOWN, 0); /* line down */ + SendMessageA(hwndRichEdit, EM_SCROLL, SB_LINEDOWN, 0); /* line down */ for (i = 0; i < 50; i++) { /* All the lines are 16 characters long */ - result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, i * 16); + result = SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, i * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == (i - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", @@ -835,22 +835,22 @@ } /* Testing position at end of text */ - result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 50 * 16); + result = SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 50 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == (50 - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, (50 - 1) * height); ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); /* Testing position way past end of text */ - result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 55 * 16); + result = SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 55 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == (50 - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, (50 - 1) * height); ok(pl.x == xpos_rtl_adjusted, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos_rtl_adjusted); /* Testing that horizontal scrolling does, in fact, have an effect on EM_POSFROMCHAR */ - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); - SendMessage(hwndRichEdit, EM_SCROLL, SB_LINEUP, 0); /* line up */ - - result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 0); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text); + SendMessageA(hwndRichEdit, EM_SCROLL, SB_LINEUP, 0); /* line up */ + + result = SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 0); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y); ok(pl.x == 1 || @@ -858,8 +858,8 @@ "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); xpos = pl.x; - SendMessage(hwndRichEdit, WM_HSCROLL, SB_LINERIGHT, 0); - result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 0); + SendMessageA(hwndRichEdit, WM_HSCROLL, SB_LINERIGHT, 0); + result = SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 0); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y); todo_wine { @@ -881,140 +881,140 @@ /* Test the effect of WS_HSCROLL and ES_AUTOHSCROLL styles on wrapping * when specified on window creation and set later. */ - hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle, + hwnd = CreateWindowA(RICHEDIT_CLASS10A, NULL, dwCommonStyle, 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); - res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); + res = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)text); ok(res, "WM_SETTEXT failed.\n"); - pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + pos = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); - lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + lines = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); - SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle|WS_HSCROLL|ES_AUTOHSCROLL); - pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + SetWindowLongA(hwnd, GWL_STYLE, dwCommonStyle|WS_HSCROLL|ES_AUTOHSCROLL); + pos = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); DestroyWindow(hwnd); - hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle|WS_HSCROLL, + hwnd = CreateWindowA(RICHEDIT_CLASS10A, NULL, dwCommonStyle|WS_HSCROLL, 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); - res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); + res = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)text); ok(res, "WM_SETTEXT failed.\n"); - pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + pos = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); - lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + lines = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); - SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle|WS_HSCROLL|ES_AUTOHSCROLL); - pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + SetWindowLongA(hwnd, GWL_STYLE, dwCommonStyle|WS_HSCROLL|ES_AUTOHSCROLL); + pos = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); DestroyWindow(hwnd); - hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle|ES_AUTOHSCROLL, + hwnd = CreateWindowA(RICHEDIT_CLASS10A, NULL, dwCommonStyle|ES_AUTOHSCROLL, 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); - res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); + res = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)text); ok(res, "WM_SETTEXT failed.\n"); - pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + pos = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); ok(!pos || - broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + broken(pos == lstrlenA(text)), /* Win9x, WinME and NT4 */ "pos=%d indicating word wrap when none is expected.\n", pos); - lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + lines = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); - SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle); - pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + SetWindowLongA(hwnd, GWL_STYLE, dwCommonStyle); + pos = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); ok(!pos || - broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + broken(pos == lstrlenA(text)), /* Win9x, WinME and NT4 */ "pos=%d indicating word wrap when none is expected.\n", pos); - lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + lines = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); DestroyWindow(hwnd); - hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, + hwnd = CreateWindowA(RICHEDIT_CLASS10A, NULL, dwCommonStyle|WS_HSCROLL|ES_AUTOHSCROLL, 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); - res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); + res = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)text); ok(res, "WM_SETTEXT failed.\n"); - pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + pos = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); ok(!pos || - broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + broken(pos == lstrlenA(text)), /* Win9x, WinME and NT4 */ "pos=%d indicating word wrap when none is expected.\n", pos); - lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + lines = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); - SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle); - pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + SetWindowLongA(hwnd, GWL_STYLE, dwCommonStyle); + pos = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); ok(!pos || - broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + broken(pos == lstrlenA(text)), /* Win9x, WinME and NT4 */ "pos=%d indicating word wrap when none is expected.\n", pos); - lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + lines = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); /* Test the effect of EM_SETTARGETDEVICE on word wrap. */ - res = SendMessage(hwnd, EM_SETTARGETDEVICE, 0, 1); + res = SendMessageA(hwnd, EM_SETTARGETDEVICE, 0, 1); ok(res, "EM_SETTARGETDEVICE failed (returned %d).\n", res); - pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + pos = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); ok(!pos || - broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + broken(pos == lstrlenA(text)), /* Win9x, WinME and NT4 */ "pos=%d indicating word wrap when none is expected.\n", pos); - lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + lines = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); - res = SendMessage(hwnd, EM_SETTARGETDEVICE, 0, 0); + res = SendMessageA(hwnd, EM_SETTARGETDEVICE, 0, 0); ok(res, "EM_SETTARGETDEVICE failed (returned %d).\n", res); - pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + pos = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); DestroyWindow(hwnd); /* First lets see if the text would wrap normally (needed for reference) */ - hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle, + hwnd = CreateWindowA(RICHEDIT_CLASS10A, NULL, dwCommonStyle, 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); - res = SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) text); + res = SendMessageA(hwnd, EM_REPLACESEL, FALSE, (LPARAM)text); ok(res, "EM_REPLACESEL failed.\n"); /* Should have wrapped */ - reflines[0] = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + reflines[0] = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); ok(reflines[0] > 1, "Line was expected to wrap (%d lines).\n", reflines[0]); /* Resize the window to fit the line */ MoveWindow(hwnd, 0, 0, 600, 80, TRUE); /* Text should not be wrapped */ - reflines[1] = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + reflines[1] = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); ok(reflines[1] == 1, "Line wasn't expected to wrap (%d lines).\n", reflines[1]); /* Resize the window again to make sure the line wraps again */ MoveWindow(hwnd, 0, 0, 10, 80, TRUE); - reflines[2] = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + reflines[2] = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); ok(reflines[2] > 1, "Line was expected to wrap (%d lines).\n", reflines[2]); DestroyWindow(hwnd); /* Same test with redraw disabled */ - hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle, + hwnd = CreateWindowA(RICHEDIT_CLASS10A, NULL, dwCommonStyle, 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); /* Redraw is disabled by making the window invisible. */ - SendMessage(hwnd, WM_SETREDRAW, FALSE, 0); + SendMessageA(hwnd, WM_SETREDRAW, FALSE, 0); ok(!IsWindowVisible(hwnd), "Window shouldn't be visible.\n"); - res = SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) text); + res = SendMessageA(hwnd, EM_REPLACESEL, FALSE, (LPARAM)text); ok(res, "EM_REPLACESEL failed.\n"); /* Should have wrapped */ - prevlines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + prevlines = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); ok(prevlines == reflines[0], "Line was expected to wrap (%d lines).\n", prevlines); /* Resize the window to fit the line, no change to the number of lines */ MoveWindow(hwnd, 0, 0, 600, 80, TRUE); - lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + lines = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); todo_wine ok(lines == prevlines || broken(lines == reflines[1]), /* Win98, WinME and NT4 */ "Expected no change in the number of lines\n"); /* Resize the window again to make sure the line wraps again */ MoveWindow(hwnd, 0, 0, 10, 80, TRUE); - lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + lines = SendMessageA(hwnd, EM_GETLINECOUNT, 0, 0); todo_wine ok(lines == prevlines || broken(lines == reflines[2]), /* Win98, WinME and NT4 */ @@ -1027,17 +1027,17 @@ HWND hwnd; DWORD options; - hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, + hwnd = CreateWindowA(RICHEDIT_CLASS10A, NULL, WS_POPUP, 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); - options = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); + options = SendMessageA(hwnd, EM_GETOPTIONS, 0, 0); ok(options == 0, "Incorrect options %x\n", options); DestroyWindow(hwnd); - hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, + hwnd = CreateWindowA(RICHEDIT_CLASS10A, NULL, WS_POPUP|WS_VSCROLL|WS_HSCROLL, 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); - options = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); + options = SendMessageA(hwnd, EM_GETOPTIONS, 0, 0); ok(options == ECO_AUTOVSCROLL || broken(options == 0), /* Win9x, WinME and NT4 */ "Incorrect initial options %x\n", options); @@ -1051,16 +1051,16 @@ /* The WS_VSCROLL and WS_HSCROLL styles implicitly set * auto vertical/horizontal scrolling options. */ - hwnd = CreateWindowEx(0, RICHEDIT_CLASS10A, NULL, + hwnd = CreateWindowExA(0, RICHEDIT_CLASS10A, NULL, WS_POPUP|ES_MULTILINE|WS_VSCROLL|WS_HSCROLL, 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS10A, (int) GetLastError()); - ret = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); + ret = SendMessageA(hwnd, EM_GETOPTIONS, 0, 0); ok(ret & ECO_AUTOVSCROLL || broken(!(ret & ECO_AUTOVSCROLL)), /* Win9x, WinME and NT4 */ "ECO_AUTOVSCROLL isn't set.\n"); ok(!(ret & ECO_AUTOHSCROLL), "ECO_AUTOHSCROLL is set.\n"); - ret = GetWindowLong(hwnd, GWL_STYLE); + ret = GetWindowLongA(hwnd, GWL_STYLE); todo_wine ok(ret & ES_AUTOVSCROLL || broken(!(ret & ES_AUTOVSCROLL)), /* Win9x, WinMe and NT4 */ @@ -1068,14 +1068,14 @@ ok(!(ret & ES_AUTOHSCROLL), "ES_AUTOHSCROLL is set.\n"); DestroyWindow(hwnd); - hwnd = CreateWindowEx(0, RICHEDIT_CLASS10A, NULL, + hwnd = CreateWindowExA(0, RICHEDIT_CLASS10A, NULL, WS_POPUP|ES_MULTILINE, 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS10A, (int) GetLastError()); - ret = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); + ret = SendMessageA(hwnd, EM_GETOPTIONS, 0, 0); ok(!(ret & ECO_AUTOVSCROLL), "ECO_AUTOVSCROLL is set.\n"); ok(!(ret & ECO_AUTOHSCROLL), "ECO_AUTOHSCROLL is set.\n"); - ret = GetWindowLong(hwnd, GWL_STYLE); + ret = GetWindowLongA(hwnd, GWL_STYLE); ok(!(ret & ES_AUTOVSCROLL), "ES_AUTOVSCROLL is set.\n"); ok(!(ret & ES_AUTOHSCROLL), "ES_AUTOHSCROLL is set.\n"); DestroyWindow(hwnd); @@ -1128,16 +1128,16 @@ const char *expected; /* Set the text to the initial text */ - result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) testenteritems[i].initialtext); + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)testenteritems[i].initialtext); ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); /* Send Enter */ - SendMessage(hwndRichEdit, EM_SETSEL, testenteritems[i].cursor, testenteritems[i].cursor); + SendMessageA(hwndRichEdit, EM_SETSEL, testenteritems[i].cursor, testenteritems[i].cursor); simulate_typing_characters(hwndRichEdit, "\r"); /* 1. Retrieve with WM_GETTEXT */ buf[0] = 0x00; - result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); expected = testenteritems[i].expectedtext; resultbuf[0]=0x00; @@ -1159,7 +1159,7 @@ getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; buf[0] = 0x00; - result = SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedtext; resultbuf[0]=0x00; @@ -1181,7 +1181,7 @@ getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; buf[0] = 0x00; - result = SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedtext; resultbuf[0]=0x00; @@ -1208,7 +1208,7 @@ /* Must explicitly LoadLibrary(). The test has no references to functions in * RICHED32.DLL, so the linker doesn't actually link to it. */ - hmoduleRichEdit = LoadLibrary("RICHED32.DLL"); + hmoduleRichEdit = LoadLibraryA("riched32.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); test_WM_SETTEXT(); @@ -1234,9 +1234,9 @@ end = time(NULL) + 30; if (getenv( "WINETEST_RICHED32" )) { while (time(NULL) < end) { - if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { + if (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } else { Sleep(50); }

1 0

[akhaldi] 63073: [RASAPI32_WINETEST] * Improve header inclusions. * Speedup build. * Remove redundant definitions.
by akhaldi＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: akhaldi Date: Wed Apr 30 12:56:17 2014 New Revision: 63073 URL: http://svn.reactos.org/svn/reactos?rev=63073&view=rev Log: [RASAPI32_WINETEST] * Improve header inclusions. * Speedup build. * Remove redundant definitions. Modified: trunk/rostests/winetests/rasapi32/CMakeLists.txt trunk/rostests/winetests/rasapi32/testlist.c Modified: trunk/rostests/winetests/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rasapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/rasapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rasapi32/CMakeLists.txt [iso-8859-1] Wed Apr 30 12:56:17 2014 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(rasapi32_winetest rasapi.c testlist.c) -target_link_libraries(rasapi32_winetest wine) set_module_type(rasapi32_winetest win32cui) -add_importlibs(rasapi32_winetest msvcrt kernel32 ntdll) +add_importlibs(rasapi32_winetest msvcrt kernel32) add_cd_file(TARGET rasapi32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/rasapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rasapi32/testli… ============================================================================== --- trunk/rostests/winetests/rasapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rasapi32/testlist.c [iso-8859-1] Wed Apr 30 12:56:17 2014 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_rasapi(void);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs