Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 56769: [README.WINE] - Add missing win32 dlls
by tfaber＠svn.reactos.org 21 Jun '12

21 Jun '12

Author: tfaber Date: Thu Jun 21 07:51:21 2012 New Revision: 56769 URL: http://svn.reactos.org/svn/reactos?rev=56769&view=rev Log: [README.WINE] - Add missing win32 dlls 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] Thu Jun 21 07:51:21 2012 @@ -40,6 +40,8 @@ reactos/dll/directx/msdmo # Autosync reactos/dll/directx/qedit # Autosync reactos/dll/directx/quartz # Autosync +reactos/dll/win32/activeds # Synced to Wine-1.1.43? +reactos/dll/win32/actxprxy # Synced to Wine-1.3.29? reactos/dll/win32/advpack # Synced to Wine-1.5.4 reactos/dll/win32/atl # Synced to Wine-1.3.37 reactos/dll/win32/avifil32 # Synced to Wine-1.3.37 @@ -60,6 +62,7 @@ reactos/dll/win32/dbghelp # Synced to Wine-1.3.37 reactos/dll/win32/dciman32 # Synced to Wine-1.5.4 reactos/dll/win32/dwmapi # Synced to Wine-1.5.4 +reactos/dll/win32/faultrep # Synced to Wine-1.5.4 reactos/dll/win32/fusion # Synced to Wine-1.5.4 reactos/dll/win32/gdiplus # Synced to Wine-1.5.4 reactos/dll/win32/hhctrl.ocx # Autosync @@ -79,6 +82,7 @@ reactos/dll/win32/itircl # Synced to Wine-1.5.4 reactos/dll/win32/itss # Synced to Wine-1.5.4 reactos/dll/win32/jscript # Autosync +reactos/dll/win32/localspl # Synced to Wine-1.1.14? reactos/dll/win32/localspl # Autosync reactos/dll/win32/localui # Autosync reactos/dll/win32/lz32 # Synced to Wine-1.5.4 @@ -112,7 +116,8 @@ reactos/dll/win32/mssign32 # Synced to Wine-1.5.4 reactos/dll/win32/mssip32 # Synced to Wine-1.5.4 reactos/dll/win32/mstask # Synced to Wine-1.5.4 -reactos/dll/win32/msvcrt20 # Autosync +reactos/dll/win32/msvcrt20 # Out of sync +reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Autosync reactos/dll/win32/msvidc32 # Autosync reactos/dll/win32/msxml3 # Autosync @@ -136,6 +141,8 @@ reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.5.4 reactos/dll/win32/pstorec # Synced to Wine-1.5.4 +reactos/dll/win32/qmgr # Synced to Wine-1.2-rc5? +reactos/dll/win32/qmgrprxy # Synced to Wine-1.14? reactos/dll/win32/query # Synced to Wine-1.5.4 reactos/dll/win32/rasapi32 # Synced to Wine-1.5.4 reactos/dll/win32/resutils # Synced to Wine-1.5.4 @@ -150,8 +157,9 @@ reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to Wine-1.5.4 reactos/dll/win32/setupapi # Forked at Wine-20050524 +reactos/dll/win32/shdoclc # Synced to Wine-1.2 +reactos/dll/win32/shdocvw # Autosync reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shdocvw # Autosync reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Autosync reactos/dll/win32/slbcsp # Synced to Wine-1.5.4 @@ -165,6 +173,7 @@ reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/traffic # Synced to Wine-1.5.4 reactos/dll/win32/twain_32 # Out of sync +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.5.4 reactos/dll/win32/url # Synced to Wine-1.5.4 reactos/dll/win32/urlmon # Autosync @@ -174,6 +183,7 @@ reactos/dll/win32/wer # Autosync reactos/dll/win32/windowscodecs # Autosync reactos/dll/win32/winemp3.acm # Synced to Wine-1.5.4 +reactos/dll/win32/wing32 # Out of sync reactos/dll/win32/winhttp # Autosync reactos/dll/win32/wininet # Synced to Wine-1.5.4 reactos/dll/win32/winmm # Forked at Wine-20050628

1 0

[tfaber] 56768: [LZ32_WINETEST] - Sync to Wine 1.5.4
by tfaber＠svn.reactos.org 20 Jun '12

20 Jun '12

Author: tfaber Date: Wed Jun 20 23:34:55 2012 New Revision: 56768 URL: http://svn.reactos.org/svn/reactos?rev=56768&view=rev Log: [LZ32_WINETEST] - Sync to Wine 1.5.4 Modified: trunk/rostests/winetests/lz32/CMakeLists.txt trunk/rostests/winetests/lz32/lzexpand_main.c Modified: trunk/rostests/winetests/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/lz32/CMakeLists… ============================================================================== --- trunk/rostests/winetests/lz32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/lz32/CMakeLists.txt [iso-8859-1] Wed Jun 20 23:34:55 2012 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) add_executable(lz32_winetest lzexpand_main.c testlist.c) target_link_libraries(lz32_winetest wine) Modified: trunk/rostests/winetests/lz32/lzexpand_main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/lz32/lzexpand_m… ============================================================================== --- trunk/rostests/winetests/lz32/lzexpand_main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/lz32/lzexpand_main.c [iso-8859-1] Wed Jun 20 23:34:55 2012 @@ -140,27 +140,15 @@ check for the file "foo.xx_" and open that -- at least on some operating systems. Doesn't seem to on my copy of Win98. */ - if(file != LZERROR_BADINHANDLE) { - ok(file >= 0, "LZOpenFileA returns negative file descriptor for '%s'\n", filename); - ok(test.cBytes == sizeof(OFSTRUCT), - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", - test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); - LZClose(file); - } else { /* Win9x */ - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); - ok(test.cBytes == 0xA5, - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == ERROR_FILE_NOT_FOUND, - "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, filled_0xA5); - } + ok(file >= 0, "LZOpenFileA returns negative file descriptor for '%s'\n", filename); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", + test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); + LZClose(file); memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); memset(&test, 0xA5, sizeof(test)); @@ -169,29 +157,15 @@ /* b, using dotless file name. */ file = LZOpenFileA(dotless, &test, OF_EXIST); - if(file != LZERROR_BADINHANDLE) { - ok(file >= 0, "LZOpenFileA returns negative file descriptor for '%s'\n", dotless); - ok(test.cBytes == sizeof(OFSTRUCT), - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", - test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); - LZClose(file); - } else { /* Win9x */ - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); - todo_wine - ok(test.cBytes == 0xA5, - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == ERROR_FILE_NOT_FOUND, - "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - todo_wine - ok(strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, filled_0xA5); - } + ok(file >= 0, "LZOpenFileA returns negative file descriptor for '%s'\n", dotless); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", + test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); + LZClose(file); memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); memset(&test, 0xA5, sizeof(test)); @@ -200,27 +174,15 @@ /* c, using extensionless file name. */ file = LZOpenFileA(extless, &test, OF_EXIST); - if(file != LZERROR_BADINHANDLE) { - ok(file >= 0, "LZOpenFileA returns negative file descriptor for '%s'\n", extless); - ok(test.cBytes == sizeof(OFSTRUCT), - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", - test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); - LZClose(file); - } else { /* Win9x */ - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); - ok(test.cBytes == 0xA5, - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == ERROR_FILE_NOT_FOUND, - "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, filled_0xA5); - } + ok(file >= 0, "LZOpenFileA returns negative file descriptor for '%s'\n", extless); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", + test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); + LZClose(file); memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); memset(&test, 0xA5, sizeof(test)); @@ -230,13 +192,10 @@ /* d, using underscore-terminated file name. */ file = LZOpenFileA(_terminated, &test, OF_EXIST); ok(file >= 0, "LZOpenFileA failed on switching to a compressed file name\n"); - ok(test.cBytes == sizeof(OFSTRUCT) || - broken(test.cBytes == FIELD_OFFSET(OFSTRUCT, szPathName) + lstrlenA(test.szPathName)), /* win9x */ - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.cBytes == sizeof(OFSTRUCT), "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0 || - lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", test.szPathName, expected, short_expected); LZClose(file); @@ -275,8 +234,7 @@ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0 || - strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, /* Win9x */ + ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", test.szPathName, expected, filled_0xA5); @@ -296,8 +254,7 @@ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0 || - strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, /* Win9x */ + ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", test.szPathName, expected, filled_0xA5); @@ -317,8 +274,7 @@ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0 || - strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, /* Win9x */ + ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", test.szPathName, expected, filled_0xA5); @@ -338,8 +294,7 @@ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0 || - strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, /* Win9x */ + ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", test.szPathName, expected, filled_0xA5); } @@ -370,8 +325,7 @@ ok(file >= 0, "LZOpenFileA failed on creation\n"); ok(test.cBytes == sizeof(OFSTRUCT), "LZOpenFileA set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == ERROR_SUCCESS || - broken(test.nErrCode != ERROR_SUCCESS), /* win9x */ + ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s'\n", @@ -389,13 +343,11 @@ /* a, for reading. */ file = LZOpenFileA(filename_, &test, OF_READ); ok(file >= 0, "LZOpenFileA failed on read\n"); - ok(test.cBytes == sizeof(OFSTRUCT) || - broken(test.cBytes == FIELD_OFFSET(OFSTRUCT, szPathName) + lstrlenA(test.szPathName)), /* win9x */ + ok(test.cBytes == sizeof(OFSTRUCT), "LZOpenFileA set test.cBytes to %d '%s'('%s')\n", test.cBytes, expected, short_expected); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0 || - lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", test.szPathName, expected, short_expected); LZClose(file); @@ -405,13 +357,11 @@ /* b, for writing. */ file = LZOpenFileA(filename_, &test, OF_WRITE); ok(file >= 0, "LZOpenFileA failed on write\n"); - ok(test.cBytes == sizeof(OFSTRUCT) || - broken(test.cBytes == FIELD_OFFSET(OFSTRUCT, szPathName) + lstrlenA(test.szPathName)), /* win9x */ - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == ERROR_SUCCESS, - "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0 || - lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", test.szPathName, expected, short_expected); LZClose(file); @@ -421,13 +371,11 @@ /* c, for reading and writing. */ file = LZOpenFileA(filename_, &test, OF_READWRITE); ok(file >= 0, "LZOpenFileA failed on read/write\n"); - ok(test.cBytes == sizeof(OFSTRUCT) || - broken(test.cBytes == FIELD_OFFSET(OFSTRUCT, szPathName) + lstrlenA(test.szPathName)), /* win9x */ - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == ERROR_SUCCESS, - "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0 || - lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", test.szPathName, expected, short_expected); LZClose(file); @@ -437,13 +385,11 @@ /* d, for checking file existence. */ file = LZOpenFileA(filename_, &test, OF_EXIST); ok(file >= 0, "LZOpenFileA failed on read/write\n"); - ok(test.cBytes == sizeof(OFSTRUCT) || - broken(test.cBytes == FIELD_OFFSET(OFSTRUCT, szPathName) + lstrlenA(test.szPathName)), /* win9x */ - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == ERROR_SUCCESS, - "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0 || - lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", test.szPathName, expected, short_expected); LZClose(file); @@ -453,13 +399,11 @@ /* Delete the file then make sure it doesn't exist anymore. */ file = LZOpenFileA(filename_, &test, OF_DELETE); ok(file >= 0, "LZOpenFileA failed on delete\n"); - ok(test.cBytes == sizeof(OFSTRUCT) || - broken(test.cBytes == FIELD_OFFSET(OFSTRUCT, szPathName) + lstrlenA(test.szPathName)), /* win9x */ - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == ERROR_SUCCESS, - "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0 || - lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", test.szPathName, expected, short_expected); LZClose(file);

1 0

[tfaber] 56767: [RICHED32_WINETEST] - Sync to Wine 1.5.4
by tfaber＠svn.reactos.org 20 Jun '12

20 Jun '12

