Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[pschweitzer] 63085: [RAPPS] Close downloaded application before attempting to execute it. CORE-8134 #resolve
by pschweitzer＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: pschweitzer Date: Wed Apr 30 22:03:49 2014 New Revision: 63085 URL: http://svn.reactos.org/svn/reactos?rev=63085&view=rev Log: [RAPPS] Close downloaded application before attempting to execute it. CORE-8134 #resolve Modified: trunk/reactos/base/applications/rapps/loaddlg.c Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Wed Apr 30 22:03:49 2014 @@ -217,7 +217,7 @@ BOOL bCab = FALSE; HINTERNET hOpen = NULL; HINTERNET hFile = NULL; - HANDLE hOut = NULL; + HANDLE hOut = INVALID_HANDLE_VALUE; unsigned char lpBuffer[4096]; const LPWSTR lpszAgent = L"RApps/1.0"; @@ -284,6 +284,9 @@ } while (dwBytesRead); + CloseHandle(hOut); + hOut = INVALID_HANDLE_VALUE; + if (bCancelled) goto end; ShowWindow(Dlg, SW_HIDE); @@ -294,7 +297,7 @@ ShellExecuteW( NULL, L"open", path, NULL, NULL, SW_SHOWNORMAL ); } end: - CloseHandle(hOut); + if (hOut != INVALID_HANDLE_VALUE) CloseHandle(hOut); InternetCloseHandle(hFile); InternetCloseHandle(hOpen);

1 0

