Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

01/01: [COMPSTUI] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9706012cb82359bd3bd46… commit 9706012cb82359bd3bd467553567b059a32d6a1e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 9 12:56:22 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 9 12:56:22 2018 +0100 [COMPSTUI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/compstui/compstui_main.c | 15 ++++++--------- media/doc/README.WINE | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dll/win32/compstui/compstui_main.c b/dll/win32/compstui/compstui_main.c index a243305927..0225036108 100644 --- a/dll/win32/compstui/compstui_main.c +++ b/dll/win32/compstui/compstui_main.c @@ -18,20 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <ddk/compstui.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ddk/compstui.h" -//#include "wine/unicode.h" -#include <wine/debug.h> +#include "wine/unicode.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(compstui); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 92cdfd8fd4..193e1ad1fd 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -56,7 +56,7 @@ reactos/dll/win32/clusapi # Synced to WineStaging-3.3 reactos/dll/win32/comcat # Synced to WineStaging-3.3 reactos/dll/win32/comctl32 # Synced to Wine-3.0 reactos/dll/win32/comdlg32 # Synced to WineStaging-3.3 -reactos/dll/win32/compstui # Synced to WineStaging-2.9 +reactos/dll/win32/compstui # Synced to WineStaging-3.3 reactos/dll/win32/credui # Synced to WineStaging-2.9 reactos/dll/win32/crypt32 # Synced to WineStaging-2.16 reactos/dll/win32/cryptdlg # Synced to WineStaging-2.9

6 years, 8 months

01/01: [COMDLG32_WINETEST] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da5f10af774620e64b4c3… commit da5f10af774620e64b4c3dc583f7068714b69b2a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 9 12:55:20 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 9 12:55:20 2018 +0100 [COMDLG32_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/comdlg32/filedlg.c | 15 +++++++++++---- modules/rostests/winetests/comdlg32/finddlg.c | 5 ++++- modules/rostests/winetests/comdlg32/fontdlg.c | 14 ++++++++++++-- modules/rostests/winetests/comdlg32/itemdlg.c | 7 ++++--- modules/rostests/winetests/comdlg32/precomp.h | 4 ++-- modules/rostests/winetests/comdlg32/printdlg.c | 20 +++++++++++++++++++- modules/rostests/winetests/comdlg32/rsrc.rc | 4 ++-- 7 files changed, 54 insertions(+), 15 deletions(-) diff --git a/modules/rostests/winetests/comdlg32/filedlg.c b/modules/rostests/winetests/comdlg32/filedlg.c index 514f2513a2..4d940555a0 100644 --- a/modules/rostests/winetests/comdlg32/filedlg.c +++ b/modules/rostests/winetests/comdlg32/filedlg.c @@ -19,12 +19,19 @@ * */ -#include "precomp.h" +#include <windows.h> +#include <wine/test.h> -#include <shlguid.h> -#include <shobjidl.h> -#include <ole2.h> +#include "shlguid.h" +#define COBJMACROS +#include "shobjidl.h" +#include "commdlg.h" +#include "cderr.h" +#include "dlgs.h" + +#ifdef __REACTOS__ #include <reactos/undocuser.h> +#endif /* ##### */ diff --git a/modules/rostests/winetests/comdlg32/finddlg.c b/modules/rostests/winetests/comdlg32/finddlg.c index 99c9eb1e22..be983081c5 100644 --- a/modules/rostests/winetests/comdlg32/finddlg.c +++ b/modules/rostests/winetests/comdlg32/finddlg.c @@ -19,7 +19,10 @@ * */ -#include "precomp.h" +#include "windows.h" +#include "commdlg.h" +#include "cderr.h" +#include "wine/test.h" static UINT ID_FINDMSGSTRING; diff --git a/modules/rostests/winetests/comdlg32/fontdlg.c b/modules/rostests/winetests/comdlg32/fontdlg.c index 4a17bbcb1d..090053522d 100644 --- a/modules/rostests/winetests/comdlg32/fontdlg.c +++ b/modules/rostests/winetests/comdlg32/fontdlg.c @@ -19,9 +19,19 @@ * */ -#include "precomp.h" +#include <stdarg.h> -#include <winspool.h> +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winspool.h" +#include "winuser.h" +#include "objbase.h" + +#include "commdlg.h" + +#include "wine/test.h" static int get_dpiy(void) { diff --git a/modules/rostests/winetests/comdlg32/itemdlg.c b/modules/rostests/winetests/comdlg32/itemdlg.c index f14a298de8..d28e682b49 100644 --- a/modules/rostests/winetests/comdlg32/itemdlg.c +++ b/modules/rostests/winetests/comdlg32/itemdlg.c @@ -19,10 +19,11 @@ * */ -#include "precomp.h" +#define COBJMACROS +#define CONST_VTABLE -#include <wincon.h> -#include <shlobj.h> +#include "shlobj.h" +#include "wine/test.h" #define IDT_CHANGEFILETYPE 500 #define IDT_CLOSEDIALOG 501 diff --git a/modules/rostests/winetests/comdlg32/precomp.h b/modules/rostests/winetests/comdlg32/precomp.h index 86ad3d3cf6..5a2beaafa6 100644 --- a/modules/rostests/winetests/comdlg32/precomp.h +++ b/modules/rostests/winetests/comdlg32/precomp.h @@ -1,12 +1,12 @@ + #ifndef _COMDLG32_WINETEST_PRECOMP_H_ #define _COMDLG32_WINETEST_PRECOMP_H_ #define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H #define COBJMACROS #define CONST_VTABLE +#include <windows.h> #include <wine/test.h> #include <wingdi.h> diff --git a/modules/rostests/winetests/comdlg32/printdlg.c b/modules/rostests/winetests/comdlg32/printdlg.c index b2c20744ee..4c6a47355c 100644 --- a/modules/rostests/winetests/comdlg32/printdlg.c +++ b/modules/rostests/winetests/comdlg32/printdlg.c @@ -20,7 +20,25 @@ * */ -#include "precomp.h" +#define COBJMACROS +#define CONST_VTABLE + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winuser.h" +#include "objbase.h" + +#include "cderr.h" +#include "commdlg.h" +#include "dlgs.h" +#include "winspool.h" + +#include "wine/test.h" /* ########################### */ diff --git a/modules/rostests/winetests/comdlg32/rsrc.rc b/modules/rostests/winetests/comdlg32/rsrc.rc index e1bca96aa9..68ab468ff8 100644 --- a/modules/rostests/winetests/comdlg32/rsrc.rc +++ b/modules/rostests/winetests/comdlg32/rsrc.rc @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> +#include "windef.h" +#include "winuser.h" TEMPLATE1 DIALOG 5, 43, 227, 215 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS

6 years, 8 months

01/01: [COMDLG32] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45ed51c1ba0bc22905040… commit 45ed51c1ba0bc2290504008fde3c2ebcbe092792 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 9 12:54:34 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 9 12:54:34 2018 +0100 [COMDLG32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/comdlg32/CMakeLists.txt | 4 +- dll/win32/comdlg32/cdlg.h | 186 ++++++++++++++++++++++++++++-------- dll/win32/comdlg32/cdlg32.c | 17 ++++ dll/win32/comdlg32/colordlg.c | 12 +++ dll/win32/comdlg32/filedlg.c | 70 ++++++++++---- dll/win32/comdlg32/filedlg31.c | 19 ++++ dll/win32/comdlg32/filedlgbrowser.c | 22 +++++ dll/win32/comdlg32/filedlgbrowser.h | 11 +++ dll/win32/comdlg32/finddlg.c | 15 +++ dll/win32/comdlg32/fontdlg.c | 77 +++++++-------- dll/win32/comdlg32/itemdlg.c | 22 +---- dll/win32/comdlg32/precomp.h | 41 ++++++++ dll/win32/comdlg32/printdlg.c | 26 ++++- dll/win32/comdlg32/resource.h | 138 -------------------------- dll/win32/comdlg32/rsrc.rc | 3 +- media/doc/README.WINE | 2 +- 16 files changed, 404 insertions(+), 261 deletions(-) diff --git a/dll/win32/comdlg32/CMakeLists.txt b/dll/win32/comdlg32/CMakeLists.txt index 63c7252f88..37e1d7c102 100644 --- a/dll/win32/comdlg32/CMakeLists.txt +++ b/dll/win32/comdlg32/CMakeLists.txt @@ -16,7 +16,7 @@ list(APPEND SOURCE fontdlg.c #itemdlg.c /* Win 7 */ printdlg.c - cdlg.h + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/comdlg32_stubs.c) add_library(comdlg32 SHARED @@ -28,5 +28,5 @@ set_module_type(comdlg32 win32dll) target_link_libraries(comdlg32 uuid wine) add_delay_importlibs(comdlg32 ole32) add_importlibs(comdlg32 shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_pch(comdlg32 cdlg.h SOURCE) +add_pch(comdlg32 precomp.h SOURCE) add_cd_file(TARGET comdlg32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/comdlg32/cdlg.h b/dll/win32/comdlg32/cdlg.h index 4ad1fafa59..849b9863e0 100644 --- a/dll/win32/comdlg32/cdlg.h +++ b/dll/win32/comdlg32/cdlg.h @@ -21,45 +21,7 @@ #ifndef _WINE_DLL_CDLG_H #define _WINE_DLL_CDLG_H -#include <wine/config.h> - -#include <stdio.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <wincon.h> -#include <winternl.h> -#include <objbase.h> -#include <commdlg.h> -#include <shlobj.h> -#include <dlgs.h> -#include <cderr.h> - -/* RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista */ -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 -#include <winreg.h> - -#define NO_SHLWAPI_STREAM -#include <shlwapi.h> - -#include <wine/unicode.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); - -#include "filedlgbrowser.h" -#include "resource.h" +#include "dlgs.h" /* Common dialogs implementation globals */ #define COMDLG32_Atom MAKEINTATOM(0xa000) /* MS uses this one to identify props */ @@ -82,6 +44,152 @@ typedef struct { } user_fr; } COMDLG32_FR_Data; +#define PD32_PRINT_TITLE 7000 + +#define PD32_VALUE_UREADABLE 1104 +#define PD32_INVALID_PAGE_RANGE 1105 +#define PD32_FROM_NOT_ABOVE_TO 1106 +#define PD32_MARGINS_OVERLAP 1107 +#define PD32_NR_OF_COPIES_EMPTY 1108 +#define PD32_TOO_LARGE_COPIES 1109 +#define PD32_PRINT_ERROR 1110 +#define PD32_NO_DEFAULT_PRINTER 1111 +#define PD32_CANT_FIND_PRINTER 1112 +#define PD32_OUT_OF_MEMORY 1113 +#define PD32_GENERIC_ERROR 1114 +#define PD32_DRIVER_UNKNOWN 1115 +#define PD32_NO_DEVICES 1121 + +#define PD32_PRINTER_STATUS_READY 1536 +#define PD32_PRINTER_STATUS_PAUSED 1537 +#define PD32_PRINTER_STATUS_ERROR 1538 +#define PD32_PRINTER_STATUS_PENDING_DELETION 1539 +#define PD32_PRINTER_STATUS_PAPER_JAM 1540 +#define PD32_PRINTER_STATUS_PAPER_OUT 1541 +#define PD32_PRINTER_STATUS_MANUAL_FEED 1542 +#define PD32_PRINTER_STATUS_PAPER_PROBLEM 1543 +#define PD32_PRINTER_STATUS_OFFLINE 1544 +#define PD32_PRINTER_STATUS_IO_ACTIVE 1545 +#define PD32_PRINTER_STATUS_BUSY 1546 +#define PD32_PRINTER_STATUS_PRINTING 1547 +#define PD32_PRINTER_STATUS_OUTPUT_BIN_FULL 1548 +#define PD32_PRINTER_STATUS_NOT_AVAILABLE 1549 +#define PD32_PRINTER_STATUS_WAITING 1550 +#define PD32_PRINTER_STATUS_PROCESSING 1551 +#define PD32_PRINTER_STATUS_INITIALIZING 1552 +#define PD32_PRINTER_STATUS_WARMING_UP 1553 +#define PD32_PRINTER_STATUS_TONER_LOW 1554 +#define PD32_PRINTER_STATUS_NO_TONER 1555 +#define PD32_PRINTER_STATUS_PAGE_PUNT 1556 +#define PD32_PRINTER_STATUS_USER_INTERVENTION 1557 +#define PD32_PRINTER_STATUS_OUT_OF_MEMORY 1558 +#define PD32_PRINTER_STATUS_DOOR_OPEN 1559 +#define PD32_PRINTER_STATUS_SERVER_UNKNOWN 1560 +#define PD32_PRINTER_STATUS_POWER_SAVE 1561 + +#define PD32_DEFAULT_PRINTER 1582 +#define PD32_NR_OF_DOCUMENTS_IN_QUEUE 1583 + +#define PD32_MARGINS_IN_INCHES 1585 +#define PD32_MARGINS_IN_MILLIMETERS 1586 +#define PD32_MILLIMETERS 1587 + +/* Charset names string IDs */ + +#define IDS_CHARSET_ANSI 200 +#define IDS_CHARSET_SYMBOL 201 +#define IDS_CHARSET_JIS 202 +#define IDS_CHARSET_HANGUL 203 +#define IDS_CHARSET_GB2312 204 +#define IDS_CHARSET_BIG5 205 +#define IDS_CHARSET_GREEK 206 +#define IDS_CHARSET_TURKISH 207 +#define IDS_CHARSET_HEBREW 208 +#define IDS_CHARSET_ARABIC 209 +#define IDS_CHARSET_BALTIC 210 +#define IDS_CHARSET_VIETNAMESE 211 +#define IDS_CHARSET_RUSSIAN 212 +#define IDS_CHARSET_EE 213 +#define IDS_CHARSET_THAI 214 +#define IDS_CHARSET_JOHAB 215 +#define IDS_CHARSET_MAC 216 +#define IDS_CHARSET_OEM 217 +#define IDS_CHARSET_VISCII 218 +#define IDS_CHARSET_TCVN 219 +#define IDS_CHARSET_KOI8 220 +#define IDS_CHARSET_ISO3 221 +#define IDS_CHARSET_ISO4 222 +#define IDS_CHARSET_ISO10 223 +#define IDS_CHARSET_CELTIC 224 + +/* Font styles */ + +#define IDS_FONT_REGULAR 256 +#define IDS_FONT_BOLD 257 +#define IDS_FONT_ITALIC 258 +#define IDS_FONT_BOLD_ITALIC 259 + +/* Color names string IDs */ + +#define IDS_COLOR_BLACK 1040 +#define IDS_COLOR_MAROON 1041 +#define IDS_COLOR_GREEN 1042 +#define IDS_COLOR_OLIVE 1043 +#define IDS_COLOR_NAVY 1044 +#define IDS_COLOR_PURPLE 1045 +#define IDS_COLOR_TEAL 1046 +#define IDS_COLOR_GRAY 1047 +#define IDS_COLOR_SILVER 1048 +#define IDS_COLOR_RED 1049 +#define IDS_COLOR_LIME 1050 +#define IDS_COLOR_YELLOW 1051 +#define IDS_COLOR_BLUE 1052 +#define IDS_COLOR_FUCHSIA 1053 +#define IDS_COLOR_AQUA 1054 +#define IDS_COLOR_WHITE 1055 + +/* Color dialog controls */ +#define IDC_COLOR_LUMBAR 702 +#define IDC_COLOR_EDIT_H 703 +#define IDC_COLOR_EDIT_S 704 +#define IDC_COLOR_EDIT_L 705 +#define IDC_COLOR_EDIT_R 706 +#define IDC_COLOR_EDIT_G 707 +#define IDC_COLOR_EDIT_B 708 +#define IDC_COLOR_RESULT 709 +#define IDC_COLOR_GRAPH 710 +#define IDC_COLOR_ADD 712 +#define IDC_COLOR_RES 713 +#define IDC_COLOR_DEFINE 719 +#define IDC_COLOR_PREDEF 720 +#define IDC_COLOR_USRDEF 721 +#define IDC_COLOR_HL 723 +#define IDC_COLOR_SL 724 +#define IDC_COLOR_LL 725 +#define IDC_COLOR_RL 726 +#define IDC_COLOR_GL 727 +#define IDC_COLOR_BL 728 + +#define IDS_FONT_SIZE 1200 +#define IDS_SAVE_BUTTON 1201 +#define IDS_SAVE_IN 1202 +#define IDS_SAVE 1203 +#define IDS_SAVE_AS 1204 +#define IDS_OPEN_FILE 1205 +#define IDS_SELECT_FOLDER 1206 +#define IDS_FONT_SIZE_INPUT 1207 + +#define IDS_FAKEDOCTEXT 1300 + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "commctrl.h" +#include "shlobj.h" +#include "shellapi.h" + /* Constructors */ HRESULT FileOpenDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; diff --git a/dll/win32/comdlg32/cdlg32.c b/dll/win32/comdlg32/cdlg32.c index 2a1a621411..daf03f0af4 100644 --- a/dll/win32/comdlg32/cdlg32.c +++ b/dll/win32/comdlg32/cdlg32.c @@ -19,8 +19,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "commdlg.h" +#include "cderr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + #include "cdlg.h" + DECLSPEC_HIDDEN HINSTANCE COMDLG32_hInstance = 0; static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES; diff --git a/dll/win32/comdlg32/colordlg.c b/dll/win32/comdlg32/colordlg.c index 7a01e47c82..bead9ba38c 100644 --- a/dll/win32/comdlg32/colordlg.c +++ b/dll/win32/comdlg32/colordlg.c @@ -23,8 +23,20 @@ sometimes, especially when 2 instances of the dialog are loaded at the same time */ +#include <stdarg.h> +#include <stdio.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "commdlg.h" +#include "dlgs.h" +#include "wine/debug.h" +#include "cderr.h" #include "cdlg.h" +WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + static INT_PTR CALLBACK ColorDlgProc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ); #define CONV_LPARAMTOPOINT(lp,p) do { (p)->x = (short)LOWORD(lp); (p)->y = (short)HIWORD(lp); } while(0) diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index 457ee9b13e..41b796684c 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -45,9 +45,43 @@ * */ +#include "config.h" +#include "wine/port.h" + +#include <ctype.h> +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winnls.h" +#include "wingdi.h" +#ifdef __REACTOS__ +/* RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 +#endif +#include "winreg.h" +#include "winuser.h" +#include "commdlg.h" +#include "dlgs.h" #include "cdlg.h" +#include "cderr.h" +#include "shellapi.h" +#include "shlobj.h" +#include "filedlgbrowser.h" +#include "shlwapi.h" + +#include "wine/unicode.h" +#include "wine/debug.h" -#include <shellapi.h> +WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #define UNIMPLEMENTED_FLAGS \ (OFN_DONTADDTORECENT |\ @@ -442,6 +476,23 @@ static BOOL GetFileDialog95(FileOpenDlgInfos *info, UINT dlg_type) ret = FALSE; } + /* set the lpstrFileTitle */ + if (ret && info->ofnInfos->lpstrFile && info->ofnInfos->lpstrFileTitle) + { + if (info->unicode) + { + LPOPENFILENAMEW ofn = info->ofnInfos; + WCHAR *file_title = PathFindFileNameW(ofn->lpstrFile); + lstrcpynW(ofn->lpstrFileTitle, file_title, ofn->nMaxFileTitle); + } + else + { + LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)info->ofnInfos; + char *file_title = PathFindFileNameA(ofn->lpstrFile); + lstrcpynA(ofn->lpstrFileTitle, file_title, ofn->nMaxFileTitle); + } + } + if (current_dir) { SetCurrentDirectoryW(current_dir); @@ -2660,23 +2711,6 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - tempFileA) + 1 : 0; } - /* set the lpstrFileTitle */ - if(fodInfos->ofnInfos->lpstrFileTitle) - { - LPWSTR lpstrFileTitle = PathFindFileNameW(lpstrPathAndFile); - if(fodInfos->unicode) - { - LPOPENFILENAMEW ofn = fodInfos->ofnInfos; - lstrcpynW(ofn->lpstrFileTitle, lpstrFileTitle, ofn->nMaxFileTitle); - } - else - { - LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos; - WideCharToMultiByte(CP_ACP, 0, lpstrFileTitle, -1, - ofn->lpstrFileTitle, ofn->nMaxFileTitle, NULL, NULL); - } - } - /* copy currently selected filter to lpstrCustomFilter */ if (fodInfos->ofnInfos->lpstrCustomFilter) { diff --git a/dll/win32/comdlg32/filedlg31.c b/dll/win32/comdlg32/filedlg31.c index 846982441b..0409915737 100644 --- a/dll/win32/comdlg32/filedlg31.c +++ b/dll/win32/comdlg32/filedlg31.c @@ -18,6 +18,25 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <ctype.h> +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "wingdi.h" +#include "winuser.h" +#include "wine/unicode.h" +#include "wine/debug.h" +#include "winreg.h" +#include "winternl.h" +#include "commdlg.h" +#include "shlwapi.h" +#include "cderr.h" + +WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #include "cdlg.h" diff --git a/dll/win32/comdlg32/filedlgbrowser.c b/dll/win32/comdlg32/filedlgbrowser.c index e59f20a5fa..a225e9e590 100644 --- a/dll/win32/comdlg32/filedlgbrowser.c +++ b/dll/win32/comdlg32/filedlgbrowser.c @@ -19,7 +19,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> +#include <stdio.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" + +#define NO_SHLWAPI_STREAM +#include "shlwapi.h" +#include "filedlgbrowser.h" #include "cdlg.h" +#include "shlguid.h" +#include "servprov.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(commdlg); typedef struct { diff --git a/dll/win32/comdlg32/filedlgbrowser.h b/dll/win32/comdlg32/filedlgbrowser.h index 4ac957eb73..5cb5435b89 100644 --- a/dll/win32/comdlg32/filedlgbrowser.h +++ b/dll/win32/comdlg32/filedlgbrowser.h @@ -22,6 +22,17 @@ #ifndef SHBROWSER_H #define SHBROWSER_H +#ifndef RC_INVOKED +#include <stdarg.h> +#endif + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "shlobj.h" +#include "objbase.h" +#include "commdlg.h" + /*********************************************************************** * Defines and global variables */ diff --git a/dll/win32/comdlg32/finddlg.c b/dll/win32/comdlg32/finddlg.c index a6d2ea93d6..bc4a31c605 100644 --- a/dll/win32/comdlg32/finddlg.c +++ b/dll/win32/comdlg32/finddlg.c @@ -19,8 +19,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "wingdi.h" +#include "winuser.h" +#include "commdlg.h" +#include "cderr.h" +#include "dlgs.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + #include "cdlg.h" + /*-----------------------------------------------------------------------*/ static UINT FindReplaceMessage; diff --git a/dll/win32/comdlg32/fontdlg.c b/dll/win32/comdlg32/fontdlg.c index d4c90df05b..768ca4a6ea 100644 --- a/dll/win32/comdlg32/fontdlg.c +++ b/dll/win32/comdlg32/fontdlg.c @@ -19,8 +19,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <ctype.h> +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "wingdi.h" +#include "winuser.h" +#include "commdlg.h" +#include "dlgs.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "cderr.h" #include "cdlg.h" +WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + typedef struct { HWND hWnd1; @@ -466,6 +483,16 @@ static inline void CFn_ReleaseDC(const CHOOSEFONTW *lpcf, HDC hdc) ReleaseDC(0, hdc); } +/************************************************************************* + * select_combo_item [internal] + */ +static void select_combo_item( HWND dialog, int id, int sel ) +{ + HWND combo = GetDlgItem( dialog, id ); + SendMessageW( combo, CB_SETCURSEL, sel, 0 ); + SendMessageW( dialog, WM_COMMAND, MAKEWPARAM( id, CBN_SELCHANGE ), (LPARAM)combo ); +} + /*********************************************************************** * AddFontStyle [internal] */ @@ -526,10 +553,7 @@ static void CFn_FitFontSize( HWND hDlg, int points) if (points == (int)SendDlgItemMessageW (hDlg,cmb3, CB_GETITEMDATA,i,0)) { - SendDlgItemMessageW(hDlg,cmb3,CB_SETCURSEL,i,0); - SendMessageW(hDlg, WM_COMMAND, - MAKEWPARAM(cmb3, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb3)); + select_combo_item( hDlg, cmb3, i ); return; } } @@ -542,21 +566,17 @@ static BOOL CFn_FitFontStyle( HWND hDlg, LONG packedstyle ) { LONG id; int i; - BOOL ret = FALSE; /* look for fitting font style in combobox2 */ for (i=0;i<TEXT_EXTRAS;i++) { id = SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, i, 0); if (packedstyle == id) { - SendDlgItemMessageW(hDlg, cmb2, CB_SETCURSEL, i, 0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb2, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb2)); - ret = TRUE; - break; + select_combo_item( hDlg, cmb2, i ); + return TRUE; } } - return ret; + return FALSE; } @@ -570,16 +590,12 @@ static BOOL CFn_FitCharSet( HWND hDlg, int charset ) cs =SendDlgItemMessageW(hDlg, cmb5, CB_GETITEMDATA, i, 0); if (charset == cs) { - SendDlgItemMessageW(hDlg, cmb5, CB_SETCURSEL, i, 0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb2)); + select_combo_item( hDlg, cmb5, i ); return TRUE; } } /* no charset fits: select the first one in the list */ - SendDlgItemMessageW(hDlg, cmb5, CB_SETCURSEL, 0, 0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb2)); + select_combo_item( hDlg, cmb5, 0 ); return FALSE; } @@ -712,9 +728,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) points = MulDiv( height, 72, GetScreenDPI()); pstyle = MAKELONG(lpxx->lfWeight > FW_MEDIUM ? FW_BOLD: FW_NORMAL,lpxx->lfItalic !=0); - SendDlgItemMessageW(hDlg, cmb1, CB_SETCURSEL, j, 0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb1)); + select_combo_item( hDlg, cmb1, j ); init = TRUE; /* look for fitting font style in combobox2 */ CFn_FitFontStyle(hDlg, pstyle); @@ -725,18 +739,10 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) } if (!init) { - SendDlgItemMessageW(hDlg,cmb1,CB_SETCURSEL,0,0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb1)); - SendDlgItemMessageW(hDlg,cmb2,CB_SETCURSEL,0,0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb2, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb1)); - SendDlgItemMessageW(hDlg,cmb3,CB_SETCURSEL,0,0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb3, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb3)); - SendDlgItemMessageW(hDlg,cmb5,CB_SETCURSEL,0,0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb5)); + select_combo_item( hDlg, cmb1, 0 ); + select_combo_item( hDlg, cmb2, 0 ); + select_combo_item( hDlg, cmb3, 0 ); + select_combo_item( hDlg, cmb5, 0 ); } /* limit text length user can type in as font size */ SendDlgItemMessageW(hDlg, cmb3, CB_LIMITTEXT, 5, 0); @@ -744,12 +750,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) if ((lpcf->Flags & CF_USESTYLE) && lpcf->lpszStyle) { j=SendDlgItemMessageW(hDlg,cmb2,CB_FINDSTRING,-1,(LPARAM)lpcf->lpszStyle); - if (j!=CB_ERR) - { - j=SendDlgItemMessageW(hDlg,cmb2,CB_SETCURSEL,j,0); - SendMessageW(hDlg,WM_COMMAND,cmb2, - MAKELONG(LOWORD(GetDlgItem(hDlg,cmb2)),CBN_SELCHANGE)); - } + if (j!=CB_ERR) select_combo_item( hDlg, cmb2, j ); } CFn_ReleaseDC(lpcf, hdc); SetCursor(hcursor); diff --git a/dll/win32/comdlg32/itemdlg.c b/dll/win32/comdlg32/itemdlg.c index 6b5f5db6ef..2b7a6fe6e9 100644 --- a/dll/win32/comdlg32/itemdlg.c +++ b/dll/win32/comdlg32/itemdlg.c @@ -4599,7 +4599,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p if(pUnkOuter) return CLASS_E_NOAGGREGATION; - fdimpl = HeapAlloc(GetProcessHeap(), 0, sizeof(FileDialogImpl)); + fdimpl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FileDialogImpl)); if(!fdimpl) return E_OUTOFMEMORY; @@ -4630,27 +4630,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->custom_okbutton = StrDupW(buf); } - fdimpl->filterspecs = NULL; - fdimpl->filterspec_count = 0; - fdimpl->filetypeindex = 0; - - fdimpl->psia_selection = fdimpl->psia_results = NULL; - fdimpl->psi_setfolder = fdimpl->psi_folder = NULL; - list_init(&fdimpl->events_clients); - fdimpl->events_next_cookie = 0; - - fdimpl->dlg_hwnd = NULL; - fdimpl->peb = NULL; - - fdimpl->set_filename = NULL; - fdimpl->default_ext = NULL; - fdimpl->custom_cancelbutton = fdimpl->custom_filenamelabel = NULL; - - fdimpl->client_guid = GUID_NULL; - - fdimpl->hmenu_opendropdown = NULL; - fdimpl->hfont_opendropdown = NULL; /* FIXME: The default folder setting should be restored for the * application if it was previously set. */ diff --git a/dll/win32/comdlg32/precomp.h b/dll/win32/comdlg32/precomp.h new file mode 100644 index 0000000000..0f5a9349d9 --- /dev/null +++ b/dll/win32/comdlg32/precomp.h @@ -0,0 +1,41 @@ + +#ifndef _WINE_COMDLG32_PRECOMP_H +#define _WINE_COMDLG32_PRECOMP_H + +#include <wine/config.h> + +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <wincon.h> +#include <winternl.h> +#include <objbase.h> +#include <commdlg.h> +#include <shlobj.h> +#include <dlgs.h> +#include <cderr.h> +/* RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 +#include <winreg.h> +#define NO_SHLWAPI_STREAM +#include <shlwapi.h> + +#include <wine/unicode.h> +#include <wine/debug.h> + +#include "cdlg.h" +#include "filedlgbrowser.h" + +#endif /* !_WINE_COMDLG32_PRECOMP_H */ diff --git a/dll/win32/comdlg32/printdlg.c b/dll/win32/comdlg32/printdlg.c index b043231fb9..83335a9503 100644 --- a/dll/win32/comdlg32/printdlg.c +++ b/dll/win32/comdlg32/printdlg.c @@ -21,11 +21,33 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <ctype.h> +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> +#include <assert.h> +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winspool.h" +#include "winerror.h" +#include "objbase.h" +#include "commdlg.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +#include "dlgs.h" +#include "cderr.h" #include "cdlg.h" -#include <assert.h> -#include <winspool.h> +WINE_DEFAULT_DEBUG_CHANNEL(commdlg); /* Yes these constants are the same, but we're just copying win98 */ #define UPDOWN_ID 0x270f diff --git a/dll/win32/comdlg32/resource.h b/dll/win32/comdlg32/resource.h deleted file mode 100644 index bfb798baca..0000000000 --- a/dll/win32/comdlg32/resource.h +++ /dev/null @@ -1,138 +0,0 @@ -#pragma once - -#define PD32_PRINT_TITLE 7000 - -#define PD32_VALUE_UREADABLE 1104 -#define PD32_INVALID_PAGE_RANGE 1105 -#define PD32_FROM_NOT_ABOVE_TO 1106 -#define PD32_MARGINS_OVERLAP 1107 -#define PD32_NR_OF_COPIES_EMPTY 1108 -#define PD32_TOO_LARGE_COPIES 1109 -#define PD32_PRINT_ERROR 1110 -#define PD32_NO_DEFAULT_PRINTER 1111 -#define PD32_CANT_FIND_PRINTER 1112 -#define PD32_OUT_OF_MEMORY 1113 -#define PD32_GENERIC_ERROR 1114 -#define PD32_DRIVER_UNKNOWN 1115 -#define PD32_NO_DEVICES 1121 - -#define PD32_PRINTER_STATUS_READY 1536 -#define PD32_PRINTER_STATUS_PAUSED 1537 -#define PD32_PRINTER_STATUS_ERROR 1538 -#define PD32_PRINTER_STATUS_PENDING_DELETION 1539 -#define PD32_PRINTER_STATUS_PAPER_JAM 1540 -#define PD32_PRINTER_STATUS_PAPER_OUT 1541 -#define PD32_PRINTER_STATUS_MANUAL_FEED 1542 -#define PD32_PRINTER_STATUS_PAPER_PROBLEM 1543 -#define PD32_PRINTER_STATUS_OFFLINE 1544 -#define PD32_PRINTER_STATUS_IO_ACTIVE 1545 -#define PD32_PRINTER_STATUS_BUSY 1546 -#define PD32_PRINTER_STATUS_PRINTING 1547 -#define PD32_PRINTER_STATUS_OUTPUT_BIN_FULL 1548 -#define PD32_PRINTER_STATUS_NOT_AVAILABLE 1549 -#define PD32_PRINTER_STATUS_WAITING 1550 -#define PD32_PRINTER_STATUS_PROCESSING 1551 -#define PD32_PRINTER_STATUS_INITIALIZING 1552 -#define PD32_PRINTER_STATUS_WARMING_UP 1553 -#define PD32_PRINTER_STATUS_TONER_LOW 1554 -#define PD32_PRINTER_STATUS_NO_TONER 1555 -#define PD32_PRINTER_STATUS_PAGE_PUNT 1556 -#define PD32_PRINTER_STATUS_USER_INTERVENTION 1557 -#define PD32_PRINTER_STATUS_OUT_OF_MEMORY 1558 -#define PD32_PRINTER_STATUS_DOOR_OPEN 1559 -#define PD32_PRINTER_STATUS_SERVER_UNKNOWN 1560 -#define PD32_PRINTER_STATUS_POWER_SAVE 1561 - -#define PD32_DEFAULT_PRINTER 1582 -#define PD32_NR_OF_DOCUMENTS_IN_QUEUE 1583 - -#define PD32_MARGINS_IN_INCHES 1585 -#define PD32_MARGINS_IN_MILLIMETERS 1586 -#define PD32_MILLIMETERS 1587 - -/* Charset names string IDs */ - -#define IDS_CHARSET_ANSI 200 -#define IDS_CHARSET_SYMBOL 201 -#define IDS_CHARSET_JIS 202 -#define IDS_CHARSET_HANGUL 203 -#define IDS_CHARSET_GB2312 204 -#define IDS_CHARSET_BIG5 205 -#define IDS_CHARSET_GREEK 206 -#define IDS_CHARSET_TURKISH 207 -#define IDS_CHARSET_HEBREW 208 -#define IDS_CHARSET_ARABIC 209 -#define IDS_CHARSET_BALTIC 210 -#define IDS_CHARSET_VIETNAMESE 211 -#define IDS_CHARSET_RUSSIAN 212 -#define IDS_CHARSET_EE 213 -#define IDS_CHARSET_THAI 214 -#define IDS_CHARSET_JOHAB 215 -#define IDS_CHARSET_MAC 216 -#define IDS_CHARSET_OEM 217 -#define IDS_CHARSET_VISCII 218 -#define IDS_CHARSET_TCVN 219 -#define IDS_CHARSET_KOI8 220 -#define IDS_CHARSET_ISO3 221 -#define IDS_CHARSET_ISO4 222 -#define IDS_CHARSET_ISO10 223 -#define IDS_CHARSET_CELTIC 224 - -/* Font styles */ - -#define IDS_FONT_REGULAR 256 -#define IDS_FONT_BOLD 257 -#define IDS_FONT_ITALIC 258 -#define IDS_FONT_BOLD_ITALIC 259 - -/* Color names string IDs */ - -#define IDS_COLOR_BLACK 1040 -#define IDS_COLOR_MAROON 1041 -#define IDS_COLOR_GREEN 1042 -#define IDS_COLOR_OLIVE 1043 -#define IDS_COLOR_NAVY 1044 -#define IDS_COLOR_PURPLE 1045 -#define IDS_COLOR_TEAL 1046 -#define IDS_COLOR_GRAY 1047 -#define IDS_COLOR_SILVER 1048 -#define IDS_COLOR_RED 1049 -#define IDS_COLOR_LIME 1050 -#define IDS_COLOR_YELLOW 1051 -#define IDS_COLOR_BLUE 1052 -#define IDS_COLOR_FUCHSIA 1053 -#define IDS_COLOR_AQUA 1054 -#define IDS_COLOR_WHITE 1055 - -/* Color dialog controls */ -#define IDC_COLOR_LUMBAR 702 -#define IDC_COLOR_EDIT_H 703 -#define IDC_COLOR_EDIT_S 704 -#define IDC_COLOR_EDIT_L 705 -#define IDC_COLOR_EDIT_R 706 -#define IDC_COLOR_EDIT_G 707 -#define IDC_COLOR_EDIT_B 708 -#define IDC_COLOR_RESULT 709 -#define IDC_COLOR_GRAPH 710 -#define IDC_COLOR_ADD 712 -#define IDC_COLOR_RES 713 -#define IDC_COLOR_DEFINE 719 -#define IDC_COLOR_PREDEF 720 -#define IDC_COLOR_USRDEF 721 -#define IDC_COLOR_HL 723 -#define IDC_COLOR_SL 724 -#define IDC_COLOR_LL 725 -#define IDC_COLOR_RL 726 -#define IDC_COLOR_GL 727 -#define IDC_COLOR_BL 728 - -#define IDS_FONT_SIZE 1200 -#define IDS_SAVE_BUTTON 1201 -#define IDS_SAVE_IN 1202 -#define IDS_SAVE 1203 -#define IDS_SAVE_AS 1204 -#define IDS_OPEN_FILE 1205 -#define IDS_SELECT_FOLDER 1206 -#define IDS_FONT_SIZE_INPUT 1207 - -#define IDS_FAKEDOCTEXT 1300 diff --git a/dll/win32/comdlg32/rsrc.rc b/dll/win32/comdlg32/rsrc.rc index 70a189c3da..3d83d96c4d 100644 --- a/dll/win32/comdlg32/rsrc.rc +++ b/dll/win32/comdlg32/rsrc.rc @@ -20,10 +20,9 @@ #include <windef.h> #include <winuser.h> -#include <dlgs.h> +#include "cdlg.h" #include "filedlgbrowser.h" -#include "resource.h" /* * Everything that does not depend on language, diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 1386ed960a..92cdfd8fd4 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -55,7 +55,7 @@ reactos/dll/win32/cabinet # Synced to WineStaging-3.3 reactos/dll/win32/clusapi # Synced to WineStaging-3.3 reactos/dll/win32/comcat # Synced to WineStaging-3.3 reactos/dll/win32/comctl32 # Synced to Wine-3.0 -reactos/dll/win32/comdlg32 # Synced to Wine-3.0 +reactos/dll/win32/comdlg32 # Synced to WineStaging-3.3 reactos/dll/win32/compstui # Synced to WineStaging-2.9 reactos/dll/win32/credui # Synced to WineStaging-2.9 reactos/dll/win32/crypt32 # Synced to WineStaging-2.16

6 years, 8 months

01/01: [COMCAT_WINETEST] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0dbc2d18421ffa0ddae86… commit 0dbc2d18421ffa0ddae86c9a77689bb78e37e853 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 9 12:52:03 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 9 12:52:03 2018 +0100 [COMCAT_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/comcat/comcat.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/modules/rostests/winetests/comcat/comcat.c b/modules/rostests/winetests/comcat/comcat.c index 1e9202f3db..ff5b51a87b 100644 --- a/modules/rostests/winetests/comcat/comcat.c +++ b/modules/rostests/winetests/comcat/comcat.c @@ -18,21 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #define COBJMACROS -#include <wine/test.h> +#include <stdio.h> +#include <initguid.h> +#include <windows.h> + +#include "objbase.h" +#include "comcat.h" -//#include <stdio.h> -//#include <initguid.h> -//#include <windows.h> -#include <winreg.h> -//#include "objbase.h" -#include <ole2.h> -#include <comcat.h> +#include "wine/test.h" #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr)

6 years, 8 months

01/01: [COMCAT] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a4d45019bfd088afda84… commit 0a4d45019bfd088afda84337743ee1e9d852871d Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 9 12:51:19 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 9 12:51:19 2018 +0100 [COMCAT] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/comcat/comcat_main.c | 8 +++----- dll/win32/comcat/version.rc | 2 +- media/doc/README.WINE | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dll/win32/comcat/comcat_main.c b/dll/win32/comcat/comcat_main.c index 9417b0be2d..345cf67e0b 100644 --- a/dll/win32/comcat/comcat_main.c +++ b/dll/win32/comcat/comcat_main.c @@ -18,12 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS +#include <stdarg.h> -//#include <stdarg.h> - -#include <windef.h> -//#include "winbase.h" +#include "windef.h" +#include "winbase.h" /*********************************************************************** * DllCanUnloadNow (COMCAT.@) diff --git a/dll/win32/comcat/version.rc b/dll/win32/comcat/version.rc index 1d5d15e0ce..017fa4571a 100644 --- a/dll/win32/comcat/version.rc +++ b/dll/win32/comcat/version.rc @@ -21,4 +21,4 @@ #define WINE_FILENAME_STR "comcat.dll" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" -#include <wine/wine_common_ver.rc> +#include "wine/wine_common_ver.rc" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 4a0befc476..1386ed960a 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -53,7 +53,7 @@ reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to WineStaging-3.3 reactos/dll/win32/clusapi # Synced to WineStaging-3.3 -reactos/dll/win32/comcat # Synced to WineStaging-2.9 +reactos/dll/win32/comcat # Synced to WineStaging-3.3 reactos/dll/win32/comctl32 # Synced to Wine-3.0 reactos/dll/win32/comdlg32 # Synced to Wine-3.0 reactos/dll/win32/compstui # Synced to WineStaging-2.9

6 years, 8 months

01/01: [CLUSAPI] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4a72c78a27b3b9472c14… commit d4a72c78a27b3b9472c146cbef5334846a7440aa Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 9 12:50:24 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 9 12:50:24 2018 +0100 [CLUSAPI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/clusapi/clusapi.c | 10 ++++------ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dll/win32/clusapi/clusapi.c b/dll/win32/clusapi/clusapi.c index edab534f43..88c6fbfc12 100644 --- a/dll/win32/clusapi/clusapi.c +++ b/dll/win32/clusapi/clusapi.c @@ -18,14 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <clusapi.h> -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "clusapi.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(clusapi); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 3cbd73c49e..4a0befc476 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -52,7 +52,7 @@ reactos/dll/win32/avifil32 # Synced to WineStaging-3.3 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to WineStaging-3.3 -reactos/dll/win32/clusapi # Synced to WineStaging-2.9 +reactos/dll/win32/clusapi # Synced to WineStaging-3.3 reactos/dll/win32/comcat # Synced to WineStaging-2.9 reactos/dll/win32/comctl32 # Synced to Wine-3.0 reactos/dll/win32/comdlg32 # Synced to Wine-3.0

6 years, 8 months

01/01: [CABINET_WINETEST] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca1d7c82da24c8ecb493a… commit ca1d7c82da24c8ecb493affa82c1e87b2d4a304e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 9 12:49:13 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 9 12:49:13 2018 +0100 [CABINET_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/cabinet/extract.c | 10 +++++----- modules/rostests/winetests/cabinet/fdi.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/rostests/winetests/cabinet/extract.c b/modules/rostests/winetests/cabinet/extract.c index 2911e9e95c..c3d45102f2 100644 --- a/modules/rostests/winetests/cabinet/extract.c +++ b/modules/rostests/winetests/cabinet/extract.c @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdio.h> -//#include <windows.h> -#include <wine/test.h> -#include <fci.h> -#include <fdi.h> +#include <stdio.h> +#include <windows.h> +#include "fci.h" +#include "fdi.h" +#include "wine/test.h" /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 999999999 diff --git a/modules/rostests/winetests/cabinet/fdi.c b/modules/rostests/winetests/cabinet/fdi.c index 741283afe6..80f6a3c571 100644 --- a/modules/rostests/winetests/cabinet/fdi.c +++ b/modules/rostests/winetests/cabinet/fdi.c @@ -20,10 +20,10 @@ */ #include <stdio.h> -//#include <windows.h> -#include <wine/test.h> -#include <fci.h> -#include <fdi.h> +#include <windows.h> +#include "fci.h" +#include "fdi.h" +#include "wine/test.h" /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 999999999

6 years, 8 months

01/01: [CABINET] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afb6bca511b8c085c37b8… commit afb6bca511b8c085c37b89f4e273282abf40fa79 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 9 12:48:26 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 9 12:48:26 2018 +0100 [CABINET] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/cabinet/CMakeLists.txt | 4 ++-- dll/win32/cabinet/cabinet.h | 18 +++++------------- dll/win32/cabinet/cabinet_main.c | 18 ++++++++++++++++-- dll/win32/cabinet/fci.c | 20 ++++++++++++++++---- dll/win32/cabinet/fdi.c | 13 ++++++++++++- dll/win32/cabinet/precomp.h | 15 +++++++++++++++ media/doc/README.WINE | 2 +- 7 files changed, 67 insertions(+), 23 deletions(-) diff --git a/dll/win32/cabinet/CMakeLists.txt b/dll/win32/cabinet/CMakeLists.txt index c812df3642..20eb368d00 100644 --- a/dll/win32/cabinet/CMakeLists.txt +++ b/dll/win32/cabinet/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND SOURCE cabinet_main.c fci.c fdi.c - cabinet.h) + precomp.h) add_library(cabinet SHARED ${SOURCE} @@ -24,5 +24,5 @@ add_library(cabinet SHARED set_module_type(cabinet win32dll) target_link_libraries(cabinet wine zlib) add_importlibs(cabinet msvcrt kernel32 ntdll) -add_pch(cabinet cabinet.h SOURCE) +add_pch(cabinet precomp.h SOURCE) add_cd_file(TARGET cabinet DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/cabinet/cabinet.h b/dll/win32/cabinet/cabinet.h index 4bc4be7344..52736db513 100644 --- a/dll/win32/cabinet/cabinet.h +++ b/dll/win32/cabinet/cabinet.h @@ -18,24 +18,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #ifndef __WINE_CABINET_H #define __WINE_CABINET_H -#include <wine/config.h> - #include <stdarg.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <windef.h> -#include <winbase.h> -#include <fdi.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(cabinet); +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "fdi.h" +#include "fci.h" /* from msvcrt/sys/stat.h */ #define _S_IWRITE 0x0080 diff --git a/dll/win32/cabinet/cabinet_main.c b/dll/win32/cabinet/cabinet_main.c index a329e4d8de..8af0fb1e6d 100644 --- a/dll/win32/cabinet/cabinet_main.c +++ b/dll/win32/cabinet/cabinet_main.c @@ -18,12 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "cabinet.h" +#include "config.h" + +#include <assert.h> +#include <stdarg.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "winerror.h" #define NO_SHLWAPI_REG -#include <shlwapi.h> +#include "shlwapi.h" #undef NO_SHLWAPI_REG +#include "cabinet.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cabinet); + + /*********************************************************************** * DllGetVersion (CABINET.2) * diff --git a/dll/win32/cabinet/fci.c b/dll/win32/cabinet/fci.c index 9930f08c38..167ca747d0 100644 --- a/dll/win32/cabinet/fci.c +++ b/dll/win32/cabinet/fci.c @@ -30,16 +30,28 @@ There is still some work to be done: */ -#include "cabinet.h" -#include <assert.h> -#include <fci.h> +#include "config.h" + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> #ifdef HAVE_ZLIB # include <zlib.h> #endif -#include <wine/list.h> +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wine/winternl.h" +#include "fci.h" +#include "cabinet.h" +#include "wine/list.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cabinet); #ifdef WORDS_BIGENDIAN #define fci_endian_ulong(x) RtlUlongByteSwap(x) diff --git a/dll/win32/cabinet/fdi.c b/dll/win32/cabinet/fdi.c index a864bd7fdb..01a0c4d05c 100644 --- a/dll/win32/cabinet/fdi.c +++ b/dll/win32/cabinet/fdi.c @@ -58,10 +58,21 @@ * -gmt */ -#include "cabinet.h" +#include "config.h" +#include <stdarg.h> #include <stdio.h> +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "fdi.h" +#include "cabinet.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cabinet); + THOSE_ZIP_CONSTS; struct fdi_file { diff --git a/dll/win32/cabinet/precomp.h b/dll/win32/cabinet/precomp.h new file mode 100644 index 0000000000..c2aa4fdf4b --- /dev/null +++ b/dll/win32/cabinet/precomp.h @@ -0,0 +1,15 @@ + +#ifndef _WINE_CABINET_PRECOMP_H +#define _WINE_CABINET_PRECOMP_H + +#include <wine/config.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include "cabinet.h" + +#include <wine/debug.h> + +#endif /* !_WINE_CABINET_PRECOMP_H */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 5d569bf0b9..3cbd73c49e 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -51,7 +51,7 @@ reactos/dll/win32/atl100 # Synced to WineStaging-3.3 reactos/dll/win32/avifil32 # Synced to WineStaging-3.3 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to Wine-3.0 +reactos/dll/win32/cabinet # Synced to WineStaging-3.3 reactos/dll/win32/clusapi # Synced to WineStaging-2.9 reactos/dll/win32/comcat # Synced to WineStaging-2.9 reactos/dll/win32/comctl32 # Synced to Wine-3.0

6 years, 8 months

01/01: [AVIFIL32_WINETEST] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2781e242e6710bc664809… commit 2781e242e6710bc6648091de09a96f875d2ea9aa Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 9 12:47:13 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 9 12:47:13 2018 +0100 [AVIFIL32_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/avifil32/api.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/rostests/winetests/avifil32/api.c b/modules/rostests/winetests/avifil32/api.c index 4aa2c0e00c..66ba2051a0 100644 --- a/modules/rostests/winetests/avifil32/api.c +++ b/modules/rostests/winetests/avifil32/api.c @@ -19,17 +19,13 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #define COBJMACROS #define CONST_VTABLE -#include <wine/test.h> -#include <initguid.h> -#include <wingdi.h> -#include <vfw.h> +#include "wine/test.h" +#include "initguid.h" +#include "wingdi.h" +#include "vfw.h" /* ########################### */

6 years, 8 months

01/01: [AVIFIL32] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44836a6e12cf015c3220c… commit 44836a6e12cf015c3220c8e4ae431d439e688c52 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 9 12:46:31 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 9 12:46:31 2018 +0100 [AVIFIL32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/avifil32/CMakeLists.txt | 7 ++- dll/win32/avifil32/acmstream.c | 16 +++++ dll/win32/avifil32/api.c | 24 ++++++- dll/win32/avifil32/avifil32.idl | 25 ++++---- dll/win32/avifil32/avifile.c | 19 ++++++ dll/win32/avifil32/avifile_ifaces.idl | 105 +++++++++++++++++++++++++++++++ dll/win32/avifil32/avifile_private.h | 40 ++++++------ dll/win32/avifil32/editstream.c | 18 +++++- dll/win32/avifil32/extrachunk.c | 12 +++- dll/win32/avifil32/extrachunk.h | 8 ++- dll/win32/avifil32/factory.c | 26 +++++++- dll/win32/avifil32/getframe.c | 115 ++++++++++++++++++---------------- dll/win32/avifil32/icmstream.c | 15 +++++ dll/win32/avifil32/precomp.h | 26 ++++++++ dll/win32/avifil32/resource.h | 17 ----- dll/win32/avifil32/rsrc.rc | 4 +- dll/win32/avifil32/tmpfile.c | 15 ++++- dll/win32/avifil32/wavfile.c | 20 ++++++ media/doc/README.WINE | 2 +- 19 files changed, 399 insertions(+), 115 deletions(-) diff --git a/dll/win32/avifil32/CMakeLists.txt b/dll/win32/avifil32/CMakeLists.txt index 19fc0d3324..c686301172 100644 --- a/dll/win32/avifil32/CMakeLists.txt +++ b/dll/win32/avifil32/CMakeLists.txt @@ -5,6 +5,7 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__ -DENTRY_PREFIX=avifil32_) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(avifil32.dll avifil32.spec ADD_IMPORTLIB) +add_rpcproxy_files(avifil32.idl) list(APPEND SOURCE acmstream.c @@ -17,16 +18,18 @@ list(APPEND SOURCE icmstream.c tmpfile.c wavfile.c - avifile_private.h) + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + precomp.h) add_library(avifil32 SHARED ${SOURCE} guid.c rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/avifil32_p.c ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) set_module_type(avifil32 win32dll) target_link_libraries(avifil32 wine ${PSEH_LIB}) add_importlibs(avifil32 msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_pch(avifil32 avifile_private.h SOURCE) +add_pch(avifil32 precomp.h SOURCE) add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/avifil32/acmstream.c b/dll/win32/avifil32/acmstream.c index d7719ceb46..7bf05d23c3 100644 --- a/dll/win32/avifil32/acmstream.c +++ b/dll/win32/avifil32/acmstream.c @@ -16,8 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "mmsystem.h" +#include "vfw.h" +#include "msacm.h" + #include "avifile_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avifile); + /***********************************************************************/ typedef struct _IAVIStreamImpl { diff --git a/dll/win32/avifil32/api.c b/dll/win32/avifil32/api.c index f3b474b5b6..5c15c1fe83 100644 --- a/dll/win32/avifil32/api.c +++ b/dll/win32/avifil32/api.c @@ -17,9 +17,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "winerror.h" + +#include "ole2.h" +#include "shellapi.h" +#include "shlobj.h" +#include "vfw.h" +#include "msacm.h" + #include "avifile_private.h" -#include <winreg.h> +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avifile); + /*********************************************************************** * for AVIBuildFilterW -- uses fixed size table diff --git a/dll/win32/avifil32/avifil32.idl b/dll/win32/avifil32/avifil32.idl index 1f50f154ae..e23c176051 100644 --- a/dll/win32/avifil32/avifil32.idl +++ b/dll/win32/avifil32/avifil32.idl @@ -18,39 +18,42 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy #pragma makedep register +#include "avifile_ifaces.idl" + +[ + helpstring("IAVIStream & IAVIFile Proxy"), + threading(both), + uuid(0002000d-0000-0000-c000-000000000046) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + [ helpstring("Microsoft AVI Files"), - threading(apartment), + threading(both), uuid(00020000-0000-0000-C000-000000000046) ] coclass AVIFile { interface IAVIFile; } [ helpstring("AVI Compressed Stream"), - threading(apartment), + threading(both), uuid(00020001-0000-0000-c000-000000000046) ] coclass ICMStream { interface IAVIStream; } [ helpstring("Microsoft Wave File"), - threading(apartment), + threading(both), uuid(00020003-0000-0000-c000-000000000046) ] coclass WAVFile { interface IAVIFile; } -[ - helpstring("IAVIStream & IAVIFile Proxy"), - threading(apartment), - uuid(0002000d-0000-0000-c000-000000000046) -] -coclass AVIProxy { } - [ helpstring("ACM Compressed Audio Stream"), - threading(apartment), + threading(both), uuid(0002000f-0000-0000-c000-000000000046) ] coclass ACMStream { interface IAVIStream; } diff --git a/dll/win32/avifil32/avifile.c b/dll/win32/avifil32/avifile.c index fdec0f8152..7a4caaadb4 100644 --- a/dll/win32/avifil32/avifile.c +++ b/dll/win32/avifil32/avifile.c @@ -30,7 +30,26 @@ * When index is missing it works, but index seems to be okay. */ +#define COBJMACROS +#include <assert.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "winerror.h" +#include "mmsystem.h" +#include "vfw.h" + #include "avifile_private.h" +#include "extrachunk.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avifile); #ifndef IDX_PER_BLOCK #define IDX_PER_BLOCK 2730 diff --git a/dll/win32/avifil32/avifile_ifaces.idl b/dll/win32/avifil32/avifile_ifaces.idl new file mode 100644 index 0000000000..f9280e5728 --- /dev/null +++ b/dll/win32/avifil32/avifile_ifaces.idl @@ -0,0 +1,105 @@ +/* + * Proxy support for avifil32 + * + * Copyright 2016 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * These interface descriptions are supposed to be used for automatic proxy + * generation by an IDL compiler. + * + * While it's possible to convert include/vfw.h to an .idl, that's proved to + * be a major waste of an effort because the resulting interface descriptions + * can't be used for automatic proxy generation since they are not compatible + * with IDL compiler restrictions for proxies, and fixing them up would make + * generated vfw.h source incompatible with PSDK's equivalent. + */ + +import "wtypes.idl"; +import "unknwn.idl"; + +typedef struct _AVISTREAMINFOW +{ + DWORD fccType; + DWORD fccHandler; + DWORD dwFlags; + DWORD dwCaps; + WORD wPriority; + WORD wLanguage; + DWORD dwScale; + DWORD dwRate; + DWORD dwStart; + DWORD dwLength; + DWORD dwInitialFrames; + DWORD dwSuggestedBufferSize; + DWORD dwQuality; + DWORD dwSampleSize; + RECT rcFrame; + DWORD dwEditCount; + DWORD dwFormatChangeCount; + WCHAR szName[64]; +} AVISTREAMINFOW; + +[ + object, + uuid(00020021-0000-0000-c000-000000000046) +] +interface IAVIStream : IUnknown +{ + HRESULT Create(LPARAM lParam1, LPARAM lParam2); + HRESULT Info(AVISTREAMINFOW *psi, LONG lSize); + LONG FindSample(LONG lPos, LONG lFlags); + HRESULT ReadFormat(LONG lPos, [out,size_is(*lpcbFormat)] char *lpFormat, [in,out] LONG *lpcbFormat); + HRESULT SetFormat(LONG lPos, [in,size_is(cbFormat)] char *lpFormat, LONG cbFormat); + HRESULT Read(LONG lStart, LONG lSamples, [out,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, LONG *plBytes, LONG *plSamples); + HRESULT Write(LONG lStart, LONG lSamples, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, DWORD dwFlags, LONG *plSampWritten, LONG *plBytesWritten); + HRESULT Delete(LONG lStart, LONG lSamples); + HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); + HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); + HRESULT SetInfo(AVISTREAMINFOW *plInfo, LONG cbInfo); +}; + +typedef struct _AVIFILEINFOW +{ + DWORD dwMaxBytesPerSec; + DWORD dwFlags; + DWORD dwCaps; + DWORD dwStreams; + DWORD dwSuggestedBufferSize; + DWORD dwWidth; + DWORD dwHeight; + DWORD dwScale; + DWORD dwRate; + DWORD dwLength; + DWORD dwEditCount; + WCHAR szFileType[64]; +} AVIFILEINFOW; + +[ + object, + uuid(00020020-0000-0000-c000-000000000046) +] +interface IAVIFile : IUnknown +{ + HRESULT Info(AVIFILEINFOW *pfi, LONG lSize); + HRESULT GetStream(IAVIStream **ppStream, DWORD fccType, LONG lParam); + HRESULT CreateStream(IAVIStream **ppStream, AVISTREAMINFOW *psi); + HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); + HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); + HRESULT EndRecord(void); + HRESULT DeleteStream(DWORD fccType, LONG lParam); +}; diff --git a/dll/win32/avifil32/avifile_private.h b/dll/win32/avifil32/avifile_private.h index fed58504a5..4bf11f42a8 100644 --- a/dll/win32/avifil32/avifile_private.h +++ b/dll/win32/avifil32/avifile_private.h @@ -19,27 +19,8 @@ #ifndef __AVIFILE_PRIVATE_H #define __AVIFILE_PRIVATE_H -#include <assert.h> -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - #include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <vfw.h> - -#include <wine/debug.h> -#include <wine/unicode.h> - -#include "extrachunk.h" -#include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(avifile); +#include <winuser.h> #ifndef MAX_AVISTREAMS #define MAX_AVISTREAMS 8 @@ -55,6 +36,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); (lp)->biClrUsed * sizeof(RGBQUAD)) #endif +#define IDD_SAVEOPTIONS 0x0100 +#define IDC_INTERLEAVE 0x0110 +#define IDC_INTERLEAVEEVERY 0x0111 +#define IDC_STREAM 0x0112 +#define IDC_OPTIONS 0x0113 +#define IDC_FORMATTEXT 0x0114 + +#define IDS_WAVESTREAMFORMAT 0x0100 +#define IDS_WAVEFILETYPE 0x0101 +#define IDS_ALLMULTIMEDIA 0x0184 +#define IDS_ALLFILES 0x0185 +#define IDS_VIDEO 0x0189 +#define IDS_AUDIO 0x0190 +#define IDS_AVIFILETYPE 0x0192 +#define IDS_UNCOMPRESSED 0x0193 + DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0); DEFINE_AVIGUID(CLSID_WAVFile, 0x00020003, 0, 0); DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0); @@ -69,5 +66,6 @@ extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream) DECLSPEC_HIDDEN; extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN; extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN; +extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) DECLSPEC_HIDDEN; -#endif /* __AVIFILE_PRIVATE_H */ +#endif diff --git a/dll/win32/avifil32/editstream.c b/dll/win32/avifil32/editstream.c index f763179fae..a4df6283eb 100644 --- a/dll/win32/avifil32/editstream.c +++ b/dll/win32/avifil32/editstream.c @@ -16,7 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wingdi.h" +#include "winerror.h" +#include "mmsystem.h" +#include "vfw.h" + #include "avifile_private.h" +#include "extrachunk.h" + +#include "wine/debug.h" +#include "initguid.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avifile); /***********************************************************************/ @@ -265,7 +282,6 @@ static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface) } HeapFree(GetProcessHeap(), 0, This); - return 0; } return ref; } diff --git a/dll/win32/avifil32/extrachunk.c b/dll/win32/avifil32/extrachunk.c index 776b81de95..de11ee8bda 100644 --- a/dll/win32/avifil32/extrachunk.c +++ b/dll/win32/avifil32/extrachunk.c @@ -16,7 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "avifile_private.h" +#include <assert.h> + +#include "extrachunk.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "vfw.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avifile); /* reads a chunk out of the extrachunk-structure */ HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lpData,LPLONG size) diff --git a/dll/win32/avifil32/extrachunk.h b/dll/win32/avifil32/extrachunk.h index f8b966c07d..5b87d7f44d 100644 --- a/dll/win32/avifil32/extrachunk.h +++ b/dll/win32/avifil32/extrachunk.h @@ -19,6 +19,12 @@ #ifndef __WINE_EXTRACHUNK_H #define __WINE_EXTRACHUNK_H +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "mmsystem.h" + #ifdef __cplusplus extern "C" { #endif @@ -46,4 +52,4 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio, } #endif -#endif /* __WINE_EXTRACHUNK_H */ +#endif diff --git a/dll/win32/avifil32/factory.c b/dll/win32/avifil32/factory.c index 5689241d67..3775aa51a8 100644 --- a/dll/win32/avifil32/factory.c +++ b/dll/win32/avifil32/factory.c @@ -16,9 +16,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "ole2.h" +#include "rpcproxy.h" + +#include "initguid.h" +#include "vfw.h" #include "avifile_private.h" -#include <rpcproxy.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avifile); HMODULE AVIFILE_hModule = NULL; @@ -166,12 +182,18 @@ LPCWSTR AVIFILE_BasenameW(LPCWSTR szPath) */ HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) { + HRESULT hr; + TRACE("(%s,%s,%p)\n", debugstr_guid(pclsid), debugstr_guid(piid), ppv); if (pclsid == NULL || piid == NULL || ppv == NULL) return E_FAIL; - return AVIFILE_CreateClassFactory(pclsid,piid,ppv); + hr = AVIFILE_CreateClassFactory(pclsid,piid,ppv); + if (SUCCEEDED(hr)) + return hr; + + return avifil32_DllGetClassObject(pclsid,piid,ppv); } /***************************************************************************** diff --git a/dll/win32/avifil32/getframe.c b/dll/win32/avifil32/getframe.c index 1229876506..2e6156806d 100644 --- a/dll/win32/avifil32/getframe.c +++ b/dll/win32/avifil32/getframe.c @@ -16,8 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "vfw.h" + #include "avifile_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avifile); + #ifndef DIBPTR #define DIBPTR(lp) ((LPBYTE)(lp) + (lp)->biSize + \ (lp)->biClrUsed * sizeof(RGBQUAD)) @@ -122,7 +134,6 @@ static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface) } HeapFree(GetProcessHeap(), 0, iface); - return 0; } return ref; @@ -394,8 +405,6 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, lpbi->biSize + lpbi->biClrUsed * sizeof(RGBQUAD)); if (lpbi->biBitCount <= 8) ICDecompressGetPalette(This->hic, This->lpInFormat, This->lpOutFormat); - - return AVIERR_OK; } else { if (bBestDisplay) { ICGetDisplayFormat(This->hic, This->lpInFormat, @@ -405,64 +414,64 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, AVIFILE_CloseCompressor(This); return AVIERR_NOCOMPRESSOR; } + } - /* check output format */ - if (This->lpOutFormat->biClrUsed == 0 && - This->lpOutFormat->biBitCount <= 8) - This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; - if (This->lpOutFormat->biSizeImage == 0 && - This->lpOutFormat->biCompression == BI_RGB) { - This->lpOutFormat->biSizeImage = - DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; - } + /* check output format */ + if (This->lpOutFormat->biClrUsed == 0 && + This->lpOutFormat->biBitCount <= 8) + This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; + if (This->lpOutFormat->biSizeImage == 0 && + This->lpOutFormat->biCompression == BI_RGB) { + This->lpOutFormat->biSizeImage = + DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; + } - if (lpBits == NULL) { - DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); + if (lpBits == NULL) { + DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); - size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; - This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); - if (This->lpOutFormat == NULL) { - AVIFILE_CloseCompressor(This); - return AVIERR_MEMORY; - } - This->lpOutBuffer = DIBPTR(This->lpOutFormat); - } else - This->lpOutBuffer = lpBits; - - /* for user size was irrelevant */ - if (dx == -1) - dx = This->lpOutFormat->biWidth; - if (dy == -1) - dy = This->lpOutFormat->biHeight; - - /* need to resize? */ - if (x != 0 || y != 0) { - if (dy == This->lpOutFormat->biHeight && - dx == This->lpOutFormat->biWidth) - This->bResize = FALSE; - else - This->bResize = TRUE; + size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; + This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); + if (This->lpOutFormat == NULL) { + AVIFILE_CloseCompressor(This); + return AVIERR_MEMORY; } + This->lpOutBuffer = DIBPTR(This->lpOutFormat); + } else + This->lpOutBuffer = lpBits; + + /* for user size was irrelevant */ + if (dx == -1) + dx = This->lpOutFormat->biWidth; + if (dy == -1) + dy = This->lpOutFormat->biHeight; + + /* need to resize? */ + if (x != 0 || y != 0) { + if (dy == This->lpOutFormat->biHeight && + dx == This->lpOutFormat->biWidth) + This->bResize = FALSE; + else + This->bResize = TRUE; + } + + if (This->bResize) { + This->x = x; + This->y = y; + This->dx = dx; + This->dy = dy; - if (This->bResize) { - This->x = x; - This->y = y; - This->dx = dx; - This->dy = dy; - - if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, - 0,This->lpInFormat->biWidth, - This->lpInFormat->biHeight,This->lpOutFormat, - This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) - return AVIERR_OK; - } else if (ICDecompressBegin(This->hic, This->lpInFormat, - This->lpOutFormat) == ICERR_OK) + if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, + 0,This->lpInFormat->biWidth, + This->lpInFormat->biHeight,This->lpOutFormat, + This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) return AVIERR_OK; + } else if (ICDecompressBegin(This->hic, This->lpInFormat, + This->lpOutFormat) == ICERR_OK) + return AVIERR_OK; - AVIFILE_CloseCompressor(This); + AVIFILE_CloseCompressor(This); - return AVIERR_COMPRESSOR; - } + return AVIERR_COMPRESSOR; } static const struct IGetFrameVtbl igetframeVtbl = { diff --git a/dll/win32/avifil32/icmstream.c b/dll/win32/avifil32/icmstream.c index 60b73efd76..766f540e41 100644 --- a/dll/win32/avifil32/icmstream.c +++ b/dll/win32/avifil32/icmstream.c @@ -16,8 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "mmsystem.h" +#include "vfw.h" + #include "avifile_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avifile); + #define MAX_FRAMESIZE (16 * 1024 * 1024) #define MAX_FRAMESIZE_DIFF 512 diff --git a/dll/win32/avifil32/precomp.h b/dll/win32/avifil32/precomp.h new file mode 100644 index 0000000000..a60d53622a --- /dev/null +++ b/dll/win32/avifil32/precomp.h @@ -0,0 +1,26 @@ + +#ifndef _AVIFILE_PRECOMP_H +#define _AVIFILE_PRECOMP_H + +#include <assert.h> +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <wincon.h> +#include <vfw.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "avifile_private.h" +#include "extrachunk.h" + +#endif /* !_AVIFILE_PRECOMP_H */ diff --git a/dll/win32/avifil32/resource.h b/dll/win32/avifil32/resource.h deleted file mode 100644 index 0a4db097cb..0000000000 --- a/dll/win32/avifil32/resource.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#define IDD_SAVEOPTIONS 0x0100 -#define IDC_INTERLEAVE 0x0110 -#define IDC_INTERLEAVEEVERY 0x0111 -#define IDC_STREAM 0x0112 -#define IDC_OPTIONS 0x0113 -#define IDC_FORMATTEXT 0x0114 - -#define IDS_WAVESTREAMFORMAT 0x0100 -#define IDS_WAVEFILETYPE 0x0101 -#define IDS_ALLMULTIMEDIA 0x0184 -#define IDS_ALLFILES 0x0185 -#define IDS_VIDEO 0x0189 -#define IDS_AUDIO 0x0190 -#define IDS_AVIFILETYPE 0x0192 -#define IDS_UNCOMPRESSED 0x0193 diff --git a/dll/win32/avifil32/rsrc.rc b/dll/win32/avifil32/rsrc.rc index 0e8add407c..b829739a8e 100644 --- a/dll/win32/avifil32/rsrc.rc +++ b/dll/win32/avifil32/rsrc.rc @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> +#include "avifile_private.h" -#include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/dll/win32/avifil32/tmpfile.c b/dll/win32/avifil32/tmpfile.c index 288d7a4a8b..6d199c7b95 100644 --- a/dll/win32/avifil32/tmpfile.c +++ b/dll/win32/avifil32/tmpfile.c @@ -16,7 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "vfw.h" + #include "avifile_private.h" +#include "extrachunk.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avifile); /***********************************************************************/ @@ -80,7 +94,6 @@ static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface) } HeapFree(GetProcessHeap(), 0, This); - return 0; } return ref; diff --git a/dll/win32/avifil32/wavfile.c b/dll/win32/avifil32/wavfile.c index 14d6acd2b3..d2d203b4b9 100644 --- a/dll/win32/avifil32/wavfile.c +++ b/dll/win32/avifil32/wavfile.c @@ -16,7 +16,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS +#include <assert.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "winerror.h" +#include "mmsystem.h" +#include "vfw.h" +#include "msacm.h" + #include "avifile_private.h" +#include "extrachunk.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avifile); /***********************************************************************/ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 6fe3e1d210..5d569bf0b9 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -48,7 +48,7 @@ reactos/dll/win32/advpack # Synced to WineStaging-3.3 reactos/dll/win32/atl # Synced to WineStaging-3.3 reactos/dll/win32/atl80 # Synced to WineStaging-3.3 reactos/dll/win32/atl100 # Synced to WineStaging-3.3 -reactos/dll/win32/avifil32 # Synced to Wine-3.0 +reactos/dll/win32/avifil32 # Synced to WineStaging-3.3 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-3.0

6 years, 8 months

← Newer
1
...
33
34
35
36
37
38
39
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2018