Author: tfaber Date: Wed Jun 20 23:22:27 2012 New Revision: 56767 URL: http://svn.reactos.org/svn/reactos?rev=56767&view=rev Log: [RICHED32_WINETEST] - Sync to Wine 1.5.4 Modified: trunk/rostests/winetests/riched32/CMakeLists.txt trunk/rostests/winetests/riched32/editor.c trunk/rostests/winetests/riched32/testlist.c Modified: trunk/rostests/winetests/riched32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched32/CMakeL… ============================================================================== --- trunk/rostests/winetests/riched32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/riched32/CMakeLists.txt [iso-8859-1] Wed Jun 20 23:22:27 2012 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) add_executable(riched32_winetest editor.c testlist.c) target_link_libraries(riched32_winetest wine) Modified: trunk/rostests/winetests/riched32/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched32/editor… ============================================================================== --- trunk/rostests/winetests/riched32/editor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched32/editor.c [iso-8859-1] Wed Jun 20 23:22:27 2012 @@ -22,7 +22,7 @@ */ #include <stdarg.h> -#include <assert.h> +#include <stdio.h> #include <windef.h> #include <winbase.h> #include <wingdi.h> @@ -38,7 +38,7 @@ static HWND new_window(LPCTSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; hwnd = CreateWindow(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL - |WS_VISIBLE, 0, 0, 200, 60, parent, NULL, + |WS_VISIBLE, 0, 0, 500, 60, parent, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); return hwnd; @@ -48,32 +48,42 @@ return new_window(RICHEDIT_CLASS10A, ES_MULTILINE, parent); } +static BOOL is_rtl(void) { + LOCALESIGNATURE sig; + + return (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, + (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && + (sig.lsUsb[3] & 0x08000000) != 0); +} + static void test_WM_SETTEXT(void) { static const struct { const char *itemtext; DWORD lines; + DWORD lines_rtl; DWORD lines_broken; } testitems[] = { - { "TestSomeText", 1}, - { "TestSomeText\r", 1}, - { "TestSomeText\rSomeMoreText\r", 2, 1}, /* NT4 and below */ - { "TestSomeText\n\nTestSomeText", 3}, - { "TestSomeText\r\r\nTestSomeText", 2}, - { "TestSomeText\r\r\n\rTestSomeText", 3, 2}, /* NT4 and below */ - { "TestSomeText\r\n\r\r\n\rTestSomeText", 4, 3}, /* NT4 and below */ - { "TestSomeText\r\n" ,2}, - { "TestSomeText\r\nSomeMoreText\r\n", 3}, - { "TestSomeText\r\n\r\nTestSomeText", 3}, - { "TestSomeText TestSomeText" ,1}, - { "TestSomeText \r\nTestSomeText", 2}, - { "TestSomeText\r\n \r\nTestSomeText", 3}, - { "TestSomeText\n", 2}, - { "TestSomeText\r\r\r", 3, 1}, /* NT4 and below */ - { "TestSomeText\r\r\rSomeMoreText", 4, 2} /* NT4 and below */ + { "TestSomeText", 1, 1}, + { "TestSomeText\r", 1, 1}, + { "TestSomeText\rSomeMoreText\r", 2, 1, 1}, /* NT4 and below */ + { "TestSomeText\n\nTestSomeText", 3, 3}, + { "TestSomeText\r\r\nTestSomeText", 2, 2}, + { "TestSomeText\r\r\n\rTestSomeText", 3, 2, 2}, /* NT4 and below */ + { "TestSomeText\r\n\r\r\n\rTestSomeText", 4, 3, 3}, /* NT4 and below */ + { "TestSomeText\r\n", 2, 2}, + { "TestSomeText\r\nSomeMoreText\r\n", 3, 3}, + { "TestSomeText\r\n\r\nTestSomeText", 3, 3}, + { "TestSomeText TestSomeText", 1, 1}, + { "TestSomeText \r\nTestSomeText", 2, 2}, + { "TestSomeText\r\n \r\nTestSomeText", 3, 3}, + { "TestSomeText\n", 2, 2}, + { "TestSomeText\r\r\r", 3, 1, 1}, /* NT4 and below */ + { "TestSomeText\r\r\rSomeMoreText", 4, 1, 1} /* NT4 and below */ }; HWND hwndRichEdit = new_richedit(NULL); int i; + BOOL rtl = is_rtl(); /* This test attempts to show that WM_SETTEXT on a riched32 control does not * attempt to modify the text that is pasted into the control, and should @@ -88,6 +98,8 @@ * is, a run of \r{N} without a terminating \n is considered N line breaks * - \r at the end of the text is NOT a line break. This differs from riched20, * where \r at the end of the text is a proper line break. + * However, on RTL language versions, \r is simply skipped and never used + * for line breaking (only \n adds a line break) */ for (i = 0; i < sizeof(testitems)/sizeof(testitems[0]); i++) { @@ -105,7 +117,7 @@ ok (result == 0, "[%d] WM_SETTEXT round trip: strcmp = %ld\n", i, result); result = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); - ok (result == testitems[i].lines || + ok (result == (rtl ? testitems[i].lines_rtl : testitems[i].lines) || broken(testitems[i].lines_broken && result == testitems[i].lines_broken), "[%d] EM_GETLINECOUNT returned %ld, expected %d\n", i, result, testitems[i].lines); } @@ -374,6 +386,7 @@ "\r\r\n" "bar\n"; BOOL broken_os = FALSE; + BOOL rtl = is_rtl(); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); linecount = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); @@ -421,9 +434,15 @@ { ok(!strncmp(dest, gl_text, expected_bytes_written), "%d: expected_bytes_written=%d\n", i, expected_bytes_written); - ok(!strncmp(dest + expected_bytes_written, origdest - + expected_bytes_written, nBuf - expected_bytes_written), - "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + if (! rtl || expected_bytes_written == gl[i].buffer_len) + ok(!strncmp(dest + expected_bytes_written, origdest + + expected_bytes_written, nBuf - expected_bytes_written), + "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + else + ok(dest[expected_bytes_written] == 0 && + !strncmp(dest + expected_bytes_written + 1, origdest + + expected_bytes_written + 1, nBuf - (expected_bytes_written + 1)), + "%d: expected_bytes_written=%d\n", i, expected_bytes_written); } } @@ -566,7 +585,7 @@ }; -struct find_s find_tests[] = { +static struct find_s find_tests[] = { /* Find in empty text */ {0, -1, "foo", FR_DOWN, -1}, {0, -1, "foo", 0, -1}, @@ -575,7 +594,7 @@ {5, 20, "foo", FR_DOWN, -1} }; -struct find_s find_tests2[] = { +static struct find_s find_tests2[] = { /* No-result find */ {0, -1, "foo", FR_DOWN | FR_MATCHCASE, -1}, {5, 20, "WINE", FR_DOWN | FR_MATCHCASE, -1}, @@ -642,7 +661,7 @@ {4, -1, "INEW", 0, 10}, }; -struct find_s find_tests3[] = { +static struct find_s find_tests3[] = { /* Searching for end of line characters */ {0, -1, "t\r\r\ns", FR_DOWN | FR_MATCHCASE, 4}, {6, -1, "\r\n", FR_DOWN | FR_MATCHCASE, 6}, @@ -730,6 +749,7 @@ LRESULT result; unsigned int height = 0; int xpos = 0; + int xpos_rtl_adjusted = 0; static const char text[] = "aa\n" "this is a long line of text that should be longer than the " "control's width\n" @@ -772,17 +792,18 @@ broken(pl.x == 0), /* Win9x, WinME and NT4 */ "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); xpos = pl.x; + xpos_rtl_adjusted = xpos + (is_rtl() ? 7 : 0); } else if (i == 1) { ok(pl.y > 0, "EM_POSFROMCHAR reports y=%d, expected > 0\n", pl.y); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); height = pl.y; } else { ok(pl.y == i * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, i * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); } } @@ -790,13 +811,14 @@ result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 50 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 50 * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, 50 * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); /* Testing position way past end of text */ result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 55 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 50 * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, 50 * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + + ok(pl.x == xpos_rtl_adjusted, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos_rtl_adjusted); /* Testing that vertical scrolling does, in fact, have an effect on EM_POSFROMCHAR */ @@ -809,20 +831,20 @@ ok(pl.y == (i - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, (i - 1) * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); } /* Testing position at end of text */ result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 50 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == (50 - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, (50 - 1) * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); /* Testing position way past end of text */ result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 55 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == (50 - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, (50 - 1) * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos_rtl_adjusted, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos_rtl_adjusted); /* Testing that horizontal scrolling does, in fact, have an effect on EM_POSFROMCHAR */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); @@ -844,7 +866,7 @@ /* Fails on builtin because horizontal scrollbar is not being shown */ ok(pl.x < xpos || broken(pl.x == xpos), /* Win9x, WinME and NT4 */ - "EM_POSFROMCHAR reports x=%hd, expected value less than %d\n", pl.x, xpos); + "EM_POSFROMCHAR reports x=%d, expected value less than %d\n", pl.x, xpos); } DestroyWindow(hwndRichEdit); } @@ -1059,10 +1081,130 @@ DestroyWindow(hwnd); } +static void simulate_typing_characters(HWND hwnd, const char* szChars) +{ + int ret; + + while (*szChars != '\0') { + SendMessageA(hwnd, WM_KEYDOWN, *szChars, 1); + ret = SendMessageA(hwnd, WM_CHAR, *szChars, 1); + ok(ret == 0, "WM_CHAR('%c') ret=%d\n", *szChars, ret); + SendMessageA(hwnd, WM_KEYUP, *szChars, 1); + szChars++; + } +} + +/* + * This test attempts to show the effect of enter on a richedit + * control v1.0 inserts CRLF whereas for higher versions it only + * inserts CR. If shows that EM_GETTEXTEX with GT_USECRLF == WM_GETTEXT + * and also shows that GT_USECRLF has no effect in richedit 1.0, but + * does for higher. The same test is cloned in riched32 and riched20. + */ +static void test_enter(void) +{ + static const struct { + const char *initialtext; + const int cursor; + const char *expectedtext; + } testenteritems[] = { + { "aaabbb\r\n", 3, "aaa\r\nbbb\r\n"}, + { "aaabbb\r\n", 6, "aaabbb\r\n\r\n"}, + { "aa\rabbb\r\n", 7, "aa\rabbb\r\n\r\n"}, + { "aa\rabbb\r\n", 3, "aa\r\r\nabbb\r\n"}, + { "aa\rabbb\r\n", 2, "aa\r\n\rabbb\r\n"} + }; + + char expectedbuf[1024]; + char resultbuf[1024]; + HWND hwndRichEdit = new_richedit(NULL); + UINT i,j; + + for (i = 0; i < sizeof(testenteritems)/sizeof(testenteritems[0]); i++) { + + char buf[1024] = {0}; + LRESULT result; + GETTEXTEX getText; + const char *expected; + + /* Set the text to the initial text */ + result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) testenteritems[i].initialtext); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + + /* Send Enter */ + SendMessage(hwndRichEdit, EM_SETSEL, testenteritems[i].cursor, testenteritems[i].cursor); + simulate_typing_characters(hwndRichEdit, "\r"); + + /* 1. Retrieve with WM_GETTEXT */ + buf[0] = 0x00; + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); + expected = testenteritems[i].expectedtext; + + resultbuf[0]=0x00; + for (j = 0; j < (UINT)result; j++) + sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); + expectedbuf[0] = '\0'; + for (j = 0; j < strlen(expected); j++) + sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + + result = strcmp(expected, buf); + ok (result == 0, + "[%d] WM_GETTEXT unexpected '%s' expected '%s'\n", + i, resultbuf, expectedbuf); + + /* 2. Retrieve with EM_GETTEXTEX, GT_DEFAULT */ + getText.cb = sizeof(buf); + getText.flags = GT_DEFAULT; + getText.codepage = CP_ACP; + getText.lpDefaultChar = NULL; + getText.lpUsedDefChar = NULL; + buf[0] = 0x00; + result = SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + expected = testenteritems[i].expectedtext; + + resultbuf[0]=0x00; + for (j = 0; j < (UINT)result; j++) + sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); + expectedbuf[0] = '\0'; + for (j = 0; j < strlen(expected); j++) + sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + + result = strcmp(expected, buf); + ok (result == 0 || broken(buf[0]==0x00 /* WinNT4 */), + "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", + i, resultbuf, expectedbuf); + + /* 3. Retrieve with EM_GETTEXTEX, GT_USECRLF */ + getText.cb = sizeof(buf); + getText.flags = GT_USECRLF; + getText.codepage = CP_ACP; + getText.lpDefaultChar = NULL; + getText.lpUsedDefChar = NULL; + buf[0] = 0x00; + result = SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + expected = testenteritems[i].expectedtext; + + resultbuf[0]=0x00; + for (j = 0; j < (UINT)result; j++) + sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); + expectedbuf[0] = '\0'; + for (j = 0; j < strlen(expected); j++) + sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + + result = strcmp(expected, buf); + ok (result == 0 || broken(buf[0]==0x00 /* WinNT4 */), + "[%d] EM_GETTEXTEX, GT_USECRLF unexpected '%s', expected '%s'\n", + i, resultbuf, expectedbuf); + } + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { MSG msg; time_t end; + BOOL ret; /* Must explicitly LoadLibrary(). The test has no references to functions in * RICHED32.DLL, so the linker doesn't actually link to it. */ @@ -1082,6 +1224,7 @@ test_word_wrap(); test_EM_GETOPTIONS(); test_autoscroll(); + test_enter(); /* Set the environment variable WINETEST_RICHED32 to keep windows * responsive and open for 30 seconds. This is useful for debugging. @@ -1101,5 +1244,6 @@ } OleFlushClipboard(); - ok(FreeLibrary(hmoduleRichEdit) != 0, "error: %d\n", (int) GetLastError()); -} + ret = FreeLibrary(hmoduleRichEdit); + ok(ret, "error: %u\n", GetLastError()); +} Modified: trunk/rostests/winetests/riched32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched32/testli… ============================================================================== --- trunk/rostests/winetests/riched32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched32/testlist.c [iso-8859-1] Wed Jun 20 23:22:27 2012 @@ -6,8 +6,10 @@ #define STANDALONE #include "wine/test.h" +extern void func_editor(void); const struct test winetest_testlist[] = { + { "editor", func_editor }, { 0, 0 } };

1 0

[tfaber] 56766: [IMM32][MSCTF] - Remove unused files [XINPUT1_3] - Move header file to PSDK, where it belongs [MLANG][OBJSEL] - Remove unneeded import library references [README.WINE] - Mark module...
by tfaber＠svn.reactos.org 20 Jun '12

20 Jun '12