[akhaldi] 63084: [BASE][BOOT][WIN32SS] * Fix some format string / argument mismatches. By Andre Guibert de Bruet. CORE-7995 #resolve #comment Thanks!
by akhaldi＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: akhaldi Date: Wed Apr 30 19:05:42 2014 New Revision: 63084 URL: http://svn.reactos.org/svn/reactos?rev=63084&view=rev Log: [BASE][BOOT][WIN32SS] * Fix some format string / argument mismatches. By Andre Guibert de Bruet. CORE-7995 #resolve #comment Thanks! Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/shell/explorer/services/startup.c trunk/reactos/base/system/msiexec/service.c trunk/reactos/base/system/services/database.c trunk/reactos/boot/armllb/os/loader.c trunk/reactos/win32ss/user/winsrv/consrv/settings.c trunk/reactos/win32ss/user/winsrv/consrv_new/settings.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Wed Apr 30 19:05:42 2014 @@ -1620,7 +1620,7 @@ dwInstanceNumber = 0; do { - swprintf(szGeneratedInstance, L"Root\\%ls\\%04d", + swprintf(szGeneratedInstance, L"Root\\%ls\\%04lu", pszDeviceID, dwInstanceNumber); /* Try to create a device instance with this ID */ @@ -2115,7 +2115,7 @@ else { swprintf(szKeyName, - L"System\\CurrentControlSet\\HardwareProfiles\\%04u\\System\\CurrentControlSet\\Enum", + L"System\\CurrentControlSet\\HardwareProfiles\\%04lu\\System\\CurrentControlSet\\Enum", ulConfig); } Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Wed Apr 30 19:05:42 2014 @@ -461,7 +461,7 @@ } else { - swprintf(szLangID, L"d%03u%s", uCount, MuiLayouts[uIndex].LangID); + swprintf(szLangID, L"d%03lu%s", uCount, MuiLayouts[uIndex].LangID); Status = NtSetValueKey(KeyHandle, &ValueName, 0, Modified: trunk/reactos/base/shell/explorer/services/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/servic… ============================================================================== --- trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] Wed Apr 30 19:05:42 2014 @@ -93,7 +93,7 @@ } else { - printf("Couldn't open key, error %ld\n", res); + printf("Couldn't open key, error %lu\n", res); res=FALSE; } @@ -113,7 +113,7 @@ if (res!=ERROR_SUCCESS) { - printf("Couldn't query value's length (%ld)\n", res); + printf("Couldn't query value's length (%lu)\n", res); res=FALSE; goto end; } @@ -369,7 +369,7 @@ if ((res=RegEnumValueW(hkRun, i, szValue, &nValLength, 0, &type, (LPBYTE)szCmdLine, &nDataLength))!=ERROR_SUCCESS) { - printf("Couldn't read in value %ld - %ld\n", i, res); + printf("Couldn't read in value %lu - %ld\n", i, res); continue; } @@ -379,22 +379,22 @@ if (bDelete && (res=RegDeleteValueW(hkRun, szValue))!=ERROR_SUCCESS) { - printf("Couldn't delete value - %ld, %ld. Running command anyways.\n", i, res); + printf("Couldn't delete value - %lu, %ld. Running command anyways.\n", i, res); } if (type!=REG_SZ) { - printf("Incorrect type of value #%ld (%ld)\n", i, type); + printf("Incorrect type of value #%lu (%lu)\n", i, type); continue; } if ((res=runCmd(szCmdLine, NULL, bSynchronous, FALSE))==INVALID_RUNCMD_RETURN) { - printf("Error running cmd #%ld (%ld)\n", i, GetLastError()); - } - - printf("Done processing cmd #%ld\n", i); + printf("Error running cmd #%lu (%ld)\n", i, GetLastError()); + } + + printf("Done processing cmd #%lu\n", i); } free(szValue); Modified: trunk/reactos/base/system/msiexec/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/servic… ============================================================================== --- trunk/reactos/base/system/msiexec/service.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/service.c [iso-8859-1] Wed Apr 30 19:05:42 2014 @@ -73,7 +73,7 @@ static void WINAPI ServiceCtrlHandler(DWORD code) { - WINE_TRACE("%d\n", code); + WINE_TRACE("%u\n", code); switch (code) { @@ -83,7 +83,7 @@ KillService(); return; default: - fprintf(stderr, "Unhandled service control code: %d\n", code); + fprintf(stderr, "Unhandled service control code: %u\n", code); break; } Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Wed Apr 30 19:05:42 2014 @@ -99,7 +99,7 @@ } /* Create '\\.\pipe\net\NtControlPipeXXX' instance */ - swprintf(szControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%u", ServiceCurrent); + swprintf(szControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%lu", ServiceCurrent); DPRINT("PipeName: %S\n", szControlPipeName); Modified: trunk/reactos/boot/armllb/os/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/os/loader.c?re… ============================================================================== --- trunk/reactos/boot/armllb/os/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/os/loader.c [iso-8859-1] Wed Apr 30 19:05:42 2014 @@ -115,7 +115,7 @@ /* Set parameters for the OS loader */ snprintf(CommandLine, sizeof(CommandLine), - "rdbase=0x%x rdsize=0x%x rdoffset=%s", + "rdbase=0x%lx rdsize=0x%lx rdoffset=%s", RootFs, Size, Offset); LlbSetCommandLine(CommandLine); Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] Wed Apr 30 19:05:42 2014 @@ -351,7 +351,7 @@ * or we are saving settings for a particular console, which differs * from the default ones. */ - swprintf(szValueName, L"ColorTable%02d", i); + swprintf(szValueName, L"ColorTable%02u", i); SetConsoleSetting(szValueName, REG_DWORD, sizeof(DWORD), &ConsoleInfo->Colors[i], s_Colors[i]); } Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv_new/settings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv_new/settings.c [iso-8859-1] Wed Apr 30 19:05:42 2014 @@ -355,7 +355,7 @@ * or we are saving settings for a particular console, which differs * from the default ones. */ - swprintf(szValueName, L"ColorTable%02d", i); + swprintf(szValueName, L"ColorTable%02u", i); SetConsoleSetting(szValueName, REG_DWORD, sizeof(DWORD), &ConsoleInfo->Colors[i], s_Colors[i]); }

1 0

[tfaber] 63083: [CRT] - Fix potential null dereference in TRACE in _wfreopen. Patch by Víctor Martínez CORE-8120 #resolve
by tfaber＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: tfaber Date: Wed Apr 30 19:05:38 2014 New Revision: 63083 URL: http://svn.reactos.org/svn/reactos?rev=63083&view=rev Log: [CRT] - Fix potential null dereference in TRACE in _wfreopen. Patch by Víctor Martínez CORE-8120 #resolve Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Wed Apr 30 19:05:38 2014 @@ -2813,7 +2813,7 @@ { int open_flags, stream_flags, fd; - TRACE(":path (%p) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file->_file); + TRACE(":path (%p) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file ? file->_file : -1); LOCK_FILES(); if (!file || ((fd = file->_file) < 0) || fd > fdend)

1 0

[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

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 April 2014