wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Martin Storsjo : api-ms-win-core-localization-l1-2-0: Add stub dll.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: f3b9ffce2cc3e1ae4ec208377906f5486a0e8789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b9ffce2cc3e1ae4ec208377… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:33 2014 +0200 api-ms-win-core-localization-l1-2-0: Add stub dll. --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-localization-l1-2-0.spec | 59 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 64 insertions(+) diff --git a/configure b/configure index 03c49a5..b558ec7 100755 --- a/configure +++ b/configure @@ -863,6 +863,7 @@ enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_io_l1_1_1 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_1 +enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 @@ -16600,6 +16601,7 @@ wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_int wine_fn_config_dll api-ms-win-core-io-l1-1-1 enable_api_ms_win_core_io_l1_1_1 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_win_core_libraryloader_l1_1_1 +wine_fn_config_dll api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 diff --git a/configure.ac b/configure.ac index ae58f2d..9d6af3a 100644 --- a/configure.ac +++ b/configure.ac @@ -2632,6 +2632,7 @@ WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) diff --git a/dlls/api-ms-win-core-localization-l1-2-0/Makefile.in b/dlls/api-ms-win-core-localization-l1-2-0/Makefile.in new file mode 100644 index 0000000..cd073da --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-localization-l1-2-0.dll diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec new file mode 100644 index 0000000..7c6f6fe --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -0,0 +1,59 @@ +@ stdcall ConvertDefaultLocale(long) kernel32.ConvertDefaultLocale +@ stdcall EnumSystemGeoID(long long ptr) kernel32.EnumSystemGeoID +@ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA +@ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW +@ stub FindNLSString +@ stub FindNLSStringEx +@ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA +@ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW +@ stdcall GetACP() kernel32.GetACP +@ stdcall GetCPInfo(long ptr) kernel32.GetCPInfo +@ stdcall GetCPInfoExW(long long ptr) kernel32.GetCPInfoExW +@ stub GetCalendarInfoEx +@ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW +@ stub GetFileMUIInfo +@ stub GetFileMUIPath +@ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW +@ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA +@ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx +@ stdcall GetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW +@ stub GetNLSVersion +@ stub GetNLSVersionEx +@ stdcall GetOEMCP() kernel32.GetOEMCP +@ stub GetProcessPreferredUILanguages +@ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID +@ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID +@ stub GetSystemPreferredUILanguages +@ stdcall GetThreadLocale() kernel32.GetThreadLocale +@ stdcall GetThreadPreferredUILanguages(long ptr ptr ptr) kernel32.GetThreadPreferredUILanguages +@ stdcall GetThreadUILanguage() kernel32.GetThreadUILanguage +@ stub GetUILanguageInfo +@ stdcall GetUserDefaultLCID() kernel32.GetUserDefaultLCID +@ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID +@ stdcall GetUserDefaultLocaleName(ptr long) kernel32.GetUserDefaultLocaleName +@ stdcall GetUserGeoID(long) kernel32.GetUserGeoID +@ stub GetUserPreferredUILanguages +@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii +@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode +@ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte +@ stdcall IsDBCSLeadByteEx(long long) kernel32.IsDBCSLeadByteEx +@ stub IsNLSDefinedString +@ stdcall IsValidCodePage(long) kernel32.IsValidCodePage +@ stdcall IsValidLanguageGroup(long long) kernel32.IsValidLanguageGroup +@ stdcall IsValidLocale(long long) kernel32.IsValidLocale +@ stdcall IsValidLocaleName(wstr) kernel32.IsValidLocaleName +@ stub IsValidNLSVersion +@ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA +@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx +@ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW +@ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID +@ stub ResolveLocaleName +@ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW +@ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW +@ stub SetProcessPreferredUILanguages +@ stdcall SetThreadLocale(long) kernel32.SetThreadLocale +@ stdcall SetThreadPreferredUILanguages(long ptr ptr) kernel32.SetThreadPreferredUILanguages +@ stdcall SetThreadUILanguage(long) kernel32.SetThreadUILanguage +@ stdcall SetUserGeoID(long) kernel32.SetUserGeoID +@ stdcall VerLanguageNameA(long str long) kernel32.VerLanguageNameA +@ stdcall VerLanguageNameW(long wstr long) kernel32.VerLanguageNameW diff --git a/tools/make_specfiles b/tools/make_specfiles index ddb7f83..c123fe0 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -152,6 +152,7 @@ my @dll_groups = "api-ms-win-core-io-l1-1-1", "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-libraryloader-l1-1-1", + "api-ms-win-core-localization-l1-2-0", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-libraryloader-l1-1-1: Add stub dll.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: be1560734d41d43043fac9795677104f4642ccd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1560734d41d43043fac9795… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:32 2014 +0200 api-ms-win-core-libraryloader-l1-1-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-libraryloader-l1-1-1.spec | 30 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 35 insertions(+) diff --git a/configure b/configure index 6d8d3ec..03c49a5 100755 --- a/configure +++ b/configure @@ -862,6 +862,7 @@ enable_api_ms_win_core_heap_obsolete_l1_1_0 enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_io_l1_1_1 enable_api_ms_win_core_kernel32_legacy_l1_1_0 +enable_api_ms_win_core_libraryloader_l1_1_1 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 @@ -16598,6 +16599,7 @@ wine_fn_config_dll api-ms-win-core-heap-obsolete-l1-1-0 enable_api_ms_win_core_h wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 wine_fn_config_dll api-ms-win-core-io-l1-1-1 enable_api_ms_win_core_io_l1_1_1 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 +wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_win_core_libraryloader_l1_1_1 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 diff --git a/configure.ac b/configure.ac index 53be1c8..ae58f2d 100644 --- a/configure.ac +++ b/configure.ac @@ -2631,6 +2631,7 @@ WINE_CONFIG_DLL(api-ms-win-core-heap-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) diff --git a/dlls/api-ms-win-core-libraryloader-l1-1-1/Makefile.in b/dlls/api-ms-win-core-libraryloader-l1-1-1/Makefile.in new file mode 100644 index 0000000..d244ef1 --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-libraryloader-l1-1-1.dll diff --git a/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec b/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec new file mode 100644 index 0000000..3a8e3d9 --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec @@ -0,0 +1,30 @@ +@ stub AddDllDirectory +@ stdcall DisableThreadLibraryCalls(long) kernel32.DisableThreadLibraryCalls +@ stub EnumResourceLanguagesExA +@ stub EnumResourceLanguagesExW +@ stub EnumResourceNamesExA +@ stub EnumResourceNamesExW +@ stub EnumResourceTypesExA +@ stub EnumResourceTypesExW +@ stdcall FindResourceExW(long wstr wstr long) kernel32.FindResourceExW +@ stub FindStringOrdinal +@ stdcall FreeLibrary(long) kernel32.FreeLibrary +@ stdcall FreeLibraryAndExitThread(long long) kernel32.FreeLibraryAndExitThread +@ stdcall FreeResource(long) kernel32.FreeResource +@ stdcall GetModuleFileNameA(long ptr long) kernel32.GetModuleFileNameA +@ stdcall GetModuleFileNameW(long ptr long) kernel32.GetModuleFileNameW +@ stdcall GetModuleHandleA(str) kernel32.GetModuleHandleA +@ stdcall GetModuleHandleExA(long ptr ptr) kernel32.GetModuleHandleExA +@ stdcall GetModuleHandleExW(long ptr ptr) kernel32.GetModuleHandleExW +@ stdcall GetModuleHandleW(wstr) kernel32.GetModuleHandleW +@ stdcall GetProcAddress(long str) kernel32.GetProcAddress +@ stdcall LoadLibraryExA( str long long) kernel32.LoadLibraryExA +@ stdcall LoadLibraryExW(wstr long long) kernel32.LoadLibraryExW +@ stdcall LoadResource(long long) kernel32.LoadResource +@ stdcall LoadStringA(long long ptr long) user32.LoadStringA +@ stdcall LoadStringW(long long ptr long) user32.LoadStringW +@ stdcall LockResource(long) kernel32.LockResource +@ stub QueryOptionalDelayLoadedAPI +@ stub RemoveDllDirectory +@ stub SetDefaultDllDirectories +@ stdcall SizeofResource(long long) kernel32.SizeofResource diff --git a/tools/make_specfiles b/tools/make_specfiles index 16154e6..ddb7f83 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -151,6 +151,7 @@ my @dll_groups = "api-ms-win-core-heap-obsolete-l1-1-0", "api-ms-win-core-io-l1-1-1", "api-ms-win-core-kernel32-legacy-l1-1-0", + "api-ms-win-core-libraryloader-l1-1-1", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-kernel32-legacy-l1-1-0: Add stub dll.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: caaf93db38580316a16324c59a57a56aee883803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caaf93db38580316a16324c59… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:31 2014 +0200 api-ms-win-core-kernel32-legacy-l1-1-0: Add stub dll. --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-kernel32-legacy-l1-1-0.spec | 54 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 59 insertions(+) diff --git a/configure b/configure index a1cc72e..6d8d3ec 100755 --- a/configure +++ b/configure @@ -861,6 +861,7 @@ enable_api_ms_win_core_heap_l1_2_0 enable_api_ms_win_core_heap_obsolete_l1_1_0 enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_io_l1_1_1 +enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 @@ -16596,6 +16597,7 @@ wine_fn_config_dll api-ms-win-core-heap-l1-2-0 enable_api_ms_win_core_heap_l1_2_ wine_fn_config_dll api-ms-win-core-heap-obsolete-l1-1-0 enable_api_ms_win_core_heap_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 wine_fn_config_dll api-ms-win-core-io-l1-1-1 enable_api_ms_win_core_io_l1_1_1 +wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 diff --git a/configure.ac b/configure.ac index 74a15da..53be1c8 100644 --- a/configure.ac +++ b/configure.ac @@ -2630,6 +2630,7 @@ WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-heap-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/Makefile.in b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/Makefile.in new file mode 100644 index 0000000..1791d32 --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-kernel32-legacy-l1-1-0.dll diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec new file mode 100644 index 0000000..f4b9050 --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec @@ -0,0 +1,54 @@ +@ stub AddLocalAlternateComputerNameW +@ stdcall BackupRead(ptr ptr long ptr long long ptr) kernel32.BackupRead +@ stdcall BackupWrite(ptr ptr long ptr long long ptr) kernel32.BackupWrite +@ stdcall BindIoCompletionCallback(long ptr long) kernel32.BindIoCompletionCallback +@ stdcall CopyFileA(str str long) kernel32.CopyFileA +@ stdcall CopyFileW(wstr wstr long) kernel32.CopyFileW +@ stdcall CreateFileMappingA(long ptr long long long str) kernel32.CreateFileMappingA +@ stub CreateFileTransactedW +@ stdcall CreateMailslotA(str long long ptr) kernel32.CreateMailslotA +@ stdcall CreateNamedPipeA(str long long long long long long ptr) kernel32.CreateNamedPipeA +@ stdcall CreateSemaphoreW(ptr long long wstr) kernel32.CreateSemaphoreW +@ stdcall DnsHostnameToComputerNameW(wstr ptr ptr) kernel32.DnsHostnameToComputerNameW +@ stdcall DosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime +@ stdcall FatalAppExitA(long str) kernel32.FatalAppExitA +@ stdcall FatalAppExitW(long wstr) kernel32.FatalAppExitW +@ stdcall FileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime +@ stdcall FindResourceA(long str str) kernel32.FindResourceA +@ stdcall FindResourceExA(long str str long) kernel32.FindResourceExA +@ stdcall FindResourceW(long wstr wstr) kernel32.FindResourceW +@ stdcall GetComputerNameA(ptr ptr) kernel32.GetComputerNameA +@ stdcall GetComputerNameW(ptr ptr) kernel32.GetComputerNameW +@ stdcall GetConsoleWindow() kernel32.GetConsoleWindow +@ stub GetDurationFormatEx +@ stub GetMaximumProcessorGroupCount +@ stub GetNamedPipeClientProcessId +@ stub GetNamedPipeServerProcessId +@ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA +@ stdcall GetStartupInfoA(ptr) kernel32.GetStartupInfoA +@ stdcall GetStringTypeExA(long long str long ptr) kernel32.GetStringTypeExA +@ stdcall GetSystemPowerStatus(ptr) kernel32.GetSystemPowerStatus +@ stdcall GetSystemWow64DirectoryA(ptr long) kernel32.GetSystemWow64DirectoryA +@ stdcall GetSystemWow64DirectoryW(ptr long) kernel32.GetSystemWow64DirectoryW +@ stdcall GetTapeParameters(ptr long ptr ptr) kernel32.GetTapeParameters +@ stdcall GetTempPathA(long ptr) kernel32.GetTempPathA +@ stdcall GetThreadSelectorEntry(long long ptr) kernel32.GetThreadSelectorEntry +@ stdcall GlobalMemoryStatus(ptr) kernel32.GlobalMemoryStatus +@ stdcall LoadLibraryA(str) kernel32.LoadLibraryA +@ stdcall LoadLibraryW(wstr) kernel32.LoadLibraryW +@ stdcall MoveFileA(str str) kernel32.MoveFileA +@ stdcall MoveFileExA(str str long) kernel32.MoveFileExA +@ stdcall MoveFileW(wstr wstr) kernel32.MoveFileW +@ stdcall MulDiv(long long long) kernel32.MulDiv +@ stdcall OpenFile(str ptr long) kernel32.OpenFile +@ stdcall PulseEvent(long) kernel32.PulseEvent +@ stub RaiseFailFastException +@ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long) kernel32.RegisterWaitForSingleObject +@ stdcall SetConsoleTitleA(str) kernel32.SetConsoleTitleA +@ stub SetFileCompletionNotificationModes +@ stdcall SetHandleCount(long) kernel32.SetHandleCount +@ stdcall SetMailslotInfo(long long) kernel32.SetMailslotInfo +@ stdcall SetVolumeLabelW(wstr wstr) kernel32.SetVolumeLabelW +@ stdcall UnregisterWait(long) kernel32.UnregisterWait +@ stdcall WTSGetActiveConsoleSessionId() kernel32.WTSGetActiveConsoleSessionId +@ stdcall WaitForMultipleObjects(long ptr long long) kernel32.WaitForMultipleObjects diff --git a/tools/make_specfiles b/tools/make_specfiles index 7b82e47..16154e6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -150,6 +150,7 @@ my @dll_groups = "api-ms-win-core-heap-l1-2-0", "api-ms-win-core-heap-obsolete-l1-1-0", "api-ms-win-core-io-l1-1-1", + "api-ms-win-core-kernel32-legacy-l1-1-0", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-io-l1-1-1: Add stub dll.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 1c4f6ec7423ead8169220e87854ba5f799139078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4f6ec7423ead8169220e878… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:30 2014 +0200 api-ms-win-core-io-l1-1-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-io-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index eb4e4d4..a1cc72e 100755 --- a/configure +++ b/configure @@ -860,6 +860,7 @@ enable_api_ms_win_core_handle_l1_1_0 enable_api_ms_win_core_heap_l1_2_0 enable_api_ms_win_core_heap_obsolete_l1_1_0 enable_api_ms_win_core_interlocked_l1_2_0 +enable_api_ms_win_core_io_l1_1_1 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 @@ -16594,6 +16595,7 @@ wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_l wine_fn_config_dll api-ms-win-core-heap-l1-2-0 enable_api_ms_win_core_heap_l1_2_0 wine_fn_config_dll api-ms-win-core-heap-obsolete-l1-1-0 enable_api_ms_win_core_heap_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 +wine_fn_config_dll api-ms-win-core-io-l1-1-1 enable_api_ms_win_core_io_l1_1_1 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 diff --git a/configure.ac b/configure.ac index 327959b..74a15da 100644 --- a/configure.ac +++ b/configure.ac @@ -2629,6 +2629,7 @@ WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-heap-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) diff --git a/dlls/api-ms-win-core-io-l1-1-1/Makefile.in b/dlls/api-ms-win-core-io-l1-1-1/Makefile.in new file mode 100644 index 0000000..b5428b1 --- /dev/null +++ b/dlls/api-ms-win-core-io-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-io-l1-1-1.dll diff --git a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec new file mode 100644 index 0000000..e05728e --- /dev/null +++ b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec @@ -0,0 +1,10 @@ +@ stdcall CancelIo(long) kernel32.CancelIo +@ stdcall CancelIoEx(long ptr) kernel32.CancelIoEx +@ stub CancelSynchronousIo +@ stdcall CreateIoCompletionPort(long long long long) kernel32.CreateIoCompletionPort +@ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) kernel32.DeviceIoControl +@ stdcall GetOverlappedResult(long ptr ptr long) kernel32.GetOverlappedResult +@ stub GetOverlappedResultEx +@ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) kernel32.GetQueuedCompletionStatus +@ stub GetQueuedCompletionStatusEx +@ stdcall PostQueuedCompletionStatus(long long ptr ptr) kernel32.PostQueuedCompletionStatus diff --git a/tools/make_specfiles b/tools/make_specfiles index d282c85..7b82e47 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -149,6 +149,7 @@ my @dll_groups = "api-ms-win-core-handle-l1-1-0", "api-ms-win-core-heap-l1-2-0", "api-ms-win-core-heap-obsolete-l1-1-0", + "api-ms-win-core-io-l1-1-1", ], [ "ole32",

1 0

Nikolay Sivov : shell32/tests: Remove some assertions in test code.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: de686e994908c2e54a1aad164c2f9486038442d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de686e994908c2e54a1aad164… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 15:02:09 2014 +0400 shell32/tests: Remove some assertions in test code. --- dlls/shell32/tests/shlexec.c | 74 +++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 7f0208d..706ad34 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -355,13 +355,15 @@ static void create_test_verb_dde(const char* extension, const char* verb, sprintf(shell, "shlexec%s\\shell", extension); rc=RegOpenKeyExA(HKEY_CLASSES_ROOT, shell, 0, KEY_CREATE_SUB_KEY, &hkey_shell); - assert(rc==ERROR_SUCCESS); + ok(rc == ERROR_SUCCESS, "%s key creation failed with %d\n", shell, rc); + rc=RegCreateKeyExA(hkey_shell, verb, 0, NULL, 0, KEY_CREATE_SUB_KEY, NULL, &hkey_verb, NULL); - assert(rc==ERROR_SUCCESS); + ok(rc == ERROR_SUCCESS, "%s verb key creation failed with %d\n", verb, rc); + rc=RegCreateKeyExA(hkey_verb, "command", 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey_cmd, NULL); - assert(rc==ERROR_SUCCESS); + ok(rc == ERROR_SUCCESS, "\'command\' key creation failed with %d\n", rc); if (rawcmd) { @@ -372,7 +374,7 @@ static void create_test_verb_dde(const char* extension, const char* verb, cmd=HeapAlloc(GetProcessHeap(), 0, strlen(argv0)+10+strlen(child_file)+2+strlen(cmdtail)+1); sprintf(cmd,"%s shlexec \"%s\" %s", argv0, child_file, cmdtail); rc=RegSetValueExA(hkey_cmd, NULL, 0, REG_SZ, (LPBYTE)cmd, strlen(cmd)+1); - assert(rc==ERROR_SUCCESS); + ok(rc == ERROR_SUCCESS, "setting command failed with %d\n", rc); HeapFree(GetProcessHeap(), 0, cmd); } @@ -382,38 +384,40 @@ static void create_test_verb_dde(const char* extension, const char* verb, rc=RegCreateKeyExA(hkey_verb, "ddeexec", 0, NULL, 0, KEY_SET_VALUE | KEY_CREATE_SUB_KEY, NULL, &hkey_ddeexec, NULL); - assert(rc==ERROR_SUCCESS); + ok(rc == ERROR_SUCCESS, "\'ddeexec\' key creation failed with %d\n", rc); rc=RegSetValueExA(hkey_ddeexec, NULL, 0, REG_SZ, (LPBYTE)ddeexec, strlen(ddeexec)+1); - assert(rc==ERROR_SUCCESS); + ok(rc == ERROR_SUCCESS, "set value failed with %d\n", rc); + if (application) { rc=RegCreateKeyExA(hkey_ddeexec, "application", 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey_application, NULL); - assert(rc==ERROR_SUCCESS); + ok(rc == ERROR_SUCCESS, "\'application\' key creation failed with %d\n", rc); + rc=RegSetValueExA(hkey_application, NULL, 0, REG_SZ, (LPBYTE)application, strlen(application)+1); - assert(rc==ERROR_SUCCESS); + ok(rc == ERROR_SUCCESS, "set value failed with %d\n", rc); CloseHandle(hkey_application); } if (topic) { rc=RegCreateKeyExA(hkey_ddeexec, "topic", 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey_topic, NULL); - assert(rc==ERROR_SUCCESS); + ok(rc == ERROR_SUCCESS, "\'topic\' key creation failed with %d\n", rc); rc=RegSetValueExA(hkey_topic, NULL, 0, REG_SZ, (LPBYTE)topic, strlen(topic)+1); - assert(rc==ERROR_SUCCESS); + ok(rc == ERROR_SUCCESS, "set value failed with %d\n", rc); CloseHandle(hkey_topic); } if (ifexec) { rc=RegCreateKeyExA(hkey_ddeexec, "ifexec", 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey_ifexec, NULL); - assert(rc==ERROR_SUCCESS); + ok(rc == ERROR_SUCCESS, "\'ifexec\' key creation failed with %d\n", rc); rc=RegSetValueExA(hkey_ifexec, NULL, 0, REG_SZ, (LPBYTE)ifexec, strlen(ifexec)+1); - assert(rc==ERROR_SUCCESS); + ok(rc == ERROR_SUCCESS, "set value failed with %d\n", rc); CloseHandle(hkey_ifexec); } CloseHandle(hkey_ddeexec); @@ -519,13 +523,15 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, if (!DdeCmpStringHandles(hsz1, hszTopic)) { size = DdeQueryStringA(ddeInst, hsz2, ddeApplication, MAX_PATH, CP_WINANSI); + ok(size < MAX_PATH, "got size %d\n", size); assert(size < MAX_PATH); return (HDDEDATA)TRUE; } return (HDDEDATA)FALSE; case XTYP_EXECUTE: - size = DdeGetData(hData, (LPBYTE)ddeExec, MAX_PATH, 0L); + size = DdeGetData(hData, (LPBYTE)ddeExec, MAX_PATH, 0); + ok(size < MAX_PATH, "got size %d\n", size); assert(size < MAX_PATH); DdeFreeDataHandle(hData); if (post_quit_on_execute) @@ -593,12 +599,12 @@ static void doChild(int argc, char** argv) post_quit_on_execute = TRUE; ddeInst = 0; rc = DdeInitializeA(&ddeInst, ddeCb, CBF_SKIP_ALLNOTIFICATIONS | CBF_FAIL_ADVISES | - CBF_FAIL_POKES | CBF_FAIL_REQUESTS, 0L); - assert(rc == DMLERR_NO_ERROR); + CBF_FAIL_POKES | CBF_FAIL_REQUESTS, 0); + ok(rc == DMLERR_NO_ERROR, "got %d\n", rc); hszApplication = DdeCreateStringHandleA(ddeInst, shared_block, CP_WINANSI); hszTopic = DdeCreateStringHandleA(ddeInst, shared_block + strlen(shared_block) + 1, CP_WINANSI); assert(hszApplication && hszTopic); - assert(DdeNameService(ddeInst, hszApplication, 0L, DNS_REGISTER | DNS_FILTEROFF)); + assert(DdeNameService(ddeInst, hszApplication, 0, DNS_REGISTER | DNS_FILTEROFF)); timer = SetTimer(NULL, 0, 2500, childTimeout); @@ -611,7 +617,7 @@ static void doChild(int argc, char** argv) Sleep(500); KillTimer(NULL, timer); - assert(DdeNameService(ddeInst, hszApplication, 0L, DNS_UNREGISTER)); + assert(DdeNameService(ddeInst, hszApplication, 0, DNS_UNREGISTER)); assert(DdeFreeStringHandle(ddeInst, hszTopic)); assert(DdeFreeStringHandle(ddeInst, hszApplication)); assert(DdeUninitialize(ddeInst)); @@ -2355,26 +2361,31 @@ static void test_dde_default_app(void) MSG msg; INT_PTR rc; int which = 0; + HDDEDATA ret; + BOOL b; post_quit_on_execute = FALSE; ddeInst = 0; rc = DdeInitializeA(&ddeInst, ddeCb, CBF_SKIP_ALLNOTIFICATIONS | CBF_FAIL_ADVISES | - CBF_FAIL_POKES | CBF_FAIL_REQUESTS, 0L); - assert(rc == DMLERR_NO_ERROR); + CBF_FAIL_POKES | CBF_FAIL_REQUESTS, 0); + ok(rc == DMLERR_NO_ERROR, "got %lx\n", rc); sprintf(filename, "%s\\test file.sde", tmpdir); /* It is strictly not necessary to register an application name here, but wine's - * DdeNameService implementation complains if 0L is passed instead of + * DdeNameService implementation complains if 0 is passed instead of * hszApplication with DNS_FILTEROFF */ hszApplication = DdeCreateStringHandleA(ddeInst, "shlexec", CP_WINANSI); hszTopic = DdeCreateStringHandleA(ddeInst, "shlexec", CP_WINANSI); - assert(hszApplication && hszTopic); - assert(DdeNameService(ddeInst, hszApplication, 0L, DNS_REGISTER | DNS_FILTEROFF)); + ok(hszApplication && hszTopic, "got %p and %p\n", hszApplication, hszTopic); + ret = DdeNameService(ddeInst, hszApplication, 0, DNS_REGISTER | DNS_FILTEROFF); + ok(ret != 0, "got %p\n", ret); test = dde_default_app_tests; while (test->command) { + HANDLE thread; + if (!create_test_association(".sde")) { skip("Unable to create association for '.sde'\n"); @@ -2389,7 +2400,8 @@ static void test_dde_default_app(void) * so don't wait for it */ SetEvent(hEvent); - assert(CreateThread(NULL, 0, ddeThread, &info, 0, &threadId)); + thread = CreateThread(NULL, 0, ddeThread, &info, 0, &threadId); + ok(thread != NULL, "got %p\n", thread); while (GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); rc = msg.wParam > 32 ? 33 : msg.wParam; @@ -2439,10 +2451,14 @@ static void test_dde_default_app(void) test++; } - assert(DdeNameService(ddeInst, hszApplication, 0L, DNS_UNREGISTER)); - assert(DdeFreeStringHandle(ddeInst, hszTopic)); - assert(DdeFreeStringHandle(ddeInst, hszApplication)); - assert(DdeUninitialize(ddeInst)); + ret = DdeNameService(ddeInst, hszApplication, 0, DNS_UNREGISTER); + ok(ret != 0, "got %p\n", ret); + b = DdeFreeStringHandle(ddeInst, hszTopic); + ok(b, "got %d\n", b); + b = DdeFreeStringHandle(ddeInst, hszApplication); + ok(b, "got %d\n", b); + b = DdeUninitialize(ddeInst); + ok(b, "got %d\n", b); } static void init_test(void) @@ -2478,7 +2494,7 @@ static void init_test(void) exit(1); rc=GetModuleFileNameA(NULL, argv0, sizeof(argv0)); - assert(rc!=0 && rc<sizeof(argv0)); + ok(rc != 0 && rc < sizeof(argv0), "got %d\n", rc); if (GetFileAttributesA(argv0)==INVALID_FILE_ATTRIBUTES) { strcat(argv0, ".so"); @@ -2495,7 +2511,7 @@ static void init_test(void) SetEnvironmentVariableA("TMPDIR", tmpdir); rc = GetTempFileNameA(tmpdir, "wt", 0, child_file); - assert(rc != 0); + ok(rc != 0, "got %d\n", rc); init_event(child_file); /* Set up the test files */

1 0

Nikolay Sivov : msxml3/tests: Fix a couple of test failure when msxml4 is actually present.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: fa21e6dd7c5d7b8fc3c445b3c56d9459316d4f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa21e6dd7c5d7b8fc3c445b3c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 12:43:20 2014 +0400 msxml3/tests: Fix a couple of test failure when msxml4 is actually present. --- dlls/msxml3/tests/domdoc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e33db88..6af47e7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9807,6 +9807,8 @@ static void test_mxnamespacemanager(void) EXPECT_REF(mgr2, 2); prefixes = NULL; hr = IVBMXNamespaceManager_getDeclaredPrefixes(mgr2, &prefixes); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { IDispatchEx *dispex; @@ -9841,8 +9843,9 @@ static void test_mxnamespacemanager(void) V_DISPATCH(&ret) = (void*)0x1; hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); - ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + ok(V_VT(&ret) == VT_BSTR, "got %d\n", V_VT(&ret)); + ok(V_BSTR(&ret) != NULL, "got %p\n", V_BSTR(&ret)); + VariantClear(&ret); IDispatchEx_Release(dispex); IMXNamespacePrefixes_Release(prefixes);

1 0

Dmitry Timoshkov : server: Fix generic access mapping for a thread.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 6e2de14df11d017da070a30f7a1e9437d8c5ee80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e2de14df11d017da070a30f7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 5 16:46:55 2014 +0900 server: Fix generic access mapping for a thread. --- dlls/advapi32/tests/security.c | 7 +------ server/thread.c | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8f70faf..87f3ea93 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4985,7 +4985,7 @@ static void test_thread_security(void) switch (map[i].generic) { case GENERIC_READ: -todo_wine + case GENERIC_EXECUTE: ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; @@ -4994,11 +4994,6 @@ todo_wine ok(access == map[i].mapped || access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; - case GENERIC_EXECUTE: -todo_wine - ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, - "%d: expected %#x, got %#x\n", i, map[i].mapped, access); - break; case GENERIC_ALL: ok(access == map[i].mapped || access == THREAD_ALL_ACCESS_VISTA, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); diff --git a/server/thread.c b/server/thread.c index 623a3b3..dd0b6b0 100644 --- a/server/thread.c +++ b/server/thread.c @@ -331,9 +331,9 @@ static int thread_signaled( struct object *obj, struct wait_queue_entry *entry ) static unsigned int thread_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; - if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | SYNCHRONIZE; - if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | THREAD_QUERY_INFORMATION | THREAD_GET_CONTEXT; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | THREAD_SET_INFORMATION | THREAD_SET_CONTEXT | THREAD_TERMINATE | THREAD_SUSPEND_RESUME; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE; if (access & GENERIC_ALL) access |= THREAD_ALL_ACCESS; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

Nikolay Sivov : wshom: Implement get_WorkingDirectory(), handle allocation failures.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 2b1f2001b153190bbd3bb138684149f672a0bf12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1f2001b153190bbd3bb1386… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 09:29:19 2014 +0400 wshom: Implement get_WorkingDirectory(), handle allocation failures. --- dlls/wshom.ocx/shell.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 2dc2bbe..ea9caba 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -409,7 +409,7 @@ static HRESULT WINAPI WshShortcut_get_Arguments(IWshShortcut *iface, BSTR *Argum return hr; *Arguments = SysAllocString(buffW); - return S_OK; + return *Arguments ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI WshShortcut_put_Arguments(IWshShortcut *iface, BSTR Arguments) @@ -501,14 +501,26 @@ static HRESULT WINAPI WshShortcut_put_WindowStyle(IWshShortcut *iface, int ShowC static HRESULT WINAPI WshShortcut_get_WorkingDirectory(IWshShortcut *iface, BSTR *WorkingDirectory) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%p): stub\n", This, WorkingDirectory); - return E_NOTIMPL; + WCHAR buffW[MAX_PATH]; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, WorkingDirectory); + + if (!WorkingDirectory) + return E_POINTER; + + *WorkingDirectory = NULL; + hr = IShellLinkW_GetWorkingDirectory(This->link, buffW, sizeof(buffW)/sizeof(WCHAR)); + if (FAILED(hr)) return hr; + + *WorkingDirectory = SysAllocString(buffW); + return *WorkingDirectory ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI WshShortcut_put_WorkingDirectory(IWshShortcut *iface, BSTR WorkingDirectory) { WshShortcut *This = impl_from_IWshShortcut(iface); - TRACE("(%p)->(%s): stub\n", This, debugstr_w(WorkingDirectory)); + TRACE("(%p)->(%s)\n", This, debugstr_w(WorkingDirectory)); return IShellLinkW_SetWorkingDirectory(This->link, WorkingDirectory); } @@ -584,6 +596,13 @@ static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) } This->path_link = SysAllocString(path); + if (!This->path_link) + { + IShellLinkW_Release(This->link); + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + *shortcut = (IDispatch*)&This->IWshShortcut_iface; return S_OK;

1 0

Nikolay Sivov : vbscript: Support VT_BYREF|VT_DISPATCH as a DISPID_NEWENUM source.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 9b037d559ec0639da9e0f71c0e825a282bb5135d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b037d559ec0639da9e0f71c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 09:05:17 2014 +0400 vbscript: Support VT_BYREF|VT_DISPATCH as a DISPID_NEWENUM source. --- dlls/vbscript/interp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 6365461..75e17af 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1074,12 +1074,13 @@ static HRESULT interp_newenum(exec_ctx_t *ctx) v = stack_pop(ctx); switch(V_VT(v)) { + case VT_DISPATCH|VT_BYREF: case VT_DISPATCH: { IEnumVARIANT *iter; DISPPARAMS dp = {0}; VARIANT iterv; - hres = disp_call(ctx->script, V_DISPATCH(v), DISPID_NEWENUM, &dp, &iterv); + hres = disp_call(ctx->script, V_ISBYREF(v) ? *V_DISPATCHREF(v) : V_DISPATCH(v), DISPID_NEWENUM, &dp, &iterv); VariantClear(v); if(FAILED(hres)) return hres;

1 0

Bruno Jesus : ws2_32/tests: Fix AcceptEx tests related to address length.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 7a8d43043a86248af45d9456855e4564b81734db URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8d43043a86248af45d94568… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Feb 5 00:47:55 2014 -0200 ws2_32/tests: Fix AcceptEx tests related to address length. --- dlls/ws2_32/tests/sock.c | 56 +++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8cee632..1c22503 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5919,10 +5919,24 @@ static void test_AcceptEx(void) ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "AcceptEx on invalid listening socket " "returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); +todo_wine + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on a non-listening socket " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + iret = listen(listener, 5); + if (iret != 0) { + skip("listening failed, errno = %d\n", WSAGetLastError()); + goto end; + } + bret = pAcceptEx(listener, INVALID_SOCKET, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on invalid accepting socket " +todo_wine + ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "AcceptEx on invalid listening socket " "returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, NULL, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), @@ -5935,23 +5949,35 @@ static void test_AcceptEx(void) bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " - "returned %d + errno %d\n", bret, WSAGetLastError()); +todo_wine + ok(bret == FALSE && (WSAGetLastError() == ERROR_IO_PENDING || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, + "AcceptEx on too small local address size returned %d + errno %d\n", + bret, WSAGetLastError()); + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel pending accept socket\n"); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 15, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " - "returned %d + errno %d\n", bret, WSAGetLastError()); +todo_wine + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx on too small local address " + "size returned %d + errno %d\n", + bret, WSAGetLastError()); + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel pending accept socket\n"); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, 0, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " - "returned %d + errno %d\n", bret, WSAGetLastError()); +todo_wine + ok(bret == FALSE && (WSAGetLastError() == WSAEFAULT || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, + "AcceptEx on too small remote address size returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 15, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " - "returned %d + errno %d\n", bret, WSAGetLastError()); +todo_wine + ok(bret == FALSE && (WSAGetLastError() == ERROR_IO_PENDING || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, + "AcceptEx on too small remote address size returned %d + errno %d\n", bret, WSAGetLastError()); + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel pending accept socket\n"); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, @@ -5963,18 +5989,6 @@ static void test_AcceptEx(void) ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped " "returned %d + errno %d\n", bret, WSAGetLastError()); - bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), - sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, - &bytesReturned, &overlapped); - todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on a non-listening socket " - "returned %d + errno %d\n", bret, WSAGetLastError()); - - iret = listen(listener, 5); - if (iret != 0) { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } - overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); if (overlapped.hEvent == NULL) { skip("could not create event object, errno = %d\n", GetLastError());

1 0

← Newer
1
...
43
44
45
46
47
48
49
50
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2014