Author: tfaber Date: Wed Jun 20 22:57:37 2012 New Revision: 56766 URL: http://svn.reactos.org/svn/reactos?rev=56766&view=rev Log: [IMM32][MSCTF] - Remove unused files [XINPUT1_3] - Move header file to PSDK, where it belongs [MLANG][OBJSEL] - Remove unneeded import library references [README.WINE] - Mark modules as synced to 1.5.4 if they are Added: trunk/reactos/include/psdk/xinput.h - copied, changed from r56745, trunk/reactos/dll/win32/xinput1_3/xinput.h Removed: trunk/reactos/dll/win32/imm32/imm.spec trunk/reactos/dll/win32/msctf/regsvr.c trunk/reactos/dll/win32/xinput1_3/xinput.h Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt trunk/reactos/dll/win32/msctf/CMakeLists.txt trunk/reactos/dll/win32/objsel/CMakeLists.txt trunk/reactos/media/doc/README.WINE Removed: trunk/reactos/dll/win32/imm32/imm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.spec?r… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm.spec (removed) @@ -1,54 +1,0 @@ -4 stub IMMGETDEFAULTIMEWND -7 stub IMMGETDESCRIPTIONA -8 stub IMMGETIMEFILENAMEA -9 stub IMMGETPROPERTY -11 stub IMMINSTALLIMEA -#15 stub ___EXPORTEDSTUB -17 stub IMMISIME -25 stub IMMGETHOTKEY -26 stub IMMSETHOTKEY -27 stub IMMSIMULATEHOTKEY -35 stub IMMCREATECONTEXT -36 stub IMMDESTROYCONTEXT -37 stub IMMGETCONTEXT -38 stub IMMRELEASECONTEXT -39 stub IMMASSOCIATECONTEXT -41 stub IMMASSOCIATECONTEXTEX -43 stub IMMGETCOMPOSITIONSTRINGA -44 stub IMMSETCOMPOSITIONSTRINGA -45 stub IMMGETCANDIDATELISTCOUNTA -46 stub IMMGETCANDIDATELISTA -47 stub IMMGETGUIDELINEA -51 stub IMMGETCONVERSIONSTATUS -52 stub IMMSETCONVERSIONSTATUS -53 stub IMMGETOPENSTATUS -54 stub IMMSETOPENSTATUS -55 stub IMMGETCOMPOSITIONFONTA -56 stub IMMSETCOMPOSITIONFONTA -61 stub IMMCONFIGUREIMEA -63 stub IMMESCAPEA -64 stub IMMGETCONVERSIONLISTA -65 stub IMMNOTIFYIME -71 stub IMMISUIMESSAGEA -72 stub IMMGENERATEMESSAGE -73 stub IMMGETVIRTUALKEY -87 stub IMMGETSTATUSWINDOWPOS -88 stub IMMSETSTATUSWINDOWPOS -89 stub IMMGETCOMPOSITIONWINDOW -90 stub IMMSETCOMPOSITIONWINDOW -91 stub IMMGETCANDIDATEWINDOW -92 stub IMMSETCANDIDATEWINDOW -95 stub IMMUNINSTALLIMEA -110 stub IMMLOCKIMC -111 stub IMMUNLOCKIMC -112 stub IMMGETIMCLOCKCOUNT -116 stub IMMCREATEIMCC -117 stub IMMDESTROYIMCC -118 stub IMMLOCKIMCC -119 stub IMMUNLOCKIMCC -120 stub IMMGETIMCCLOCKCOUNT -121 stub IMMRESIZEIMCC -122 stub IMMGETIMCCSIZE -#160 stub FT_IMMFTHKTHKCONNECTIONDATA -#161 stub IMM32THKCONNECTIONDATASL -180 stub IMMSYNCCONVERSION Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Wed Jun 20 22:57:37 2012 @@ -23,10 +23,9 @@ add_importlibs(mlang ole32 - user32 gdi32 advapi32 - msvcrt + msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/msctf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/CMakeLists.txt [iso-8859-1] Wed Jun 20 22:57:37 2012 @@ -5,8 +5,6 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(msctf.dll msctf.spec) Removed: trunk/reactos/dll/win32/msctf/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/regsvr.c?r… ============================================================================== --- trunk/reactos/dll/win32/msctf/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/regsvr.c (removed) @@ -1,518 +1,0 @@ -/* - * self-registerable dll functions for msctf - * - * Copyright (C) 2004 Stefan Leichter - * - * 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 - */ - -#include <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "winreg.h" -#include "winerror.h" - -#include "ole2.h" -#include "shlguid.h" -#include "msctf.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msctf); - -/* - * Near the bottom of this file are the exported DllRegisterServer and - * DllUnregisterServer, which make all this worthwhile. - */ - -/*********************************************************************** - * interface for self-registering - */ -struct regsvr_interface -{ - IID const *iid; /* NULL for end of list */ - LPCSTR name; /* can be NULL to omit */ - IID const *base_iid; /* can be NULL to omit */ - int num_methods; /* can be <0 to omit */ - CLSID const *ps_clsid; /* can be NULL to omit */ - CLSID const *ps_clsid32; /* can be NULL to omit */ -}; - -static HRESULT register_interfaces(struct regsvr_interface const *list); -static HRESULT unregister_interfaces(struct regsvr_interface const *list); - -struct regsvr_coclass -{ - CLSID const *clsid; /* NULL for end of list */ - LPCSTR name; /* can be NULL to omit */ - LPCSTR ips; /* can be NULL to omit */ - LPCSTR ips32; /* can be NULL to omit */ - LPCSTR ips32_tmodel; /* can be NULL to omit */ - LPCSTR progid; /* can be NULL to omit */ - LPCSTR viprogid; /* can be NULL to omit */ - LPCSTR progid_extra; /* can be NULL to omit */ -}; - -static HRESULT register_coclasses(struct regsvr_coclass const *list); -static HRESULT unregister_coclasses(struct regsvr_coclass const *list); - -/*********************************************************************** - * static string constants - */ -static WCHAR const interface_keyname[10] = { - 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; -static WCHAR const base_ifa_keyname[14] = { - 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', - 'e', 0 }; -static WCHAR const num_methods_keyname[11] = { - 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; -static WCHAR const ps_clsid_keyname[15] = { - 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', - 'i', 'd', 0 }; -static WCHAR const ps_clsid32_keyname[17] = { - 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', - 'i', 'd', '3', '2', 0 }; -static WCHAR const clsid_keyname[6] = { - 'C', 'L', 'S', 'I', 'D', 0 }; -static WCHAR const curver_keyname[7] = { - 'C', 'u', 'r', 'V', 'e', 'r', 0 }; -static WCHAR const ips_keyname[13] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - 0 }; -static WCHAR const ips32_keyname[15] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - '3', '2', 0 }; -static WCHAR const progid_keyname[7] = { - 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static WCHAR const viprogid_keyname[25] = { - 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', - 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', - 0 }; -static char const tmodel_valuename[] = "ThreadingModel"; - -/*********************************************************************** - * static helper functions - */ -static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); -static LONG register_key_defvalueW(HKEY base, WCHAR const *name, - WCHAR const *value); -static LONG register_key_defvalueA(HKEY base, WCHAR const *name, - char const *value); -static LONG register_progid(WCHAR const *clsid, - char const *progid, char const *curver_progid, - char const *name, char const *extra); - -/*********************************************************************** - * register_interfaces - */ -static HRESULT register_interfaces(struct regsvr_interface const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY interface_key; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->iid; ++list) { - WCHAR buf[39]; - HKEY iid_key; - - StringFromGUID2(list->iid, buf, 39); - res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_interface_key; - - if (list->name) { - res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, - (CONST BYTE*)(list->name), - strlen(list->name) + 1); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (list->base_iid) { - res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (0 <= list->num_methods) { - static WCHAR const fmt[3] = { '%', 'd', 0 }; - HKEY key; - - res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - - wsprintfW(buf, fmt, list->num_methods); - res = RegSetValueExW(key, NULL, 0, REG_SZ, - (CONST BYTE*)buf, - (lstrlenW(buf) + 1) * sizeof(WCHAR)); - RegCloseKey(key); - - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (list->ps_clsid) { - res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (list->ps_clsid32) { - res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - error_close_iid_key: - RegCloseKey(iid_key); - } - -error_close_interface_key: - RegCloseKey(interface_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_interfaces - */ -static HRESULT unregister_interfaces(struct regsvr_interface const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY interface_key; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, - KEY_READ | KEY_WRITE, &interface_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->iid; ++list) { - WCHAR buf[39]; - - StringFromGUID2(list->iid, buf, 39); - res = RegDeleteTreeW(interface_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - } - - RegCloseKey(interface_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * register_coclasses - */ -static HRESULT register_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - HKEY clsid_key; - - StringFromGUID2(list->clsid, buf, 39); - res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->name) { - res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, - (CONST BYTE*)(list->name), - strlen(list->name) + 1); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips) { - res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips32) { - HKEY ips32_key; - - res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, - &ips32_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, - (CONST BYTE*)list->ips32, - lstrlenA(list->ips32) + 1); - if (res == ERROR_SUCCESS && list->ips32_tmodel) - res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, - (CONST BYTE*)list->ips32_tmodel, - strlen(list->ips32_tmodel) + 1); - RegCloseKey(ips32_key); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->progid) { - res = register_key_defvalueA(clsid_key, progid_keyname, - list->progid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_progid(buf, list->progid, NULL, - list->name, list->progid_extra); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->viprogid) { - res = register_key_defvalueA(clsid_key, viprogid_keyname, - list->viprogid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_progid(buf, list->viprogid, list->progid, - list->name, list->progid_extra); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - error_close_clsid_key: - RegCloseKey(clsid_key); - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_coclasses - */ -static HRESULT unregister_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, - KEY_READ | KEY_WRITE, &coclass_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - - StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->progid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - } - - if (list->viprogid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - } - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * regsvr_key_guid - */ -static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) -{ - WCHAR buf[39]; - - StringFromGUID2(guid, buf, 39); - return register_key_defvalueW(base, name, buf); -} - -/*********************************************************************** - * regsvr_key_defvalueW - */ -static LONG register_key_defvalueW( - HKEY base, - WCHAR const *name, - WCHAR const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - (lstrlenW(value) + 1) * sizeof(WCHAR)); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * regsvr_key_defvalueA - */ -static LONG register_key_defvalueA( - HKEY base, - WCHAR const *name, - char const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - lstrlenA(value) + 1); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * regsvr_progid - */ -static LONG register_progid( - WCHAR const *clsid, - char const *progid, - char const *curver_progid, - char const *name, - char const *extra) -{ - LONG res; - HKEY progid_key; - - res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &progid_key, NULL); - if (res != ERROR_SUCCESS) return res; - - if (name) { - res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, - (CONST BYTE*)name, strlen(name) + 1); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (clsid) { - res = register_key_defvalueW(progid_key, clsid_keyname, clsid); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (curver_progid) { - res = register_key_defvalueA(progid_key, curver_keyname, - curver_progid); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (extra) { - HKEY extra_key; - - res = RegCreateKeyExA(progid_key, extra, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &extra_key, NULL); - if (res == ERROR_SUCCESS) - RegCloseKey(extra_key); - } - -error_close_progid_key: - RegCloseKey(progid_key); - return res; -} - -/*********************************************************************** - * coclass list - */ -static struct regsvr_coclass const coclass_list[] = { - { - &CLSID_TF_ThreadMgr, - "TF_ThreadMgr", - NULL, - "msctf.dll", - "Apartment" - }, - { - &CLSID_TF_InputProcessorProfiles, - "TF_InputProcessorProfiles", - NULL, - "msctf.dll", - "Apartment" - }, - { - &CLSID_TF_CategoryMgr, - "TF_CategoryMgr", - NULL, - "msctf.dll", - "Apartment" - }, - { - &CLSID_TF_LangBarMgr, - "TF_LangBarMgr", - NULL, - "msctf.dll", - "Apartment" - }, - { - &CLSID_TF_DisplayAttributeMgr, - "TF_DisplayAttributeMgr", - NULL, - "msctf.dll", - "Apartment" - }, - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * interface list - */ - -static struct regsvr_interface const interface_list[] = { - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * DllRegisterServer (MSCTF.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = register_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = register_interfaces(interface_list); - return hr; -} - -/*********************************************************************** - * DllUnregisterServer (MSCTF.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = unregister_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = unregister_interfaces(interface_list); - return hr; -} Modified: trunk/reactos/dll/win32/objsel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/objsel/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/objsel/CMakeLists.txt [iso-8859-1] Wed Jun 20 22:57:37 2012 @@ -6,7 +6,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() spec2def(objsel.dll objsel.spec) list(APPEND SOURCE @@ -23,7 +22,6 @@ add_importlibs(objsel ole32 - user32 advapi32 msvcrt kernel32 Removed: trunk/reactos/dll/win32/xinput1_3/xinput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/xinput.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_3/xinput.h (removed) @@ -1,239 +1,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2008 Andrew Fenn - * - * 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 - */ - -#ifndef __WINE_XINPUT_H -#define __WINE_XINPUT_H - -#include <windef.h> - -/* - * Bitmasks for the joysticks buttons, determines what has - * been pressed on the joystick, these need to be mapped - * to whatever device you're using instead of an xbox 360 - * joystick - */ - -#define XINPUT_GAMEPAD_DPAD_UP 0x0001 -#define XINPUT_GAMEPAD_DPAD_DOWN 0x0002 -#define XINPUT_GAMEPAD_DPAD_LEFT 0x0004 -#define XINPUT_GAMEPAD_DPAD_RIGHT 0x0008 -#define XINPUT_GAMEPAD_START 0x0010 -#define XINPUT_GAMEPAD_BACK 0x0020 -#define XINPUT_GAMEPAD_LEFT_THUMB 0x0040 -#define XINPUT_GAMEPAD_RIGHT_THUMB 0x0080 -#define XINPUT_GAMEPAD_LEFT_SHOULDER 0x0100 -#define XINPUT_GAMEPAD_RIGHT_SHOULDER 0x0200 -#define XINPUT_GAMEPAD_A 0x1000 -#define XINPUT_GAMEPAD_B 0x2000 -#define XINPUT_GAMEPAD_X 0x4000 -#define XINPUT_GAMEPAD_Y 0x8000 - -/* - * Defines the flags used to determine if the user is pushing - * down on a button, not holding a button, etc - */ - -#define XINPUT_KEYSTROKE_KEYDOWN 0x0001 -#define XINPUT_KEYSTROKE_KEYUP 0x0002 -#define XINPUT_KEYSTROKE_REPEAT 0x0004 - -/* - * Defines the codes which are returned by XInputGetKeystroke - */ - -#define VK_PAD_A 0x5800 -#define VK_PAD_B 0x5801 -#define VK_PAD_X 0x5802 -#define VK_PAD_Y 0x5803 -#define VK_PAD_RSHOULDER 0x5804 -#define VK_PAD_LSHOULDER 0x5805 -#define VK_PAD_LTRIGGER 0x5806 -#define VK_PAD_RTRIGGER 0x5807 -#define VK_PAD_DPAD_UP 0x5810 -#define VK_PAD_DPAD_DOWN 0x5811 -#define VK_PAD_DPAD_LEFT 0x5812 -#define VK_PAD_DPAD_RIGHT 0x5813 -#define VK_PAD_START 0x5814 -#define VK_PAD_BACK 0x5815 -#define VK_PAD_LTHUMB_PRESS 0x5816 -#define VK_PAD_RTHUMB_PRESS 0x5817 -#define VK_PAD_LTHUMB_UP 0x5820 -#define VK_PAD_LTHUMB_DOWN 0x5821 -#define VK_PAD_LTHUMB_RIGHT 0x5822 -#define VK_PAD_LTHUMB_LEFT 0x5823 -#define VK_PAD_LTHUMB_UPLEFT 0x5824 -#define VK_PAD_LTHUMB_UPRIGHT 0x5825 -#define VK_PAD_LTHUMB_DOWNRIGHT 0x5826 -#define VK_PAD_LTHUMB_DOWNLEFT 0x5827 -#define VK_PAD_RTHUMB_UP 0x5830 -#define VK_PAD_RTHUMB_DOWN 0x5831 -#define VK_PAD_RTHUMB_RIGHT 0x5832 -#define VK_PAD_RTHUMB_LEFT 0x5833 -#define VK_PAD_RTHUMB_UPLEFT 0x5834 -#define VK_PAD_RTHUMB_UPRIGHT 0x5835 -#define VK_PAD_RTHUMB_DOWNRIGHT 0x5836 -#define VK_PAD_RTHUMB_DOWNLEFT 0x5837 - -/* - * Deadzones are for analogue joystick controls on the joypad - * which determine when input should be assumed to be in the - * middle of the pad. This is a threshold to stop a joypad - * controlling the game when the player isn't touching the - * controls. - */ - -#define XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE 7849 -#define XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE 8689 -#define XINPUT_GAMEPAD_TRIGGER_THRESHOLD 30 - - -/* - * Defines what type of abilities the type of joystick has - * DEVTYPE_GAMEPAD is avaliable for all joysticks, however - * there may be more specfic identifiers for other joysticks - * which are being used. - */ - -#define XINPUT_DEVTYPE_GAMEPAD 0x01 -#define XINPUT_DEVSUBTYPE_GAMEPAD 0x01 -#define XINPUT_DEVSUBTYPE_WHEEL 0x02 -#define XINPUT_DEVSUBTYPE_ARCADE_STICK 0x03 -#define XINPUT_DEVSUBTYPE_FLIGHT_SICK 0x04 -#define XINPUT_DEVSUBTYPE_DANCE_PAD 0x05 -#define XINPUT_DEVSUBTYPE_GUITAR 0x06 -#define XINPUT_DEVSUBTYPE_DRUM_KIT 0x08 - -/* - * These are used with the XInputGetCapabilities function to - * determine the abilities to the joystick which has been - * plugged in. - */ - -#define XINPUT_CAPS_VOICE_SUPPORTED 0x0004 -#define XINPUT_FLAG_GAMEPAD 0x00000001 - -/* - * Defines the status of the battery if one is used in the - * attached joystick. The first two define if the joystick - * supports a battery. Disconnected means that the joystick - * isn't connected. Wired shows that the joystick is a wired - * joystick. - */ - -#define BATTERY_DEVTYPE_GAMEPAD 0x00 -#define BATTERY_DEVTYPE_HEADSET 0x01 -#define BATTERY_TYPE_DISCONNECTED 0x00 -#define BATTERY_TYPE_WIRED 0x01 -#define BATTERY_TYPE_ALKALINE 0x02 -#define BATTERY_TYPE_NIMH 0x03 -#define BATTERY_TYPE_UNKNOWN 0xFF -#define BATTERY_LEVEL_EMPTY 0x00 -#define BATTERY_LEVEL_LOW 0x01 -#define BATTERY_LEVEL_MEDIUM 0x02 -#define BATTERY_LEVEL_FULL 0x03 - -/* - * How many joysticks can be used with this library. Games that - * use the xinput library will not go over this number. - */ - -#define XUSER_MAX_COUNT 4 -#define XUSER_INDEX_ANY 0x000000FF - -/* - * Defines the structure of an xbox 360 joystick. - */ - -typedef struct _XINPUT_GAMEPAD { - WORD wButtons; - BYTE bLeftTrigger; - BYTE bRightTrigger; - SHORT sThumbLX; - SHORT sThumbLY; - SHORT sThumbRX; - SHORT sThumbRY; -} XINPUT_GAMEPAD, *PXINPUT_GAMEPAD; - -typedef struct _XINPUT_STATE { - DWORD dwPacketNumber; - XINPUT_GAMEPAD Gamepad; -} XINPUT_STATE, *PXINPUT_STATE; - -/* - * Defines the structure of how much vibration is set on both the - * right and left motors in a joystick. If you're not using a 360 - * joystick you will have to map these to your device. - */ - -typedef struct _XINPUT_VIBRATION { - WORD wLeftMotorSpeed; - WORD wRightMotorSpeed; -} XINPUT_VIBRATION, *PXINPUT_VIBRATION; - -/* - * Defines the structure for what kind of abilities the joystick has - * such abilites are things such as if the joystick has the ability - * to send and receive audio, if the joystick is infact a driving - * wheel or perhaps if the joystick is some kind of dance pad or - * guitar. - */ - -typedef struct _XINPUT_CAPABILITIES { - BYTE Type; - BYTE SubType; - WORD Flags; - XINPUT_GAMEPAD Gamepad; - XINPUT_VIBRATION Vibration; -} XINPUT_CAPABILITIES, *PXINPUT_CAPABILITIES; - -/* - * Defines the structure for a joystick input event which is - * retrieved using the function XInputGetKeystroke - */ -typedef struct _XINPUT_KEYSTROKE { - WORD VirtualKey; - WCHAR Unicode; - WORD Flags; - BYTE UserIndex; - BYTE HidCode; -} XINPUT_KEYSTROKE, *PXINPUT_KEYSTROKE; - -typedef struct _XINPUT_BATTERY_INFORMATION -{ - BYTE BatteryType; - BYTE BatteryLevel; -} XINPUT_BATTERY_INFORMATION, *PXINPUT_BATTERY_INFORMATION; - -#ifdef __cplusplus -extern "C" { -#endif - -void WINAPI XInputEnable(BOOL); -DWORD WINAPI XInputSetState(DWORD, XINPUT_VIBRATION*); -DWORD WINAPI XInputGetState(DWORD, XINPUT_STATE*); -DWORD WINAPI XInputGetKeystroke(DWORD, DWORD, PXINPUT_KEYSTROKE); -DWORD WINAPI XInputGetCapabilities(DWORD, DWORD, XINPUT_CAPABILITIES*); -DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD, GUID*, GUID*); -DWORD WINAPI XInputGetBatteryInformation(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*); - -#ifdef __cplusplus -} -#endif - -#endif /* __WINE_XINPUT_H */ Copied: trunk/reactos/include/psdk/xinput.h (from r56745, trunk/reactos/dll/win32/xinput1_3/xinput.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xinput.h?p2=t… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/xinput.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/xinput.h [iso-8859-1] Wed Jun 20 22:57:37 2012 @@ -105,8 +105,8 @@ /* * Defines what type of abilities the type of joystick has - * DEVTYPE_GAMEPAD is avaliable for all joysticks, however - * there may be more specfic identifiers for other joysticks + * DEVTYPE_GAMEPAD is available for all joysticks, however + * there may be more specific identifiers for other joysticks * which are being used. */ @@ -188,8 +188,8 @@ /* * Defines the structure for what kind of abilities the joystick has - * such abilites are things such as if the joystick has the ability - * to send and receive audio, if the joystick is infact a driving + * such abilities are things such as if the joystick has the ability + * to send and receive audio, if the joystick is in fact a driving * wheel or perhaps if the joystick is some kind of dance pad or * guitar. */ 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 Jun 20 22:57:37 2012 @@ -40,17 +40,17 @@ reactos/dll/directx/msdmo # Autosync reactos/dll/directx/qedit # Autosync reactos/dll/directx/quartz # Autosync -reactos/dll/win32/advpack # Synced to Wine-1.3.37 +reactos/dll/win32/advpack # Synced to Wine-1.5.4 reactos/dll/win32/atl # Synced to Wine-1.3.37 reactos/dll/win32/avifil32 # Synced to Wine-1.3.37 -reactos/dll/win32/bcrypt # Synced to Wine-1.3.37 +reactos/dll/win32/bcrypt # Synced to Wine-1.5.4 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to Wine-1.3.37 -reactos/dll/win32/clusapi # Synced to Wine-1.3.37 -reactos/dll/win32/comcat # Synced to Wine-1.3.37 +reactos/dll/win32/cabinet # Synced to Wine-1.5.4 +reactos/dll/win32/clusapi # Synced to Wine-1.5.4 +reactos/dll/win32/comcat # Synced to Wine-1.5.4 reactos/dll/win32/comctl32 # Synced to Wine 1.3.37 reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37 -reactos/dll/win32/compstui # Synced to Wine-1.3.37 +reactos/dll/win32/compstui # Synced to Wine-1.5.4 reactos/dll/win32/credui # Synced to Wine-1.3.37 reactos/dll/win32/crypt32 # Synced to Wine-1.3.37 reactos/dll/win32/cryptdlg # Synced to Wine-1.3.37 @@ -58,105 +58,105 @@ reactos/dll/win32/cryptnet # Synced to Wine-1.3.37 reactos/dll/win32/cryptui # Synced to Wine-1.3.37 reactos/dll/win32/dbghelp # Synced to Wine-1.3.37 -reactos/dll/win32/dciman32 # Synced to Wine-1.3.37 -reactos/dll/win32/dwmapi # Synced to Wine-1.3.37 +reactos/dll/win32/dciman32 # Synced to Wine-1.5.4 +reactos/dll/win32/dwmapi # Synced to Wine-1.5.4 reactos/dll/win32/fusion # Synced to Wine-1.5.4 reactos/dll/win32/gdiplus # Synced to Wine-1.5.4 reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Synced to Wine-1.5.4 -reactos/dll/win32/hnetcfg # Synced to Wine-1.3.37 -reactos/dll/win32/httpapi # Synced to Wine-1.3.37 +reactos/dll/win32/hnetcfg # Synced to Wine-1.5.4 +reactos/dll/win32/httpapi # Synced to Wine-1.5.4 reactos/dll/win32/iccvid # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 -reactos/dll/win32/imaadp32.acm # Synced to Wine-1.3.37 -reactos/dll/win32/imagehlp # Synced to Wine-1.3.37 -reactos/dll/win32/imm32 # Synced to Wine-1.3.37 -reactos/dll/win32/inetcomm # Synced to Wine-1.3.37 -reactos/dll/win32/inetmib1 # Synced to Wine-1.3.37 -reactos/dll/win32/initpki # Synced to Wine-1.3.37 -reactos/dll/win32/inseng # Synced to Wine-1.3.37 +reactos/dll/win32/imaadp32.acm # Synced to Wine-1.5.4 +reactos/dll/win32/imagehlp # Synced to Wine-1.5.4 +reactos/dll/win32/imm32 # Synced to Wine-1.5.4 +reactos/dll/win32/inetcomm # Synced to Wine-1.5.4 +reactos/dll/win32/inetmib1 # Synced to Wine-1.5.4 +reactos/dll/win32/initpki # Synced to Wine-1.5.4 +reactos/dll/win32/inseng # Synced to Wine-1.5.4 reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to Wine-1.3.37 +reactos/dll/win32/itircl # Synced to Wine-1.5.4 reactos/dll/win32/itss # Synced to Wine-1.5.4 reactos/dll/win32/jscript # Autosync reactos/dll/win32/localspl # Autosync reactos/dll/win32/localui # Autosync -reactos/dll/win32/lz32 # Synced to Wine-1.3.37 +reactos/dll/win32/lz32 # Synced to Wine-1.5.4 reactos/dll/win32/mapi32 # Autosync -reactos/dll/win32/mciavi32 # Synced to Wine-1.3.37 -reactos/dll/win32/mcicda # Synced to Wine-1.3.37 +reactos/dll/win32/mciavi32 # Synced to Wine-1.5.4 +reactos/dll/win32/mcicda # Synced to Wine-1.5.4 reactos/dll/win32/mciqtz32 # Synced to Wine-1.5.4 -reactos/dll/win32/mciseq # Synced to Wine-1.3.37 +reactos/dll/win32/mciseq # Synced to Wine-1.5.4 reactos/dll/win32/mciwave # Synced to Wine-1.5.4 -reactos/dll/win32/mlang # Synced to Wine-1.3.37 +reactos/dll/win32/mlang # Synced to Wine-1.5.4 reactos/dll/win32/mpr # Autosync -reactos/dll/win32/mprapi # Synced to Wine-1.3.37 +reactos/dll/win32/mprapi # Synced to Wine-1.5.4 reactos/dll/win32/msacm32 # Autosync -reactos/dll/win32/msadp32.acm # Synced to Wine-1.3.37 -reactos/dll/win32/mscat32 # Synced to Wine-1.3.37 +reactos/dll/win32/msadp32.acm # Synced to Wine-1.5.4 +reactos/dll/win32/mscat32 # Synced to Wine-1.5.4 reactos/dll/win32/mscms # Synced to Wine-1.5.4 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to Wine-1.3.37 -reactos/dll/win32/msftedit # Synced to Wine-1.3.37 -reactos/dll/win32/msg711.acm # Synced to Wine-1.3.37 -reactos/dll/win32/msgsm32.acm # Synced to Wine-1.3.37 +reactos/dll/win32/msctf # Synced to Wine-1.5.4 +reactos/dll/win32/msftedit # Synced to Wine-1.5.4 +reactos/dll/win32/msg711.acm # Synced to Wine-1.5.4 +reactos/dll/win32/msgsm32.acm # Synced to Wine-1.5.4 reactos/dll/win32/mshtml # Autosync reactos/dll/win32/mshtml.tlb # Autosync reactos/dll/win32/msi # Synced to Wine-1.5.4 -reactos/dll/win32/msimg32 # Synced to Wine-1.3.37 -reactos/dll/win32/msimtf # Synced to Wine-1.3.37 -reactos/dll/win32/msisip # Synced to Wine-1.3.37 -reactos/dll/win32/msisys.ocx # Synced to Wine-1.3.37 -reactos/dll/win32/msnet32 # Synced to Wine-1.3.37 +reactos/dll/win32/msimg32 # Synced to Wine-1.5.4 +reactos/dll/win32/msimtf # Synced to Wine-1.5.4 +reactos/dll/win32/msisip # Synced to Wine-1.5.4 +reactos/dll/win32/msisys.ocx # Synced to Wine-1.5.4 +reactos/dll/win32/msnet32 # Synced to Wine-1.5.4 reactos/dll/win32/msrle32 # Autosync reactos/dll/win32/mssign32 # Synced to Wine-1.5.4 -reactos/dll/win32/mssip32 # Synced to Wine-1.3.37 -reactos/dll/win32/mstask # Synced to Wine-1.3.37 +reactos/dll/win32/mssip32 # Synced to Wine-1.5.4 +reactos/dll/win32/mstask # Synced to Wine-1.5.4 reactos/dll/win32/msvcrt20 # Autosync reactos/dll/win32/msvfw32 # Autosync reactos/dll/win32/msvidc32 # Autosync reactos/dll/win32/msxml3 # Autosync -reactos/dll/win32/nddeapi # Synced to Wine-1.3.37 +reactos/dll/win32/nddeapi # Synced to Wine-1.5.4 reactos/dll/win32/netapi32 # Autosync -reactos/dll/win32/ntdsapi # Synced to Wine-1.3.37 -reactos/dll/win32/ntprint # Synced to Wine-1.3.37 -reactos/dll/win32/objsel # Synced to Wine-1.3.37 +reactos/dll/win32/ntdsapi # Synced to Wine-1.5.4 +reactos/dll/win32/ntprint # Synced to Wine-1.5.4 +reactos/dll/win32/objsel # Synced to Wine-1.5.4 reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Synced to Wine-1.3.37 +reactos/dll/win32/odbccp32 # Synced to Wine-1.5.4 reactos/dll/win32/ole32 # Synced to Wine-1.5.4 reactos/dll/win32/oleacc # Autosync reactos/dll/win32/oleaut32 # Autosync -reactos/dll/win32/olecli32 # Synced to Wine-1.3.37 +reactos/dll/win32/olecli32 # Synced to Wine-1.5.4 reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync -reactos/dll/win32/olesvr32 # Synced to Wine-1.3.37 -reactos/dll/win32/olethk32 # Synced to Wine-1.3.37 +reactos/dll/win32/olesvr32 # Synced to Wine-1.5.4 +reactos/dll/win32/olethk32 # Synced to Wine-1.5.4 reactos/dll/win32/pdh # Autosync -reactos/dll/win32/pidgen # Synced to Wine-1.3.37 +reactos/dll/win32/pidgen # Synced to Wine-1.5.4 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to Wine-1.3.37 +reactos/dll/win32/printui # Synced to Wine-1.5.4 reactos/dll/win32/pstorec # Synced to Wine-1.5.4 -reactos/dll/win32/query # Synced to Wine-1.3.37 -reactos/dll/win32/rasapi32 # Synced to Wine-1.3.37 -reactos/dll/win32/resutils # Synced to Wine-1.3.37 +reactos/dll/win32/query # Synced to Wine-1.5.4 +reactos/dll/win32/rasapi32 # Synced to Wine-1.5.4 +reactos/dll/win32/resutils # Synced to Wine-1.5.4 reactos/dll/win32/riched20 # Synced to Wine-1.5.4 -reactos/dll/win32/riched32 # Synced to Wine-1.3.37 +reactos/dll/win32/riched32 # Synced to Wine-1.5.4 reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26 reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Synced to Wine-1.5.4 -reactos/dll/win32/sccbase # Synced to Wine-1.3.37 -reactos/dll/win32/schannel # Synced to Wine-1.3.37 +reactos/dll/win32/sccbase # Synced to Wine-1.5.4 +reactos/dll/win32/schannel # Synced to Wine-1.5.4 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to Wine-1.3.37 +reactos/dll/win32/sensapi # Synced to Wine-1.5.4 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shdocvw # Autosync reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Autosync -reactos/dll/win32/slbcsp # Synced to Wine-1.3.37 -reactos/dll/win32/snmpapi # Synced to Wine-1.3.37 -reactos/dll/win32/softpub # Synced to Wine-1.3.37 +reactos/dll/win32/slbcsp # Synced to Wine-1.5.4 +reactos/dll/win32/snmpapi # Synced to Wine-1.5.4 +reactos/dll/win32/softpub # Synced to Wine-1.5.4 reactos/dll/win32/spoolss # Synced to Wine-1.5.4 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.3.37 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.3.37 @@ -165,7 +165,7 @@ reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/traffic # Synced to Wine-1.5.4 reactos/dll/win32/twain_32 # Out of sync -reactos/dll/win32/updspapi # Synced to Wine-1.3.37 +reactos/dll/win32/updspapi # Synced to Wine-1.5.4 reactos/dll/win32/url # Synced to Wine-1.5.4 reactos/dll/win32/urlmon # Autosync reactos/dll/win32/usp10 # Synced to Wine-1.5.4 @@ -173,7 +173,7 @@ reactos/dll/win32/version # Autosync reactos/dll/win32/wer # Autosync reactos/dll/win32/windowscodecs # Autosync -reactos/dll/win32/winemp3.acm # Synced to Wine-1.3.37 +reactos/dll/win32/winemp3.acm # Synced to Wine-1.5.4 reactos/dll/win32/winhttp # Autosync reactos/dll/win32/wininet # Synced to Wine-1.5.4 reactos/dll/win32/winmm # Forked at Wine-20050628 @@ -181,14 +181,14 @@ reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/wintrust # Autosync reactos/dll/win32/wldap32 # Autosync -reactos/dll/win32/wmi # Synced to Wine-1.3.37 -reactos/dll/win32/wtsapi32 # Synced to Wine-1.3.37 +reactos/dll/win32/wmi # Synced to Wine-1.5.4 +reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4 reactos/dll/win32/wuapi # Autosync -reactos/dll/win32/xinput1_1 # Synced to Wine-1.3.37 -reactos/dll/win32/xinput1_2 # Synced to Wine-1.3.37 -reactos/dll/win32/xinput1_3 # Autosync -reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.3.37 -reactos/dll/win32/xmllite # Synced to Wine-1.3.37 +reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.4 +reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.4 +reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.4 +reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.5.4 +reactos/dll/win32/xmllite # Synced to Wine-1.5.4 reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21

1 0

[tfaber] 56765: [NTDSAPI][PRINTUI] - Don't ignore DllMain
by tfaber＠svn.reactos.org 20 Jun '12

20 Jun '12

Author: tfaber Date: Wed Jun 20 22:54:30 2012 New Revision: 56765 URL: http://svn.reactos.org/svn/reactos?rev=56765&view=rev Log: [NTDSAPI][PRINTUI] - Don't ignore DllMain Modified: trunk/reactos/dll/win32/ntdsapi/CMakeLists.txt trunk/reactos/dll/win32/printui/CMakeLists.txt Modified: trunk/reactos/dll/win32/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/ntdsapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntdsapi/CMakeLists.txt [iso-8859-1] Wed Jun 20 22:54:30 2012 @@ -10,11 +10,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/ntdsapi.def) add_library(ntdsapi SHARED ${SOURCE}) -set_module_type(ntdsapi win32dll ENTRYPOINT 0 ) +set_module_type(ntdsapi win32dll) target_link_libraries(ntdsapi wine) -add_importlibs(ntdsapi user32 kernel32 ntdll) +add_importlibs(ntdsapi user32 msvcrt kernel32 ntdll) add_dependencies(ntdsapi psdk) add_cd_file(TARGET ntdsapi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/printui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/printui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/CMakeLists.txt [iso-8859-1] Wed Jun 20 22:54:30 2012 @@ -2,7 +2,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -set_rc_compiler() spec2def(printui.dll printui.spec) list(APPEND SOURCE @@ -12,10 +11,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/printui.def) add_library(printui SHARED ${SOURCE}) -set_module_type(printui win32dll ENTRYPOINT 0 ) +set_module_type(printui win32dll) target_link_libraries(printui wine) -add_importlibs(printui shell32 kernel32 ntdll) +add_importlibs(printui shell32 msvcrt kernel32 ntdll) add_dependencies(printui psdk) add_cd_file(TARGET printui DESTINATION reactos/system32 FOR all)

1 0

[spetreolle] 56764: [WINED3D] Fix wined3d entrypoint. Should fix directdraw 7, 8, 9 apps.
by spetreolle＠svn.reactos.org 20 Jun '12

20 Jun '12

Author: spetreolle Date: Wed Jun 20 21:45:57 2012 New Revision: 56764 URL: http://svn.reactos.org/svn/reactos?rev=56764&view=rev Log: [WINED3D] Fix wined3d entrypoint. Should fix directdraw 7,8,9 apps. Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Wed Jun 20 21:45:57 2012 @@ -40,7 +40,7 @@ add_library(wined3d SHARED ${SOURCE} version.rc) -set_module_type(wined3d win32dll ENTRYPOINT 0) +set_module_type(wined3d win32dll) target_link_libraries(wined3d wine)

1 0

[tkreuzer] 56762: [PSDK] intsafe.h: add some more definitions
by tkreuzer＠svn.reactos.org 20 Jun '12

20 Jun '12

Author: tkreuzer Date: Wed Jun 20 19:16:44 2012 New Revision: 56762 URL: http://svn.reactos.org/svn/reactos?rev=56762&view=rev Log: [PSDK] intsafe.h: add some more definitions Modified: trunk/reactos/include/psdk/intsafe.h Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Wed Jun 20 19:16:44 2012 @@ -313,8 +313,19 @@ DEFINE_SAFE_CONVERT_UTOX(UIntPtrToLong, UINT_PTR, LONG) DEFINE_SAFE_CONVERT_UTOX(UIntPtrToIntPtr, UINT_PTR, INT_PTR) DEFINE_SAFE_CONVERT_UTOX(UIntPtrToLongPtr, UINT_PTR, LONG_PTR) +DEFINE_SAFE_CONVERT_UTOX(ULongToUChar, ULONG, UCHAR) +DEFINE_SAFE_CONVERT_UTOX(ULongToUInt8, ULONG, UINT8) +DEFINE_SAFE_CONVERT_UTOX(ULongToShort, ULONG, SHORT) +DEFINE_SAFE_CONVERT_UTOX(ULongToUShort, ULONG, USHORT) +DEFINE_SAFE_CONVERT_UTOX(ULongToInt, ULONG, INT) +DEFINE_SAFE_CONVERT_UTOX(ULongToUInt, ULONG, UINT) +DEFINE_SAFE_CONVERT_UTOX(ULongToIntPtr, ULONG, INT_PTR) +DEFINE_SAFE_CONVERT_UTOX(ULongToUIntPtr, ULONG, UINT_PTR) +DEFINE_SAFE_CONVERT_UTOX(ULongToLongPtr, ULONG, LONG_PTR) +DEFINE_SAFE_CONVERT_UTOX(ULongPtrToULong, ULONG_PTR, ULONGLONG) DEFINE_SAFE_CONVERT_UTOX(ULongLongToUInt, ULONGLONG, UINT) DEFINE_SAFE_CONVERT_UTOX(ULongLongToULong, ULONGLONG, ULONG) +DEFINE_SAFE_CONVERT_UTOX(ULongLongToULongPtr, ULONGLONG, ULONG_PTR) #define DEFINE_SAFE_CONVERT_ITOU(_Name, _TypeFrom, _TypeTo) \ @@ -450,12 +461,17 @@ #define RtlInt8ToSizeT RtlInt8ToUIntPtr #define RtlInt8ToSIZET RtlInt8ToULongPtr #define RtlIntToSizeT RtlIntToUIntPtr +#define RtlIntToSIZET RtlIntToULongPtr +#define RtlULongToByte RtlULongToUInt8 #define RtlULongLongToInt64 RtlULongLongToLongLong #define RtlULongLongToLong64 RtlULongLongToLongLong #define RtlULongLongToPtrdiffT RtlULongLongToIntPtr #define RtlULongLongToSizeT RtlULongLongToUIntPtr #define RtlULongLongToSSIZET RtlULongLongToLongPtr #define RtlULongLongToSIZET RtlULongLongToULongPtr +#define RtlSIZETToULong RtlULongPtrToULong +#define RtlSSIZETToULongLong RtlLongPtrToULongLong +#define RtlSSIZETToULong RtlLongPtrToULong #ifdef _WIN64 #define RtlIntToUIntPtr RtlIntToULongLong #define RtlULongLongToIntPtr RtlULongLongToLongLong @@ -481,12 +497,17 @@ #define Int8ToSizeT Int8ToUIntPtr #define Int8ToSIZET Int8ToULongPtr #define IntToSizeT IntToUIntPtr +#define IntToSIZET IntToULongPtr +#define ULongToByte ULongToUInt8 #define ULongLongToInt64 ULongLongToLongLong #define ULongLongToLong64 ULongLongToLongLong #define ULongLongToPtrdiffT ULongLongToIntPtr #define ULongLongToSizeT ULongLongToUIntPtr #define ULongLongToSSIZET ULongLongToLongPtr #define ULongLongToSIZET ULongLongToULongPtr +#define SIZETToULong ULongPtrToULong +#define SSIZETToULongLong LongPtrToULongLong +#define SSIZETToULong LongPtrToULong #ifdef _WIN64 #define IntToUIntPtr IntToULongLong #define ULongLongToIntPtr ULongLongToLongLong

1 0

[tfaber] 56761: [WININET] - Fix sock_namelen type in FTP_Connect. Already sent to Wine. - Fix warnings
by tfaber＠svn.reactos.org 20 Jun '12

20 Jun '12

Author: tfaber Date: Wed Jun 20 15:10:50 2012 New Revision: 56761 URL: http://svn.reactos.org/svn/reactos?rev=56761&view=rev Log: [WININET] - Fix sock_namelen type in FTP_Connect. Already sent to Wine. - Fix warnings Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt trunk/reactos/dll/win32/wininet/ftp.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/inet_ntop.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/wininet_ros.diff Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Wed Jun 20 15:10:50 2012 @@ -20,22 +20,15 @@ urlcache.c utility.c wininet_main.c + rsrc.rc + version.rc ${CMAKE_CURRENT_BINARY_DIR}/wininet_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/wininet.def) -add_library(wininet SHARED - ${SOURCE} - rsrc.rc - version.rc) +add_library(wininet SHARED ${SOURCE}) set_module_type(wininet win32dll) target_link_libraries(wininet wine ${PSEH_LIB} zlib) add_delay_importlibs(wininet secur32 crypt32 cryptui) add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all) - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(wininet) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… ============================================================================== --- trunk/reactos/dll/win32/wininet/ftp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/ftp.c [iso-8859-1] Wed Jun 20 15:10:50 2012 @@ -2433,7 +2433,7 @@ static const WCHAR szEmpty[] = {'\0'}; struct sockaddr_in socketAddr; INT nsocket = -1; - UINT sock_namelen; + socklen_t sock_namelen; BOOL bSuccess = FALSE; ftp_session_t *lpwfs = NULL; char szaddr[INET_ADDRSTRLEN]; Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] Wed Jun 20 15:10:50 2012 @@ -1901,6 +1901,9 @@ } return; } +#else + // silence unused function warning + (void)collect_connections_proc; #endif INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, Modified: trunk/reactos/dll/win32/wininet/inet_ntop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/inet_nto… ============================================================================== --- trunk/reactos/dll/win32/wininet/inet_ntop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/inet_ntop.c [iso-8859-1] Wed Jun 20 15:10:50 2012 @@ -27,7 +27,7 @@ #ifdef SPRINTF_CHAR # define SPRINTF(x) strlen(sprintf/**/x) #else -# define SPRINTF(x) ((size_t)sprintf x) +# define SPRINTF(x) ((socklen_t)sprintf x) #endif /* @@ -35,10 +35,10 @@ * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. */ -static const char *inet_ntop4(const u_char *src, char *dst, size_t size); +static const char *inet_ntop4(const u_char *src, char *dst, socklen_t size); #ifdef INET6 -static const char *inet_ntop6(const u_char *src, char *dst, size_t size); +static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size); #endif /* char * @@ -50,7 +50,7 @@ * Paul Vixie, 1996. */ const char * -inet_ntop(int af, const void *src, char *dst, size_t size) +inet_ntop(int af, const void *src, char *dst, socklen_t size) { switch (af) { @@ -79,7 +79,7 @@ * Paul Vixie, 1996. */ static const char * -inet_ntop4(const u_char *src, char *dst, size_t size) +inet_ntop4(const u_char *src, char *dst, socklen_t size) { static const char fmt[] = "%u.%u.%u.%u"; char tmp[sizeof "255.255.255.255"]; @@ -100,7 +100,7 @@ * Paul Vixie, 1996. */ static const char * -inet_ntop6(const u_char *src, char *dst, size_t size) +inet_ntop6(const u_char *src, char *dst, socklen_t size) { /* * Note that int32_t and int16_t need only be "at least" large enough @@ -178,7 +178,7 @@ /* * Check for overflow, copy, and we're done. */ - if ((size_t)(tp - tmp) > size) { + if ((socklen_t)(tp - tmp) > size) { WSASetLastError(WSAEINVAL); return (NULL); } Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] Wed Jun 20 15:10:50 2012 @@ -540,6 +540,25 @@ int sock_get_error(int) DECLSPEC_HIDDEN; #else #define sock_get_error(x) WSAGetLastError() +const char *inet_ntop(int, const void *, char *, socklen_t); + +static inline long unix_recv(int socket, void *buffer, size_t length, int flags) +{ + return recv(socket, buffer, length, flags); +} +#define recv unix_recv + +static inline int unix_ioctl(int filedes, long request, void *arg) +{ + return ioctlsocket(filedes, request, arg); +} +#define ioctlsocket unix_ioctl + +static inline int unix_getsockopt(int socket, int level, int option_name, void *option_value, socklen_t *option_len) +{ + return getsockopt(socket, level, option_name, option_value, option_len); +} +#define getsockopt unix_getsockopt #endif extern void URLCacheContainers_CreateDefaults(void) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] Wed Jun 20 15:10:50 2012 @@ -1,6 +1,6 @@ ---- wine-1.5.4/Wine/dlls/wininet/internet.h 2012-06-20 14:38:39 +0200 -+++ dll/win32/wininet/internet.h 2012-06-20 14:51:41 +0200 -@@ -536,7 +536,11 @@ BOOL NETCON_is_alive(netconn_t*) DECLSPE +--- wine-1.5.4/dlls/wininet/internet.h 2012-06-20 14:38:39 +0200 ++++ dll/win32/wininet/internet.h 2012-06-20 16:49:05 +0200 +@@ -536,7 +536,30 @@ BOOL NETCON_is_alive(netconn_t*) DECLSPE LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; @@ -8,12 +8,31 @@ int sock_get_error(int) DECLSPEC_HIDDEN; +#else +#define sock_get_error(x) WSAGetLastError() ++const char *inet_ntop(int, const void *, char *, socklen_t); ++ ++static inline long unix_recv(int socket, void *buffer, size_t length, int flags) ++{ ++ return recv(socket, buffer, length, flags); ++} ++#define recv unix_recv ++ ++static inline int unix_ioctl(int filedes, long request, void *arg) ++{ ++ return ioctlsocket(filedes, request, arg); ++} ++#define ioctlsocket unix_ioctl ++ ++static inline int unix_getsockopt(int socket, int level, int option_name, void *option_value, socklen_t *option_len) ++{ ++ return getsockopt(socket, level, option_name, option_value, option_len); ++} ++#define getsockopt unix_getsockopt +#endif extern void URLCacheContainers_CreateDefaults(void) DECLSPEC_HIDDEN; extern void URLCacheContainers_DeleteAll(void) DECLSPEC_HIDDEN; ---- wine-1.5.4/Wine/dlls/wininet/netconnection.c 2012-06-20 14:38:39 +0200 -+++ dll/win32/wininet/netconnection.c 2012-06-20 14:52:22 +0200 +--- wine-1.5.4/dlls/wininet/netconnection.c 2012-06-20 14:38:39 +0200 ++++ dll/win32/wininet/netconnection.c 2012-06-20 15:50:06 +0200 @@ -523,12 +523,16 @@ DWORD create_netconn(BOOL useSSL, server if(result == -1) { @@ -51,8 +70,8 @@ /****************************************************************************** * NETCON_secure_connect ---- wine-1.5.4/Wine/dlls/wininet/internet.c 2012-06-20 14:38:38 +0200 -+++ dll/win32/wininet/internet.c 2012-06-20 14:58:51 +0200 +--- wine-1.5.4/dlls/wininet/internet.c 2012-06-20 14:38:38 +0200 ++++ dll/win32/wininet/internet.c 2012-06-20 15:50:05 +0200 @@ -292,7 +292,9 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) return FALSE; @@ -91,10 +110,8 @@ { if (recv(nSocket, &lpszBuffer[nRecv], 1, 0) <= 0) { -Index: dll/win32/wininet/urlcache.c -=================================================================== ---- wine-1.5.4/Wine/dlls/wininet/urlcache.c 2012-06-20 14:30:41 +0200 -+++ dll/win32/wininet/urlcache.c 2012-06-20 14:54:06 +0200 +--- wine-1.5.4/dlls/wininet/urlcache.c 2012-06-20 14:30:41 +0200 ++++ dll/win32/wininet/urlcache.c 2012-06-20 15:50:06 +0200 @@ -189,6 +189,8 @@ typedef struct _URLCACHECONTAINER /* List of all containers available */ @@ -160,10 +177,8 @@ LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) { /* The URL cache has prefix L"" (unlike Cookies and History) */ -Index: dll/win32/wininet/http.c -=================================================================== ---- wine-1.5.4/Wine/dlls/wininet/http.c 2012-06-20 14:38:38 +0200 -+++ dll/win32/wininet/http.c 2012-06-20 14:49:11 +0200 +--- wine-1.5.4/dlls/wininet/http.c 2012-06-20 15:19:57 +0200 ++++ dll/win32/wininet/http.c 2012-06-20 16:24:11 +0200 @@ -73,6 +73,9 @@ #include "wine/exception.h" #include "wine/unicode.h" @@ -218,10 +233,13 @@ req->netconn = NULL; run_collector = !collector_running; -@@ -1888,6 +1901,7 @@ static void http_release_netconn(http_re +@@ -1888,6 +1901,10 @@ static void http_release_netconn(http_re } return; } ++#else ++ // silence unused function warning ++ (void)collect_connections_proc; +#endif INTERNET_SendCallback(&req->hdr, req->hdr.dwContext,

1 0

[tfaber] 56760: [WININET] - Sync to Wine 1.5.4. Resource files left untouched. - Fix INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT if SSL support unavailable (already applied upstream) See issue #711...
by tfaber＠svn.reactos.org 20 Jun '12

20 Jun '12

Author: tfaber Date: Wed Jun 20 13:50:00 2012 New Revision: 56760 URL: http://svn.reactos.org/svn/reactos?rev=56760&view=rev Log: [WININET] - Sync to Wine 1.5.4. Resource files left untouched. - Fix INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT if SSL support unavailable (already applied upstream) See issue #7117 for more details. Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/dialogs.c trunk/reactos/dll/win32/wininet/ftp.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/utility.c trunk/reactos/dll/win32/wininet/wininet.spec trunk/reactos/dll/win32/wininet/wininet_ros.diff trunk/reactos/include/psdk/winineti.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/CMakeLis… Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… Modified: trunk/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/dialogs.… Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… Modified: trunk/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/utility.… Modified: trunk/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/include/psdk/winineti.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winineti.h?re… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[tfaber] 56759: [WININET_WINETEST] - Sync to Wine 1.5.4
by tfaber＠svn.reactos.org 20 Jun '12

20 Jun '12

Author: tfaber Date: Wed Jun 20 13:13:51 2012 New Revision: 56759 URL: http://svn.reactos.org/svn/reactos?rev=56759&view=rev Log: [WININET_WINETEST] - Sync to Wine 1.5.4 Modified: trunk/rostests/winetests/wininet/CMakeLists.txt trunk/rostests/winetests/wininet/ftp.c trunk/rostests/winetests/wininet/http.c trunk/rostests/winetests/wininet/internet.c trunk/rostests/winetests/wininet/urlcache.c Modified: trunk/rostests/winetests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] Wed Jun 20 13:13:51 2012 @@ -2,8 +2,7 @@ remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) + -D__ROS_LONG64__) list(APPEND SOURCE ftp.c Modified: trunk/rostests/winetests/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/ftp.c?r… ============================================================================== --- trunk/rostests/winetests/wininet/ftp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/ftp.c [iso-8859-1] Wed Jun 20 13:13:51 2012 @@ -726,8 +726,7 @@ { TRUE, ERROR_SUCCESS, "SIZE\t/welcome.msg" }, { TRUE, ERROR_SUCCESS, "SIZE /welcome.msg" }, { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "PWD /welcome.msg" }, - { TRUE, ERROR_SUCCESS, "PWD" }, - { TRUE, ERROR_SUCCESS, "PWD\r\n" } + { TRUE, ERROR_SUCCESS, "PWD" } }; if (!pFtpCommandA) Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Wed Jun 20 13:13:51 2012 @@ -103,11 +103,11 @@ static const char *status_string[MAX_INTERNET_STATUS]; static HANDLE hCompleteEvent, conn_close_event; +static DWORD req_error; #define TESTF_REDIRECT 0x01 #define TESTF_COMPRESSED 0x02 -#define TESTF_ALLOW_COOKIE 0x04 -#define TESTF_CHUNKED 0x08 +#define TESTF_CHUNKED 0x04 typedef struct { const char *url; @@ -143,7 +143,7 @@ "www.codeweavers.com", "", "Accept-Encoding: gzip, deflate", - TESTF_COMPRESSED|TESTF_ALLOW_COOKIE + TESTF_COMPRESSED }, { "http://test.winehq.org/tests/post.php", @@ -176,6 +176,48 @@ RegCloseKey(internet_settings); return proxy_enable != 0; +} + +#define test_status_code(a,b) _test_status_code(__LINE__,a,b) +static void _test_status_code(unsigned line, HINTERNET req, DWORD excode) +{ + DWORD code, size, index; + char exbuf[10], bufa[10]; + BOOL res; + + code = 0xdeadbeef; + size = sizeof(code); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, NULL); + ok_(__FILE__,line)(res, "HttpQueryInfo(HTTP_QUERY_STATUS_CODE|number) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); + + code = 0xdeadbeef; + index = 0; + size = sizeof(code); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); + ok_(__FILE__,line)(res, "HttpQueryInfo(HTTP_QUERY_STATUS_CODE|number index) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); + ok_(__FILE__,line)(!index, "index = %d, expected 0\n", code); + + sprintf(exbuf, "%u", excode); + + size = sizeof(bufa); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE, bufa, &size, NULL); + ok_(__FILE__,line)(res, "HttpQueryInfo(HTTP_QUERY_STATUS_CODE) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(!strcmp(bufa, exbuf), "unexpected status code %s, expected %s", bufa, exbuf); + + code = 0xdeadbeef; + index = 1; + size = sizeof(code); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE||HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); + ok_(__FILE__,line)(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, + "HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); + + code = 0xdeadbeef; + size = sizeof(code); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE||HTTP_QUERY_FLAG_REQUEST_HEADERS, &code, &size, NULL); + ok_(__FILE__,line)(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, + "HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); } static int close_handle_cnt; @@ -287,9 +329,11 @@ ok(dwStatusInformationLength == sizeof(INTERNET_ASYNC_RESULT), "info length should be sizeof(INTERNET_ASYNC_RESULT) instead of %d\n", dwStatusInformationLength); + ok(iar->dwResult == 1 || iar->dwResult == 0, "iar->dwResult = %ld\n", iar->dwResult); trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_COMPLETE {%ld,%d} %d\n", GetCurrentThreadId(), hInternet, dwContext, iar->dwResult,iar->dwError,dwStatusInformationLength); + req_error = iar->dwError; SetEvent(hCompleteEvent); break; } @@ -396,10 +440,8 @@ CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); - if(test->flags & TESTF_ALLOW_COOKIE) { - SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); - SET_OPTIONAL(INTERNET_STATUS_COOKIE_RECEIVED); - } + SET_OPTIONAL2(INTERNET_STATUS_COOKIE_SENT,2); + SET_OPTIONAL2(INTERNET_STATUS_COOKIE_RECEIVED,2); if (first_connection_to_test_url) { SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); @@ -431,6 +473,8 @@ goto abort; } + test_status_code(hor, 0); + trace("HttpSendRequestA -->\n"); if(test->post_data) { post_len = strlen(test->post_data); @@ -447,14 +491,14 @@ "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); trace("HttpSendRequestA <--\n"); - if (flags & INTERNET_FLAG_ASYNC) + if (flags & INTERNET_FLAG_ASYNC) { WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + } HeapFree(GetProcessHeap(), 0, post_data); - if(test->flags & TESTF_ALLOW_COOKIE) { - CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); - CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_RECEIVED); - } + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_RECEIVED); if (first_connection_to_test_url) { if (! proxy_active()) @@ -549,6 +593,7 @@ ok(!length, "InternetQueryDataAvailable returned ERROR_IO_PENDING and %u length\n", length); WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error, "req_error = 0\n"); continue; }else { ok(0, "InternetQueryDataAvailable failed: %u\n", GetLastError()); @@ -760,6 +805,7 @@ SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); } + SET_OPTIONAL2(INTERNET_STATUS_COOKIE_SENT, 2); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); SET_EXPECT2(INTERNET_STATUS_SENDING_REQUEST, 2); @@ -787,8 +833,10 @@ "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); trace("HttpSendRequestA <--\n"); - if (!rc && (GetLastError() == ERROR_IO_PENDING)) + if (!rc && (GetLastError() == ERROR_IO_PENDING)) { WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + } if (first_connection_to_test_url) { @@ -811,6 +859,7 @@ CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); else todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); /* Sent on WinXP only if first_connection_to_test_url is TRUE, on Win98 always sent */ CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -841,7 +890,7 @@ SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); rc = InternetReadFileEx(hor, &inetbuffers, 0, 0xdeadcafe); ok(rc, "InternetReadFileEx failed with error %u\n", GetLastError()); - trace("read %i bytes\n", inetbuffers.dwBufferLength); + trace("read %i bytes\n", inetbuffers.dwBufferLength); todo_wine { CHECK_NOT_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); @@ -879,6 +928,7 @@ WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); } else { @@ -1842,7 +1892,7 @@ static void test_proxy_indirect(int port) { HINTERNET hi, hc, hr; - DWORD r, sz, val; + DWORD r, sz; char buffer[0x40]; hi = InternetOpen(NULL, 0, NULL, NULL, 0); @@ -1867,15 +1917,7 @@ } ok(!strcmp(buffer, "Basic realm=\"placebo\""), "proxy auth info wrong\n"); - sz = sizeof buffer; - r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL); - ok(r, "HttpQueryInfo failed\n"); - ok(!strcmp(buffer, "407"), "proxy code wrong\n"); - - sz = sizeof val; - r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &val, &sz, NULL); - ok(r, "HttpQueryInfo failed\n"); - ok(val == 407, "proxy code wrong\n"); + test_status_code(hr, 407); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_TEXT, buffer, &sz, NULL); @@ -1925,11 +1967,7 @@ r = HttpSendRequest(hr, NULL, 0, NULL, 0); ok(r, "HttpSendRequest failed\n"); - sz = sizeof buffer; - r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL); - ok(r, "HttpQueryInfo failed\n"); - ok(!strcmp(buffer, "407"), "proxy code wrong\n"); - + test_status_code(hr, 407); /* set the user + password then try again */ todo_wine { @@ -1980,11 +2018,7 @@ ret = HttpSendRequest(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(request, 200); InternetCloseHandle(request); @@ -2025,7 +2059,6 @@ static void test_connection_header(int port) { HINTERNET ses, con, req; - DWORD size, status; BOOL ret; ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -2040,11 +2073,7 @@ ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); InternetCloseHandle(req); @@ -2054,11 +2083,7 @@ ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); InternetCloseHandle(req); @@ -2068,11 +2093,7 @@ ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); InternetCloseHandle(req); @@ -2082,11 +2103,7 @@ ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); InternetCloseHandle(req); InternetCloseHandle(con); @@ -2165,6 +2182,7 @@ ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -2222,6 +2240,7 @@ ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -2251,6 +2270,7 @@ SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); SetEvent(conn_close_event); WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); @@ -2292,7 +2312,7 @@ static void test_cookie_header(int port) { HINTERNET ses, con, req; - DWORD size, status, error; + DWORD size, error; BOOL ret; char buffer[64]; @@ -2327,11 +2347,7 @@ ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); buffer[0] = 0; size = sizeof(buffer); @@ -2347,7 +2363,6 @@ static void test_basic_authentication(int port) { HINTERNET session, connect, request; - DWORD size, status; BOOL ret; session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -2362,11 +2377,7 @@ ret = HttpSendRequest(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(request, 200); InternetCloseHandle(request); InternetCloseHandle(connect); @@ -2376,7 +2387,7 @@ static void test_invalid_response_headers(int port) { HINTERNET session, connect, request; - DWORD size, status; + DWORD size; BOOL ret; char buffer[256]; @@ -2392,11 +2403,7 @@ ret = HttpSendRequest(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 401, "unexpected status %u\n", status); + test_status_code(request, 401); buffer[0] = 0; size = sizeof(buffer); @@ -2419,7 +2426,7 @@ static void test_response_without_headers(int port) { HINTERNET hi, hc, hr; - DWORD r, count, size, status; + DWORD r, count, size; char buffer[1024]; SetLastError(0xdeadbeef); @@ -2446,12 +2453,7 @@ todo_wine ok(count == sizeof page1 - 1, "count was wrong\n"); todo_wine ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); - status = 0; - size = sizeof(status); - SetLastError(0xdeadbeef); - r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - todo_wine ok(r, "HttpQueryInfo failed %u\n", GetLastError()); - todo_wine ok(status == 200, "expected status 200 got %u\n", status); + test_status_code(hr, 200); buffer[0] = 0; size = sizeof(buffer); @@ -2536,17 +2538,7 @@ ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); ok(index == 0, "expected 0 got %u\n", index); - index = 0; - size = sizeof(buffer); - ret = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &size, &index); - ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); - ok(index == 0, "expected 0 got %u\n", index); - - index = 0; - size = sizeof(buffer); - ret = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, buffer, &size, &index); - ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); - ok(index == 0, "expected 0 got %u\n", index); + test_status_code(hr, 200); index = 0xdeadbeef; size = sizeof(buffer); @@ -2684,6 +2676,27 @@ ret = InternetQueryOption(req, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); ok(ret, "InternetQueryOption failed %u\n", GetLastError()); ok(ctx == 3, "expected 3 got %lu\n", ctx); + + /* INTERNET_OPTION_PROXY */ + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(ses, INTERNET_OPTION_PROXY, NULL, NULL); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(ses, INTERNET_OPTION_PROXY, &ctx, NULL); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + size = 0; + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(ses, INTERNET_OPTION_PROXY, NULL, &size); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size >= sizeof(INTERNET_PROXY_INFOA), "expected size to be greater or equal to the struct size\n"); InternetCloseHandle(req); InternetCloseHandle(con); @@ -3052,7 +3065,7 @@ { HINTERNET ses, con, req; static const char *types[] = { (const char *)6240, "*/*", "%p", "", (const char *)0xffffffff, "*/*", NULL }; - DWORD size; + DWORD size, error; char buffer[32]; BOOL ret; @@ -3064,11 +3077,14 @@ buffer[0] = 0; size = sizeof(buffer); + SetLastError(0xdeadbeef); ret = HttpQueryInfo(req, HTTP_QUERY_ACCEPT | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); - ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); - ok(!strcmp(buffer, ", */*, %p, , , */*") || /* IE6 */ - !strcmp(buffer, "*/*, %p, */*"), - "got '%s' expected '*/*, %%p, */*' or ', */*, %%p, , , */*'\n", buffer); + error = GetLastError(); + ok(!ret || broken(ret), "HttpQueryInfo succeeded\n"); + if (!ret) ok(error == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %u\n", error); + ok(broken(!strcmp(buffer, ", */*, %p, , , */*")) /* IE6 */ || + broken(!strcmp(buffer, "*/*, %p, */*")) /* IE7/8 */ || + !strcmp(buffer, ""), "got '%s' expected ''\n", buffer); InternetCloseHandle(req); InternetCloseHandle(con); @@ -3185,6 +3201,8 @@ HANDLE wait; DWORD thread; unsigned int line; + DWORD expect_result; + BOOL is_aborted; }; static CRITICAL_SECTION notification_cs; @@ -3197,11 +3215,27 @@ EnterCriticalSection( &notification_cs ); + if(info->is_aborted) { + LeaveCriticalSection(&notification_cs); + return; + } + if (status == INTERNET_STATUS_HANDLE_CREATED) { DWORD size = sizeof(struct info *); HttpQueryInfoA( handle, INTERNET_OPTION_CONTEXT_VALUE, &info, &size, 0 ); - } + }else if(status == INTERNET_STATUS_REQUEST_COMPLETE) { + INTERNET_ASYNC_RESULT *ar = (INTERNET_ASYNC_RESULT*)buffer; + + ok(buflen == sizeof(*ar), "unexpected buflen = %d\n", buflen); + if(info->expect_result == ERROR_SUCCESS) { + ok(ar->dwResult == 1, "ar->dwResult = %ld, expected 1\n", ar->dwResult); + }else { + ok(!ar->dwResult, "ar->dwResult = %ld, expected 1\n", ar->dwResult); + ok(ar->dwError == info->expect_result, "ar->dwError = %d, expected %d\n", ar->dwError, info->expect_result); + } + } + i = info->index; if (i >= info->count) { @@ -3209,7 +3243,8 @@ return; } - while (info->test[i].status != status && info->test[i].optional && + while (info->test[i].status != status && + (info->test[i].optional || info->test[i].todo) && i < info->count - 1 && info->test[i].function == info->test[i + 1].function) { @@ -3240,17 +3275,30 @@ LeaveCriticalSection( &notification_cs ); } -static void setup_test( struct info *info, enum api function, unsigned int line ) +static void setup_test( struct info *info, enum api function, unsigned int line, DWORD expect_result ) { info->function = function; info->line = line; -} + info->expect_result = expect_result; +} + +struct notification_data +{ + const struct notification *test; + const unsigned int count; + const char *method; + const char *host; + const char *path; + const char *data; + BOOL expect_conn_failure; +}; static const struct notification async_send_request_ex_test[] = { { internet_connect, INTERNET_STATUS_HANDLE_CREATED, 0 }, { http_open_request, INTERNET_STATUS_HANDLE_CREATED, 0 }, { http_send_request_ex, INTERNET_STATUS_DETECTING_PROXY, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_COOKIE_SENT, 1, 0, 1 }, { http_send_request_ex, INTERNET_STATUS_RESOLVING_NAME, 1, 0, 1 }, { http_send_request_ex, INTERNET_STATUS_NAME_RESOLVED, 1, 0, 1 }, { http_send_request_ex, INTERNET_STATUS_CONNECTING_TO_SERVER, 1 }, @@ -3269,7 +3317,71 @@ { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, } }; -static void test_async_HttpSendRequestEx(void) +static const struct notification async_send_request_ex_test2[] = +{ + { internet_connect, INTERNET_STATUS_HANDLE_CREATED, 0 }, + { http_open_request, INTERNET_STATUS_HANDLE_CREATED, 0 }, + { http_send_request_ex, INTERNET_STATUS_DETECTING_PROXY, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_COOKIE_SENT, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_RESOLVING_NAME, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_NAME_RESOLVED, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_CONNECTING_TO_SERVER, 1, 1 }, + { http_send_request_ex, INTERNET_STATUS_CONNECTED_TO_SERVER, 1, 1 }, + { http_send_request_ex, INTERNET_STATUS_SENDING_REQUEST, 1 }, + { http_send_request_ex, INTERNET_STATUS_REQUEST_SENT, 1 }, + { http_send_request_ex, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { http_end_request, INTERNET_STATUS_RECEIVING_RESPONSE, 1 }, + { http_end_request, INTERNET_STATUS_RESPONSE_RECEIVED, 1 }, + { http_end_request, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { internet_close_handle, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0, 1 }, + { internet_close_handle, INTERNET_STATUS_CONNECTION_CLOSED, 0, 0, 1 }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, } +}; + +static const struct notification async_send_request_ex_resolve_failure_test[] = +{ + { internet_connect, INTERNET_STATUS_HANDLE_CREATED, 0 }, + { http_open_request, INTERNET_STATUS_HANDLE_CREATED, 0 }, + { http_send_request_ex, INTERNET_STATUS_DETECTING_PROXY, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_RESOLVING_NAME, 1 }, + { http_send_request_ex, INTERNET_STATUS_DETECTING_PROXY, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { http_end_request, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { internet_close_handle, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0, 1 }, + { internet_close_handle, INTERNET_STATUS_CONNECTION_CLOSED, 0, 0, 1 }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, } +}; + +static const struct notification_data notification_data[] = { + { + async_send_request_ex_test, + sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]), + "POST", + "test.winehq.org", + "tests/posttest.php", + "Public ID=codeweavers" + }, + { + async_send_request_ex_test2, + sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]), + "POST", + "test.winehq.org", + "tests/posttest.php" + }, + { + async_send_request_ex_resolve_failure_test, + sizeof(async_send_request_ex_resolve_failure_test)/sizeof(async_send_request_ex_resolve_failure_test[0]), + "GET", + "brokenhost", + "index.html", + NULL, + TRUE + } +}; + +static void test_async_HttpSendRequestEx(const struct notification_data *nd) { BOOL ret; HINTERNET ses, req, con; @@ -3277,72 +3389,90 @@ DWORD size, written, error; INTERNET_BUFFERSA b; static const char *accept[2] = {"*/*", NULL}; - static char data[] = "Public ID=codeweavers"; char buffer[32]; + trace("Async HttpSendRequestEx test (%s %s)\n", nd->method, nd->host); + InitializeCriticalSection( &notification_cs ); - info.test = async_send_request_ex_test; - info.count = sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]); + info.test = nd->test; + info.count = nd->count; info.index = 0; info.wait = CreateEvent( NULL, FALSE, FALSE, NULL ); info.thread = GetCurrentThreadId(); + info.is_aborted = FALSE; ses = InternetOpen( "winetest", 0, NULL, NULL, INTERNET_FLAG_ASYNC ); ok( ses != NULL, "InternetOpen failed\n" ); pInternetSetStatusCallbackA( ses, check_notification ); - setup_test( &info, internet_connect, __LINE__ ); - con = InternetConnect( ses, "crossover.codeweavers.com", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)&info ); + setup_test( &info, internet_connect, __LINE__, ERROR_SUCCESS ); + con = InternetConnect( ses, nd->host, 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)&info ); ok( con != NULL, "InternetConnect failed %u\n", GetLastError() ); WaitForSingleObject( info.wait, 10000 ); - setup_test( &info, http_open_request, __LINE__ ); - req = HttpOpenRequest( con, "POST", "posttest.php", NULL, NULL, accept, 0, (DWORD_PTR)&info ); + setup_test( &info, http_open_request, __LINE__, ERROR_SUCCESS ); + req = HttpOpenRequest( con, nd->method, nd->path, NULL, NULL, accept, 0, (DWORD_PTR)&info ); ok( req != NULL, "HttpOpenRequest failed %u\n", GetLastError() ); WaitForSingleObject( info.wait, 10000 ); - memset( &b, 0, sizeof(INTERNET_BUFFERSA) ); - b.dwStructSize = sizeof(INTERNET_BUFFERSA); - b.lpcszHeader = "Content-Type: application/x-www-form-urlencoded"; - b.dwHeadersLength = strlen( b.lpcszHeader ); - b.dwBufferTotal = strlen( data ); - - setup_test( &info, http_send_request_ex, __LINE__ ); - ret = HttpSendRequestExA( req, &b, NULL, 0x28, 0 ); + if(nd->data) { + memset( &b, 0, sizeof(INTERNET_BUFFERSA) ); + b.dwStructSize = sizeof(INTERNET_BUFFERSA); + b.lpcszHeader = "Content-Type: application/x-www-form-urlencoded"; + b.dwHeadersLength = strlen( b.lpcszHeader ); + b.dwBufferTotal = nd->data ? strlen( nd->data ) : 0; + } + + setup_test( &info, http_send_request_ex, __LINE__, + nd->expect_conn_failure ? ERROR_INTERNET_NAME_NOT_RESOLVED : ERROR_SUCCESS ); + ret = HttpSendRequestExA( req, nd->data ? &b : NULL, NULL, 0x28, 0 ); ok( !ret && GetLastError() == ERROR_IO_PENDING, "HttpSendRequestExA failed %d %u\n", ret, GetLastError() ); - WaitForSingleObject( info.wait, 10000 ); + error = WaitForSingleObject( info.wait, 10000 ); + if(error != WAIT_OBJECT_0) { + skip("WaitForSingleObject returned %d, assuming DNS problem\n", error); + info.is_aborted = TRUE; + goto abort; + } size = sizeof(buffer); SetLastError( 0xdeadbeef ); ret = HttpQueryInfoA( req, HTTP_QUERY_CONTENT_ENCODING, buffer, &size, 0 ); error = GetLastError(); ok( !ret, "HttpQueryInfoA failed %u\n", GetLastError() ); - todo_wine - ok( error == ERROR_INTERNET_INCORRECT_HANDLE_STATE, - "expected ERROR_INTERNET_INCORRECT_HANDLE_STATE got %u\n", error ); - - written = 0; - size = strlen( data ); - setup_test( &info, internet_writefile, __LINE__ ); - ret = InternetWriteFile( req, data, size, &written ); - ok( ret, "InternetWriteFile failed %u\n", GetLastError() ); - ok( written == size, "expected %u got %u\n", written, size ); - - WaitForSingleObject( info.wait, 10000 ); + if(nd->expect_conn_failure) { + ok(error == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND got %u\n", error ); + }else { + todo_wine + ok(error == ERROR_INTERNET_INCORRECT_HANDLE_STATE, + "expected ERROR_INTERNET_INCORRECT_HANDLE_STATE got %u\n", error ); + } + + if (nd->data) + { + written = 0; + size = strlen( nd->data ); + setup_test( &info, internet_writefile, __LINE__, ERROR_SUCCESS ); + ret = InternetWriteFile( req, nd->data, size, &written ); + ok( ret, "InternetWriteFile failed %u\n", GetLastError() ); + ok( written == size, "expected %u got %u\n", written, size ); + + WaitForSingleObject( info.wait, 10000 ); + + SetLastError( 0xdeadbeef ); + ret = HttpEndRequestA( req, (void *)nd->data, 0x28, 0 ); + error = GetLastError(); + ok( !ret, "HttpEndRequestA succeeded\n" ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error ); + } SetLastError( 0xdeadbeef ); - ret = HttpEndRequestA( req, (void *)data, 0x28, 0 ); - error = GetLastError(); - ok( !ret, "HttpEndRequestA succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error ); - - SetLastError( 0xdeadbeef ); - setup_test( &info, http_end_request, __LINE__ ); + setup_test( &info, http_end_request, __LINE__, + nd->expect_conn_failure ? ERROR_INTERNET_OPERATION_CANCELLED : ERROR_SUCCESS); ret = HttpEndRequestA( req, NULL, 0x28, 0 ); error = GetLastError(); ok( !ret, "HttpEndRequestA succeeded\n" ); @@ -3350,7 +3480,8 @@ WaitForSingleObject( info.wait, 10000 ); - setup_test( &info, internet_close_handle, __LINE__ ); + setup_test( &info, internet_close_handle, __LINE__, ERROR_SUCCESS ); + abort: InternetCloseHandle( req ); InternetCloseHandle( con ); InternetCloseHandle( ses ); @@ -3488,7 +3619,9 @@ InternetReadFile_test(0, &test_data[2]); InternetReadFileExA_test(INTERNET_FLAG_ASYNC); test_open_url_async(); - test_async_HttpSendRequestEx(); + test_async_HttpSendRequestEx(&notification_data[0]); + test_async_HttpSendRequestEx(&notification_data[1]); + test_async_HttpSendRequestEx(&notification_data[2]); InternetOpenRequest_test(); test_http_cache(); InternetOpenUrlA_test(); Modified: trunk/rostests/winetests/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/interne… ============================================================================== --- trunk/rostests/winetests/wininet/internet.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/internet.c [iso-8859-1] Wed Jun 20 13:13:51 2012 @@ -41,16 +41,6 @@ static DWORD (WINAPI *pPrivacyGetZonePreferenceW)(DWORD, DWORD, LPDWORD, LPWSTR, LPDWORD); static DWORD (WINAPI *pPrivacySetZonePreferenceW)(DWORD, DWORD, DWORD, LPCWSTR); -/* Win9x and WinMe don't have lstrcmpW */ -static int strcmp_ww(const WCHAR *str1, const WCHAR *str2) -{ - DWORD len1 = lstrlenW(str1); - DWORD len2 = lstrlenW(str2); - - if (len1 != len2) return 1; - return memcmp(str1, str2, len1 * sizeof(WCHAR)); -} - /* ############################### */ static void test_InternetCanonicalizeUrlA(void) @@ -169,6 +159,7 @@ static const char useragent[] = {"Wininet Test"}; char *buffer; int retval; + BOOL res; hinet = InternetOpenA(useragent,INTERNET_OPEN_TYPE_DIRECT,NULL,NULL, 0); ok((hinet != 0x0),"InternetOpen Failed\n"); @@ -247,20 +238,65 @@ ok(retval == 0,"Got wrong return value %d\n",retval); ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code%d\n",err); + len = sizeof(val); + val = 0xdeadbeef; + res = InternetQueryOptionA(hinet, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); + ok(!res, "InternetQueryOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER) succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_INVALID_OPERATION, "GetLastError() = %u\n", GetLastError()); + + val = 2; + res = InternetSetOptionA(hinet, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)); + ok(!res, "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER) succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_INVALID_OPERATION, "GetLastError() = %u\n", GetLastError()); + InternetCloseHandle(hinet); - - len = sizeof(val); - retval = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); - ok(retval == TRUE,"Got wrong return value %d\n", retval); - ok(len == sizeof(val), "got %d\n", len); - ok(val == 2, "got %d\n", val); - - len = sizeof(val); - retval = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER, &val, &len); - ok(retval == TRUE,"Got wrong return value %d\n", retval); - ok(len == sizeof(val), "got %d\n", len); - ok(val == 4, "got %d\n", val); - +} + +static void test_max_conns(void) +{ + DWORD len, val; + BOOL res; + + len = sizeof(val); + val = 0xdeadbeef; + res = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); + ok(res,"Got wrong return value %x\n", res); + ok(len == sizeof(val), "got %d\n", len); + ok(val == 2, "got %d\n", val); + + len = sizeof(val); + val = 0xdeadbeef; + res = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER, &val, &len); + ok(res,"Got wrong return value %x\n", res); + ok(len == sizeof(val), "got %d\n", len); + ok(val == 4, "got %d\n", val); + + val = 3; + res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)); + ok(res, "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER) failed: %x\n", res); + + len = sizeof(val); + val = 0xdeadbeef; + res = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); + ok(res,"Got wrong return value %x\n", res); + ok(len == sizeof(val), "got %d\n", len); + ok(val == 3, "got %d\n", val); + + val = 0; + res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)); + ok(!res || broken(res), /* <= w2k3 */ + "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER, 0) succeeded\n"); + if (!res) ok(GetLastError() == ERROR_BAD_ARGUMENTS, "GetLastError() = %u\n", GetLastError()); + + val = 2; + res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)-1); + ok(!res, "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER) succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_BAD_OPTION_LENGTH, "GetLastError() = %u\n", GetLastError()); + + val = 2; + res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)+1); + ok(!res, "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER) succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_BAD_OPTION_LENGTH, "GetLastError() = %u\n", GetLastError()); } static void test_get_cookie(void) @@ -497,7 +533,7 @@ ok( sz == 1 + lstrlenW(buffer) || sz == lstrlenW(buffer), "sz wrong %d\n", sz); /* before XP SP2, buffer is "server; server" */ - ok( !strcmp_ww(szExpect, buffer) || !strcmp_ww(szServer, buffer), "cookie data wrong\n"); + ok( !lstrcmpW(szExpect, buffer) || !lstrcmpW(szServer, buffer), "cookie data wrong\n"); sz = sizeof(buffer); r = InternetQueryOptionA(NULL, INTERNET_OPTION_CONNECTED_STATE, buffer, &sz); @@ -995,7 +1031,7 @@ ret = InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, &size); ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); - ok(!strcmp_ww(list.pOptions[0].Value.pszValue, proxy_srvW), + ok(!lstrcmpW(list.pOptions[0].Value.pszValue, proxy_srvW), "Retrieved proxy server should've been %s, was: %s\n", wine_dbgstr_w(proxy_srvW), wine_dbgstr_w(list.pOptions[0].Value.pszValue)); ok(list.pOptions[1].Value.dwValue == PROXY_TYPE_PROXY, @@ -1321,6 +1357,7 @@ test_Option_PerConnectionOption(); test_Option_PerConnectionOptionA(); test_InternetErrorDlg(); + test_max_conns(); if (!pInternetTimeFromSystemTimeA) win_skip("skipping the InternetTime tests\n"); Modified: trunk/rostests/winetests/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/urlcach… ============================================================================== --- trunk/rostests/winetests/wininet/urlcache.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/urlcache.c [iso-8859-1] Wed Jun 20 13:13:51 2012 @@ -69,6 +69,7 @@ if (!strcmp(lpCacheEntryInfo->lpszSourceUrlName, TEST_URL)) { found = TRUE; + ret = TRUE; break; } SetLastError(0xdeadbeef); @@ -83,11 +84,11 @@ ret = FindNextUrlCacheEntry(hEnumHandle, lpCacheEntryInfo, &cbCacheEntryInfo); } } - ok(ret, "FindNextUrlCacheEntry failed with error %d\n", GetLastError()); if (!ret) break; } - ok(found, "committed url cache entry not found during enumeration\n"); + ok(ret, "FindNextUrlCacheEntry failed with error %d\n", GetLastError()); + ok(found, "Committed url cache entry not found during enumeration\n"); ret = FindCloseUrlCache(hEnumHandle); ok(ret, "FindCloseUrlCache failed with error %d\n", GetLastError()); @@ -133,7 +134,7 @@ ret = GetUrlCacheEntryInfoEx(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, NULL, NULL, NULL, 0); ok(ret, "GetUrlCacheEntryInfoEx failed with error %d\n", GetLastError()); - check_cache_entry_infoA("GetUrlCacheEntryInfoEx", lpCacheEntryInfo); + if (ret) check_cache_entry_infoA("GetUrlCacheEntryInfoEx", lpCacheEntryInfo); cbCacheEntryInfo = 100000; SetLastError(0xdeadbeef); @@ -146,10 +147,12 @@ /* Querying the redirect URL fails with ERROR_INVALID_PARAMETER */ SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, NULL, NULL, &cbRedirectUrl, NULL, 0); + ok(!ret, "GetUrlCacheEntryInfoEx should have failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, &cbCacheEntryInfo, NULL, &cbRedirectUrl, NULL, 0); + ok(!ret, "GetUrlCacheEntryInfoEx should have failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } @@ -234,6 +237,7 @@ "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); info = HeapAlloc(GetProcessHeap(), 0, size); ret = GetUrlCacheEntryInfo(TEST_URL, info, &size); + ok(ret, "GetUrlCacheEntryInfo failed: %d\n", GetLastError()); GetSystemTimeAsFileTime(&info->ExpireTime); exp_time.u.LowPart = info->ExpireTime.dwLowDateTime; exp_time.u.HighPart = info->ExpireTime.dwHighDateTime; @@ -344,6 +348,7 @@ HANDLE hFile; BYTE zero_byte = 0; LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; + LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo2; DWORD cbCacheEntryInfo; static const FILETIME filetime_zero; FILETIME now; @@ -358,7 +363,7 @@ create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); - ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, NULL, 0, NULL, NULL); + ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, NULL, 0, "html", NULL); ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); cbCacheEntryInfo = 0; ret = GetUrlCacheEntryInfo(TEST_URL1, NULL, &cbCacheEntryInfo); @@ -378,9 +383,11 @@ lpCacheEntryInfo->CacheEntryType); ok(!U(*lpCacheEntryInfo).dwExemptDelta, "expected dwExemptDelta 0, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); - HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); - - /* A subsequent commit with a different time/type doesn't change the type */ + + /* Make sure there is a notable change in timestamps */ + Sleep(1000); + + /* A subsequent commit with a different time/type doesn't change most of the entry */ GetSystemTimeAsFileTime(&now); ret = CommitUrlCacheEntry(TEST_URL1, NULL, now, now, NORMAL_CACHE_ENTRY, (LPBYTE)ok_header, strlen(ok_header), NULL, NULL); @@ -390,26 +397,41 @@ ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); - ret = GetUrlCacheEntryInfo(TEST_URL1, lpCacheEntryInfo, &cbCacheEntryInfo); + lpCacheEntryInfo2 = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_URL1, lpCacheEntryInfo2, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); /* but it does change the time.. */ todo_wine - ok(memcmp(&lpCacheEntryInfo->ExpireTime, &filetime_zero, sizeof(FILETIME)), + ok(memcmp(&lpCacheEntryInfo2->ExpireTime, &filetime_zero, sizeof(FILETIME)), "expected positive ExpireTime\n"); todo_wine - ok(memcmp(&lpCacheEntryInfo->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), + ok(memcmp(&lpCacheEntryInfo2->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), "expected positive LastModifiedTime\n"); - ok(lpCacheEntryInfo->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || - broken(lpCacheEntryInfo->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), + ok(lpCacheEntryInfo2->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || + broken(lpCacheEntryInfo2->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", - lpCacheEntryInfo->CacheEntryType); + lpCacheEntryInfo2->CacheEntryType); /* and set the headers. */ todo_wine - ok(lpCacheEntryInfo->dwHeaderInfoSize == 19, - "expected headers size 19, got %d\n", - lpCacheEntryInfo->dwHeaderInfoSize); + ok(lpCacheEntryInfo2->dwHeaderInfoSize == 19, + "expected headers size 19, got %d\n", + lpCacheEntryInfo2->dwHeaderInfoSize); + /* Hit rate gets incremented by 1 */ + todo_wine + ok((lpCacheEntryInfo->dwHitRate + 1) == lpCacheEntryInfo2->dwHitRate, + "HitRate not incremented by one on commit\n"); + /* Last access time should be updated */ + todo_wine + ok(!(lpCacheEntryInfo->LastAccessTime.dwHighDateTime == lpCacheEntryInfo2->LastAccessTime.dwHighDateTime && + lpCacheEntryInfo->LastAccessTime.dwLowDateTime == lpCacheEntryInfo2->LastAccessTime.dwLowDateTime), + "Last accessed time was not updated by commit\n"); + /* File extension should be unset */ + todo_wine + ok(lpCacheEntryInfo2->lpszFileExtension == NULL, + "Fileextension isn't unset: %s\n", + lpCacheEntryInfo2->lpszFileExtension); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo2); ret = CommitUrlCacheEntry(TEST_URL, filenameA, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); @@ -425,7 +447,7 @@ ret = RetrieveUrlCacheEntryFile(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, 0); ok(ret, "RetrieveUrlCacheEntryFile failed with error %d\n", GetLastError()); - check_cache_entry_infoA("RetrieveUrlCacheEntryFile", lpCacheEntryInfo); + if (ret) check_cache_entry_infoA("RetrieveUrlCacheEntryFile", lpCacheEntryInfo); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); @@ -491,7 +513,7 @@ cbCacheEntryInfo = 0; SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); @@ -550,18 +572,25 @@ if (pDeleteUrlCacheEntryA) { ret = pDeleteUrlCacheEntryA(TEST_URL); - todo_wine ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); check_file_exists(filenameA); } + + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + memset(lpCacheEntryInfo, 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + ok(lpCacheEntryInfo->CacheEntryType & DELETED_CACHE_ENTRY, + "CacheEntryType hasn't DELETED_CACHE_ENTRY set, (flags %08x)\n", + lpCacheEntryInfo->CacheEntryType); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + if (pUnlockUrlCacheEntryFileA) { check_file_exists(filenameA); ret = pUnlockUrlCacheEntryFileA(TEST_URL, 0); - todo_wine ok(ret, "UnlockUrlCacheEntryFileA failed: %d\n", GetLastError()); /* By unlocking the already-deleted cache entry, the file associated * with it is deleted.. @@ -634,6 +663,7 @@ ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); @@ -644,7 +674,7 @@ cbCacheEntryInfo = 0; SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); @@ -654,7 +684,7 @@ "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, - "expected dwExemptDelta 864000, got %d\n", + "expected dwExemptDelta 86400, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); if (pDeleteUrlCacheEntryA) @@ -676,7 +706,7 @@ cbCacheEntryInfo = 0; SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); @@ -686,7 +716,7 @@ "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, - "expected dwExemptDelta 864000, got %d\n", + "expected dwExemptDelta 86400, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); U(*lpCacheEntryInfo).dwExemptDelta = 0; ret = SetUrlCacheEntryInfoA(TEST_URL, lpCacheEntryInfo, @@ -702,7 +732,30 @@ ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); + + /* Recommit of Url entry keeps dwExemptDelta */ + U(*lpCacheEntryInfo).dwExemptDelta = 8600; + ret = SetUrlCacheEntryInfoA(TEST_URL, lpCacheEntryInfo, + CACHE_ENTRY_EXEMPT_DELTA_FC); + ok(ret, "SetUrlCacheEntryInfo failed: %d\n", GetLastError()); + + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA1, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + create_and_write_file(filenameA1, &zero_byte, sizeof(zero_byte)); + + ret = CommitUrlCacheEntry(TEST_URL, filenameA1, filetime_zero, filetime_zero, + NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY, + (LPBYTE)ok_header, strlen(ok_header), "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + + ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + ok(U(*lpCacheEntryInfo).dwExemptDelta == 8600, + "expected dwExemptDelta 8600, got %d\n", + U(*lpCacheEntryInfo).dwExemptDelta); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + if (pDeleteUrlCacheEntryA) { ret = pDeleteUrlCacheEntryA(TEST_URL);

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