February 2014 - Wine-commits

Martin Storsjo : ext-ms-win-gdi-devcaps-l1-1-0: Add stub dll.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 6bb42462bb716c1c079d9a30aedfd3651adf1853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb42462bb716c1c079d9a30a… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:23 2014 +0200 ext-ms-win-gdi-devcaps-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-devcaps-l1-1-0/Makefile.in | 1 + .../ext-ms-win-gdi-devcaps-l1-1-0.spec | 1 + tools/make_specfiles | 4 ++++ 5 files changed, 9 insertions(+) diff --git a/configure b/configure index caccedc..cd3d707 100755 --- a/configure +++ b/configure @@ -996,6 +996,7 @@ enable_dwrite enable_dxdiagn enable_dxgi enable_explorerframe +enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_faultrep enable_fltlib enable_fusion @@ -16780,6 +16781,7 @@ wine_fn_config_test dlls/dxgi/tests dxgi_test wine_fn_config_lib dxguid wine_fn_config_dll explorerframe enable_explorerframe clean wine_fn_config_test dlls/explorerframe/tests explorerframe_test +wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib diff --git a/configure.ac b/configure.ac index 43b9052..e8121b9 100644 --- a/configure.ac +++ b/configure.ac @@ -2822,6 +2822,7 @@ WINE_CONFIG_TEST(dlls/dxgi/tests) WINE_CONFIG_LIB(dxguid) WINE_CONFIG_DLL(explorerframe,,[clean]) WINE_CONFIG_TEST(dlls/explorerframe/tests) +WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) diff --git a/dlls/ext-ms-win-gdi-devcaps-l1-1-0/Makefile.in b/dlls/ext-ms-win-gdi-devcaps-l1-1-0/Makefile.in new file mode 100644 index 0000000..2a328b7 --- /dev/null +++ b/dlls/ext-ms-win-gdi-devcaps-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-devcaps-l1-1-0.dll diff --git a/dlls/ext-ms-win-gdi-devcaps-l1-1-0/ext-ms-win-gdi-devcaps-l1-1-0.spec b/dlls/ext-ms-win-gdi-devcaps-l1-1-0/ext-ms-win-gdi-devcaps-l1-1-0.spec new file mode 100644 index 0000000..25416ef --- /dev/null +++ b/dlls/ext-ms-win-gdi-devcaps-l1-1-0/ext-ms-win-gdi-devcaps-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall GetDeviceCaps(long long) gdi32.GetDeviceCaps diff --git a/tools/make_specfiles b/tools/make_specfiles index f6c10e5..6237d58 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -172,6 +172,10 @@ my @dll_groups = "ntdll", "ntoskrnl.exe" ], + [ + "gdi32", + "ext-ms-win-gdi-devcaps-l1-1-0", + ], ); my $update_flags = 0;

1 0

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

04 Feb '14

Module: wine Branch: master Commit: 8c9e0b868b7b53f70fb6299242be4446de65c119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9e0b868b7b53f70fb629924… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:24 2014 +0200 api-ms-win-core-com-l1-1-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-core-com-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-com-l1-1-0.spec | 80 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 85 insertions(+) diff --git a/configure b/configure index cd3d707..34eb49f 100755 --- a/configure +++ b/configure @@ -851,6 +851,7 @@ enable_actxprxy enable_advapi32 enable_advpack enable_amstream +enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_interlocked_l1_2_0 @@ -16579,6 +16580,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 diff --git a/configure.ac b/configure.ac index e8121b9..335280e 100644 --- a/configure.ac +++ b/configure.ac @@ -2620,6 +2620,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) diff --git a/dlls/api-ms-win-core-com-l1-1-0/Makefile.in b/dlls/api-ms-win-core-com-l1-1-0/Makefile.in new file mode 100644 index 0000000..72c398a --- /dev/null +++ b/dlls/api-ms-win-core-com-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-com-l1-1-0.dll diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec new file mode 100644 index 0000000..f8026db --- /dev/null +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -0,0 +1,80 @@ +@ stdcall CLSIDFromProgID(wstr ptr) ole32.CLSIDFromProgID +@ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString +@ stdcall CoAddRefServerProcess() ole32.CoAddRefServerProcess +@ stub CoAllowUnmarshalerCLSID +@ stub CoCancelCall +@ stdcall CoCopyProxy(ptr ptr) ole32.CoCopyProxy +@ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler +@ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid +@ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance +@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx +@ stub CoCreateInstanceFromApp +@ stub CoDecodeProxy +@ stub CoDecrementMTAUsage +@ stub CoDisableCallCancellation +@ stub CoDisconnectContext +@ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject +@ stub CoEnableCallCancellation +@ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries +@ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx +@ stub CoGetApartmentType +@ stdcall CoGetCallContext(ptr ptr) ole32.CoGetCallContext +@ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID +@ stub CoGetCancelObject +@ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject +@ stdcall CoGetContextToken(ptr) ole32.CoGetContextToken +@ stdcall CoGetCurrentLogicalThreadId(ptr) ole32.CoGetCurrentLogicalThreadId +@ stdcall CoGetCurrentProcess() ole32.CoGetCurrentProcess +@ stdcall CoGetDefaultContext(long ptr ptr) ole32.CoGetDefaultContext +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream +@ stdcall CoGetMalloc(long ptr) ole32.CoGetMalloc +@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax +@ stdcall CoGetObjectContext(ptr ptr) ole32.CoGetObjectContext +@ stdcall CoGetPSClsid(ptr ptr) ole32.CoGetPSClsid +@ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) ole32.CoGetStandardMarshal +@ stub CoGetStdMarshalEx +@ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass +@ stdcall CoImpersonateClient() ole32.CoImpersonateClient +@ stub CoIncrementMTAUsage +@ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx +@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity +@ stub CoInvalidateRemoteMachineBindings +@ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected +@ stdcall CoLockObjectExternal(ptr long long) ole32.CoLockObjectExternal +@ stdcall CoMarshalHresult(ptr long) ole32.CoMarshalHresult +@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) ole32.CoMarshalInterThreadInterfaceInStream +@ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) ole32.CoMarshalInterface +@ stub CoQueryAuthenticationServices +@ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) ole32.CoQueryClientBlanket +@ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) ole32.CoQueryProxyBlanket +@ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject +@ stdcall CoRegisterPSClsid(ptr ptr) ole32.CoRegisterPSClsid +@ stub CoRegisterSurrogate +@ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData +@ stdcall CoReleaseServerProcess() ole32.CoReleaseServerProcess +@ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects +@ stdcall CoRevertToSelf() ole32.CoRevertToSelf +@ stdcall CoRevokeClassObject(long) ole32.CoRevokeClassObject +@ stub CoSetCancelObject +@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) ole32.CoSetProxyBlanket +@ stdcall CoSuspendClassObjects() ole32.CoSuspendClassObjects +@ stdcall CoSwitchCallContext(ptr ptr) ole32.CoSwitchCallContext +@ stdcall CoTaskMemAlloc(long) ole32.CoTaskMemAlloc +@ stdcall CoTaskMemFree(ptr) ole32.CoTaskMemFree +@ stdcall CoTaskMemRealloc(ptr long) ole32.CoTaskMemRealloc +@ stub CoTestCancel +@ stdcall CoUninitialize() ole32.CoUninitialize +@ stdcall CoUnmarshalHresult(ptr ptr) ole32.CoUnmarshalHresult +@ stdcall CoUnmarshalInterface(ptr ptr ptr) ole32.CoUnmarshalInterface +@ stdcall CoWaitForMultipleHandles(long long long ptr ptr) ole32.CoWaitForMultipleHandles +@ stub CoWaitForMultipleObjects +@ stdcall CreateStreamOnHGlobal(ptr long ptr) ole32.CreateStreamOnHGlobal +@ stdcall FreePropVariantArray(long ptr) ole32.FreePropVariantArray +@ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream +@ stdcall IIDFromString(wstr ptr) ole32.IIDFromString +@ stdcall ProgIDFromCLSID(ptr ptr) ole32.ProgIDFromCLSID +@ stdcall PropVariantClear(ptr) ole32.PropVariantClear +@ stdcall PropVariantCopy(ptr ptr) ole32.PropVariantCopy +@ stdcall StringFromCLSID(ptr ptr) ole32.StringFromCLSID +@ stdcall StringFromGUID2(ptr ptr long) ole32.StringFromGUID2 +@ stdcall StringFromIID(ptr ptr) ole32.StringFromIID diff --git a/tools/make_specfiles b/tools/make_specfiles index 6237d58..e7208d7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -148,6 +148,7 @@ my @dll_groups = [ "ole32", "api-ms-win-downlevel-ole32-l1-1-0", + "api-ms-win-core-com-l1-1-0", ], [ "shell32",

1 0

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

04 Feb '14

Module: wine Branch: master Commit: a777a22376766303ee03c6f0d618b60d603102ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a777a22376766303ee03c6f0d… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:25 2014 +0200 api-ms-win-core-console-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-console-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-console-l1-1-0.spec | 14 ++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 19 insertions(+) diff --git a/configure b/configure index 34eb49f..e65a022 100755 --- a/configure +++ b/configure @@ -852,6 +852,7 @@ enable_advapi32 enable_advpack enable_amstream enable_api_ms_win_core_com_l1_1_0 +enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_interlocked_l1_2_0 @@ -16581,6 +16582,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 +wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 diff --git a/configure.ac b/configure.ac index 335280e..2ae2336 100644 --- a/configure.ac +++ b/configure.ac @@ -2621,6 +2621,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) diff --git a/dlls/api-ms-win-core-console-l1-1-0/Makefile.in b/dlls/api-ms-win-core-console-l1-1-0/Makefile.in new file mode 100644 index 0000000..f22ece8 --- /dev/null +++ b/dlls/api-ms-win-core-console-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-console-l1-1-0.dll diff --git a/dlls/api-ms-win-core-console-l1-1-0/api-ms-win-core-console-l1-1-0.spec b/dlls/api-ms-win-core-console-l1-1-0/api-ms-win-core-console-l1-1-0.spec new file mode 100644 index 0000000..6a78397 --- /dev/null +++ b/dlls/api-ms-win-core-console-l1-1-0/api-ms-win-core-console-l1-1-0.spec @@ -0,0 +1,14 @@ +@ stdcall AllocConsole() kernel32.AllocConsole +@ stdcall GetConsoleCP() kernel32.GetConsoleCP +@ stdcall GetConsoleMode(long ptr) kernel32.GetConsoleMode +@ stdcall GetConsoleOutputCP() kernel32.GetConsoleOutputCP +@ stdcall GetNumberOfConsoleInputEvents(long ptr) kernel32.GetNumberOfConsoleInputEvents +@ stdcall PeekConsoleInputA(ptr ptr long ptr) kernel32.PeekConsoleInputA +@ stdcall ReadConsoleA(long ptr long ptr ptr) kernel32.ReadConsoleA +@ stdcall ReadConsoleInputA(long ptr long ptr) kernel32.ReadConsoleInputA +@ stdcall ReadConsoleInputW(long ptr long ptr) kernel32.ReadConsoleInputW +@ stdcall ReadConsoleW(long ptr long ptr ptr) kernel32.ReadConsoleW +@ stdcall SetConsoleCtrlHandler(ptr long) kernel32.SetConsoleCtrlHandler +@ stdcall SetConsoleMode(long long) kernel32.SetConsoleMode +@ stdcall WriteConsoleA(long ptr long ptr ptr) kernel32.WriteConsoleA +@ stdcall WriteConsoleW(long ptr long ptr ptr) kernel32.WriteConsoleW diff --git a/tools/make_specfiles b/tools/make_specfiles index e7208d7..294562a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -144,6 +144,7 @@ my @dll_groups = "api-ms-win-core-sysinfo-l1-2-0", "api-ms-win-core-util-l1-1-0", "api-ms-win-core-synch-l1-2-0", + "api-ms-win-core-console-l1-1-0", ], [ "ole32",

1 0

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

04 Feb '14

Module: wine Branch: master Commit: bc132f341970ea760d9758dde15a515d344b6c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc132f341970ea760d9758dde… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:26 2014 +0200 api-ms-win-core-file-l1-2-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-core-file-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-file-l1-2-0.spec | 79 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 84 insertions(+) diff --git a/configure b/configure index e65a022..b17d434 100755 --- a/configure +++ b/configure @@ -855,6 +855,7 @@ enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 +enable_api_ms_win_core_file_l1_2_0 enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 @@ -16585,6 +16586,7 @@ wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 +wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_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-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 diff --git a/configure.ac b/configure.ac index 2ae2336..c354aa2 100644 --- a/configure.ac +++ b/configure.ac @@ -2624,6 +2624,7 @@ WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-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) diff --git a/dlls/api-ms-win-core-file-l1-2-0/Makefile.in b/dlls/api-ms-win-core-file-l1-2-0/Makefile.in new file mode 100644 index 0000000..5edc946 --- /dev/null +++ b/dlls/api-ms-win-core-file-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-l1-2-0.dll diff --git a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec new file mode 100644 index 0000000..ebfd52e --- /dev/null +++ b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec @@ -0,0 +1,79 @@ +@ stdcall CompareFileTime(ptr ptr) kernel32.CompareFileTime +@ stdcall CreateDirectoryA(str ptr) kernel32.CreateDirectoryA +@ stdcall CreateDirectoryW(wstr ptr) kernel32.CreateDirectoryW +@ stdcall CreateFile2(wstr long long long ptr) kernel32.CreateFile2 +@ stdcall CreateFileA(str long long ptr long long long) kernel32.CreateFileA +@ stdcall CreateFileW(wstr long long ptr long long long) kernel32.CreateFileW +@ stdcall DefineDosDeviceW(long wstr wstr) kernel32.DefineDosDeviceW +@ stdcall DeleteFileA(str) kernel32.DeleteFileA +@ stdcall DeleteFileW(wstr) kernel32.DeleteFileW +@ stdcall DeleteVolumeMountPointW(wstr) kernel32.DeleteVolumeMountPointW +@ stdcall FileTimeToLocalFileTime(ptr ptr) kernel32.FileTimeToLocalFileTime +@ stdcall FindClose(long) kernel32.FindClose +@ stdcall FindCloseChangeNotification(long) kernel32.FindCloseChangeNotification +@ stdcall FindFirstChangeNotificationA(str long long) kernel32.FindFirstChangeNotificationA +@ stdcall FindFirstChangeNotificationW(wstr long long) kernel32.FindFirstChangeNotificationW +@ stdcall FindFirstFileA(str ptr) kernel32.FindFirstFileA +@ stdcall FindFirstFileExA(str long ptr long ptr long) kernel32.FindFirstFileExA +@ stdcall FindFirstFileExW(wstr long ptr long ptr long) kernel32.FindFirstFileExW +@ stdcall FindFirstFileW(wstr ptr) kernel32.FindFirstFileW +@ stdcall FindFirstVolumeW(ptr long) kernel32.FindFirstVolumeW +@ stdcall FindNextChangeNotification(long) kernel32.FindNextChangeNotification +@ stdcall FindNextFileA(long ptr) kernel32.FindNextFileA +@ stdcall FindNextFileW(long ptr) kernel32.FindNextFileW +@ stdcall FindNextVolumeW(long ptr long) kernel32.FindNextVolumeW +@ stdcall FindVolumeClose(ptr) kernel32.FindVolumeClose +@ stdcall FlushFileBuffers(long) kernel32.FlushFileBuffers +@ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr) kernel32.GetDiskFreeSpaceA +@ stdcall GetDiskFreeSpaceExA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA +@ stdcall GetDiskFreeSpaceExW(wstr ptr ptr ptr) kernel32.GetDiskFreeSpaceExW +@ stdcall GetDiskFreeSpaceW(wstr ptr ptr ptr ptr) kernel32.GetDiskFreeSpaceW +@ stdcall GetDriveTypeA(str) kernel32.GetDriveTypeA +@ stdcall GetDriveTypeW(wstr) kernel32.GetDriveTypeW +@ stdcall GetFileAttributesA(str) kernel32.GetFileAttributesA +@ stdcall GetFileAttributesExA(str long ptr) kernel32.GetFileAttributesExA +@ stdcall GetFileAttributesExW(wstr long ptr) kernel32.GetFileAttributesExW +@ stdcall GetFileAttributesW(wstr) kernel32.GetFileAttributesW +@ stdcall GetFileInformationByHandle(long ptr) kernel32.GetFileInformationByHandle +@ stdcall GetFileSize(long ptr) kernel32.GetFileSize +@ stdcall GetFileSizeEx(long ptr) kernel32.GetFileSizeEx +@ stdcall GetFileTime(long ptr ptr ptr) kernel32.GetFileTime +@ stdcall GetFileType(long) kernel32.GetFileType +@ stub GetFinalPathNameByHandleA +@ stub GetFinalPathNameByHandleW +@ stdcall GetFullPathNameA(str long ptr ptr) kernel32.GetFullPathNameA +@ stdcall GetFullPathNameW(wstr long ptr ptr) kernel32.GetFullPathNameW +@ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW +@ stdcall GetLogicalDrives() kernel32.GetLogicalDrives +@ stdcall GetLongPathNameA(str long long) kernel32.GetLongPathNameA +@ stdcall GetLongPathNameW(wstr long long) kernel32.GetLongPathNameW +@ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW +@ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW +@ stdcall GetTempPathW(long ptr) kernel32.GetTempPathW +@ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW +@ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) kernel32.GetVolumeNameForVolumeMountPointW +@ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW +@ stdcall GetVolumePathNamesForVolumeNameW(wstr ptr long ptr) kernel32.GetVolumePathNamesForVolumeNameW +@ stdcall LocalFileTimeToFileTime(ptr ptr) kernel32.LocalFileTimeToFileTime +@ stdcall LockFile(long long long long long) kernel32.LockFile +@ stdcall LockFileEx(long long long long long ptr) kernel32.LockFileEx +@ stdcall QueryDosDeviceW(wstr ptr long) kernel32.QueryDosDeviceW +@ stdcall ReadFile(long ptr long ptr ptr) kernel32.ReadFile +@ stdcall ReadFileEx(long ptr long ptr ptr) kernel32.ReadFileEx +@ stdcall ReadFileScatter(long ptr long ptr ptr) kernel32.ReadFileScatter +@ stdcall RemoveDirectoryA(str) kernel32.RemoveDirectoryA +@ stdcall RemoveDirectoryW(wstr) kernel32.RemoveDirectoryW +@ stdcall SetEndOfFile(long) kernel32.SetEndOfFile +@ stdcall SetFileAttributesA(str long) kernel32.SetFileAttributesA +@ stdcall SetFileAttributesW(wstr long) kernel32.SetFileAttributesW +@ stdcall SetFileInformationByHandle(long long ptr long) kernel32.SetFileInformationByHandle +@ stdcall SetFilePointer(long long ptr long) kernel32.SetFilePointer +@ stdcall SetFilePointerEx(long int64 ptr long) kernel32.SetFilePointerEx +@ stdcall SetFileTime(long ptr ptr ptr) kernel32.SetFileTime +@ stdcall SetFileValidData(ptr int64) kernel32.SetFileValidData +@ stdcall UnlockFile(long long long long long) kernel32.UnlockFile +@ stdcall UnlockFileEx(long long long long ptr) kernel32.UnlockFileEx +@ stdcall WriteFile(long ptr long ptr ptr) kernel32.WriteFile +@ stdcall WriteFileEx(long ptr long ptr ptr) kernel32.WriteFileEx +@ stdcall WriteFileGather(long ptr long ptr ptr) kernel32.WriteFileGather diff --git a/tools/make_specfiles b/tools/make_specfiles index 294562a..0942ab2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -145,6 +145,7 @@ my @dll_groups = "api-ms-win-core-util-l1-1-0", "api-ms-win-core-synch-l1-2-0", "api-ms-win-core-console-l1-1-0", + "api-ms-win-core-file-l1-2-0", ], [ "ole32",

1 0

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

04 Feb '14

Module: wine Branch: master Commit: 0f0e2bf433de7cf8963665623eeb11ac840ae1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0e2bf433de7cf8963665623… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:27 2014 +0200 api-ms-win-core-handle-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-handle-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-handle-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index b17d434..301ca2f 100755 --- a/configure +++ b/configure @@ -856,6 +856,7 @@ enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_file_l1_2_0 +enable_api_ms_win_core_handle_l1_1_0 enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 @@ -16587,6 +16588,7 @@ wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 +wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_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-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 diff --git a/configure.ac b/configure.ac index c354aa2..411303f 100644 --- a/configure.ac +++ b/configure.ac @@ -2625,6 +2625,7 @@ WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-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) diff --git a/dlls/api-ms-win-core-handle-l1-1-0/Makefile.in b/dlls/api-ms-win-core-handle-l1-1-0/Makefile.in new file mode 100644 index 0000000..0f143c1 --- /dev/null +++ b/dlls/api-ms-win-core-handle-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-handle-l1-1-0.dll diff --git a/dlls/api-ms-win-core-handle-l1-1-0/api-ms-win-core-handle-l1-1-0.spec b/dlls/api-ms-win-core-handle-l1-1-0/api-ms-win-core-handle-l1-1-0.spec new file mode 100644 index 0000000..579d363 --- /dev/null +++ b/dlls/api-ms-win-core-handle-l1-1-0/api-ms-win-core-handle-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall CloseHandle(long) kernel32.CloseHandle +@ stdcall DuplicateHandle(long long long ptr long long long) kernel32.DuplicateHandle +@ stdcall GetHandleInformation(long ptr) kernel32.GetHandleInformation +@ stdcall SetHandleInformation(long long long) kernel32.SetHandleInformation diff --git a/tools/make_specfiles b/tools/make_specfiles index 0942ab2..98c0a73 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -146,6 +146,7 @@ my @dll_groups = "api-ms-win-core-synch-l1-2-0", "api-ms-win-core-console-l1-1-0", "api-ms-win-core-file-l1-2-0", + "api-ms-win-core-handle-l1-1-0", ], [ "ole32",

1 0

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

04 Feb '14

Module: wine Branch: master Commit: 29573f99daed9767771bd6a833c8509d75b4257a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29573f99daed9767771bd6a83… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:28 2014 +0200 api-ms-win-core-heap-l1-2-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-heap-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-heap-l1-2-0.spec | 15 +++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 20 insertions(+) diff --git a/configure b/configure index 301ca2f..063a663 100755 --- a/configure +++ b/configure @@ -857,6 +857,7 @@ enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_file_l1_2_0 enable_api_ms_win_core_handle_l1_1_0 +enable_api_ms_win_core_heap_l1_2_0 enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 @@ -16589,6 +16590,7 @@ wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_ wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_l1_1_0 +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-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_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 diff --git a/configure.ac b/configure.ac index 411303f..2e0e6eb 100644 --- a/configure.ac +++ b/configure.ac @@ -2626,6 +2626,7 @@ WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) 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-interlocked-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) diff --git a/dlls/api-ms-win-core-heap-l1-2-0/Makefile.in b/dlls/api-ms-win-core-heap-l1-2-0/Makefile.in new file mode 100644 index 0000000..de68ff0 --- /dev/null +++ b/dlls/api-ms-win-core-heap-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-heap-l1-2-0.dll diff --git a/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec b/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec new file mode 100644 index 0000000..fc4d357 --- /dev/null +++ b/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec @@ -0,0 +1,15 @@ +@ stdcall -norelay GetProcessHeap() kernel32.GetProcessHeap +@ stdcall GetProcessHeaps(long ptr) kernel32.GetProcessHeaps +@ stdcall HeapAlloc(long long long) kernel32.HeapAlloc +@ stdcall HeapCompact(long long) kernel32.HeapCompact +@ stdcall HeapCreate(long long long) kernel32.HeapCreate +@ stdcall HeapDestroy(long) kernel32.HeapDestroy +@ stdcall HeapFree(long long ptr) kernel32.HeapFree +@ stdcall HeapLock(long) kernel32.HeapLock +@ stdcall HeapQueryInformation(long long ptr long ptr) kernel32.HeapQueryInformation +@ stdcall HeapReAlloc(long long ptr long) kernel32.HeapReAlloc +@ stdcall HeapSetInformation(ptr long ptr long) kernel32.HeapSetInformation +@ stdcall HeapSize(long long ptr) kernel32.HeapSize +@ stdcall HeapUnlock(long) kernel32.HeapUnlock +@ stdcall HeapValidate(long long ptr) kernel32.HeapValidate +@ stdcall HeapWalk(long ptr) kernel32.HeapWalk diff --git a/tools/make_specfiles b/tools/make_specfiles index 98c0a73..2203988 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -147,6 +147,7 @@ my @dll_groups = "api-ms-win-core-console-l1-1-0", "api-ms-win-core-file-l1-2-0", "api-ms-win-core-handle-l1-1-0", + "api-ms-win-core-heap-l1-2-0", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-heap-obsolete-l1-1-0: Add stub dll.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 1ffeb42284050adc189d494a37eec4fbdda1d2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ffeb42284050adc189d494a3… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:29 2014 +0200 api-ms-win-core-heap-obsolete-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-heap-obsolete-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-heap-obsolete-l1-1-0.spec | 15 +++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 20 insertions(+) diff --git a/configure b/configure index 063a663..eb4e4d4 100755 --- a/configure +++ b/configure @@ -858,6 +858,7 @@ enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_file_l1_2_0 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_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 @@ -16591,6 +16592,7 @@ wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_e wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_l1_1_0 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-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 diff --git a/configure.ac b/configure.ac index 2e0e6eb..327959b 100644 --- a/configure.ac +++ b/configure.ac @@ -2627,6 +2627,7 @@ WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) 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-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) diff --git a/dlls/api-ms-win-core-heap-obsolete-l1-1-0/Makefile.in b/dlls/api-ms-win-core-heap-obsolete-l1-1-0/Makefile.in new file mode 100644 index 0000000..da7d820 --- /dev/null +++ b/dlls/api-ms-win-core-heap-obsolete-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-heap-obsolete-l1-1-0.dll diff --git a/dlls/api-ms-win-core-heap-obsolete-l1-1-0/api-ms-win-core-heap-obsolete-l1-1-0.spec b/dlls/api-ms-win-core-heap-obsolete-l1-1-0/api-ms-win-core-heap-obsolete-l1-1-0.spec new file mode 100644 index 0000000..d9bc1b9 --- /dev/null +++ b/dlls/api-ms-win-core-heap-obsolete-l1-1-0/api-ms-win-core-heap-obsolete-l1-1-0.spec @@ -0,0 +1,15 @@ +@ stdcall GlobalAlloc(long long) kernel32.GlobalAlloc +@ stdcall GlobalFlags(long) kernel32.GlobalFlags +@ stdcall GlobalFree(long) kernel32.GlobalFree +@ stdcall GlobalHandle(ptr) kernel32.GlobalHandle +@ stdcall GlobalLock(long) kernel32.GlobalLock +@ stdcall GlobalReAlloc(long long long) kernel32.GlobalReAlloc +@ stdcall GlobalSize(long) kernel32.GlobalSize +@ stdcall GlobalUnlock(long) kernel32.GlobalUnlock +@ stdcall LocalAlloc(long long) kernel32.LocalAlloc +@ stdcall LocalFlags(long) kernel32.LocalFlags +@ stdcall LocalFree(long) kernel32.LocalFree +@ stdcall LocalLock(long) kernel32.LocalLock +@ stdcall LocalReAlloc(long long long) kernel32.LocalReAlloc +@ stdcall LocalSize(long) kernel32.LocalSize +@ stdcall LocalUnlock(long) kernel32.LocalUnlock diff --git a/tools/make_specfiles b/tools/make_specfiles index 2203988..d282c85 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -148,6 +148,7 @@ my @dll_groups = "api-ms-win-core-file-l1-2-0", "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", ], [ "ole32",

1 0

Erich E. Hoover : oleaut32: Handle OLEFontImpl_SetRatio case where cyLogical and cyHimetric are both 1.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: ba2ce9db498a40806d7bca5631ec8c50dd3b8dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba2ce9db498a40806d7bca563… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Jan 17 13:11:58 2014 -0700 oleaut32: Handle OLEFontImpl_SetRatio case where cyLogical and cyHimetric are both 1. --- dlls/oleaut32/olefont.c | 5 +++++ dlls/oleaut32/tests/olefont.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index ba873ec..3155fc3 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1085,6 +1085,11 @@ static HRESULT WINAPI OLEFontImpl_SetRatio( if(cyLogical == 0 || cyHimetric == 0) return E_INVALIDARG; + /* cyLogical and cyHimetric both set to 1 is a special case that + does not change the scaling but also does not fail */ + if(cyLogical == 1 && cyHimetric == 1) + return S_OK; + this->cyLogical = cyLogical; this->cyHimetric = cyHimetric; this->dirty = TRUE; diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 1af1b6d..5249b54 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -151,6 +151,41 @@ static void test_ifont_sizes(void) test_ifont_size(180000, 0, 144, 2540, -36, "ratio2"); /* another ratio */ test_ifont_size(180000, 0, 72, 1270, -36, "ratio3"); /* yet another ratio */ test_ifont_size(186000, 0, 72, 2540, -19, "rounding+ratio"); /* test rounding with ratio */ + + /* test various combinations of logical == himetric */ + test_ifont_size(180000, 0, 10, 10, -635, "identical ratio 1"); + test_ifont_size(240000, 0, 10, 10, -848, "identical ratio 2"); + test_ifont_size(300000, 0, 10, 10, -1058, "identical ratio 3"); + + /* test various combinations of logical and himetric both set to 1 */ + test_ifont_size(180000, 0, 1, 1, -24, "1:1 ratio 1"); + test_ifont_size(240000, 0, 1, 1, -32, "1:1 ratio 2"); + test_ifont_size(300000, 0, 1, 1, -40, "1:1 ratio 3"); + + /* test various combinations of logical set to 1 */ + test_ifont_size(180000, 0, 1, 0, -24, "1:0 ratio 1"); + test_ifont_size(240000, 0, 1, 0, -32, "1:0 ratio 2"); + test_ifont_size(300000, 0, 1, 0, -40, "1:0 ratio 3"); + + /* test various combinations of himetric set to 1 */ + test_ifont_size(180000, 0, 0, 1, -24, "0:1 ratio 1"); + test_ifont_size(240000, 0, 0, 1, -32, "0:1 ratio 2"); + test_ifont_size(300000, 0, 0, 1, -40, "0:1 ratio 3"); + + /* test various combinations of 2:1 logical:himetric */ + test_ifont_size(180000, 0, 2, 1, -1270, "2:1 ratio 1"); + test_ifont_size(240000, 0, 2, 1, -1694, "2:1 ratio 2"); + test_ifont_size(300000, 0, 2, 1, -2117, "2:1 ratio 3"); + + /* test various combinations of 1:2 logical:himetric */ + test_ifont_size(180000, 0, 1, 2, -318, "1:2 ratio 1"); + test_ifont_size(240000, 0, 1, 2, -424, "1:2 ratio 2"); + test_ifont_size(300000, 0, 1, 2, -529, "1:2 ratio 3"); + + /* test various combinations of logical and himetric both set to 2 */ + test_ifont_size(180000, 0, 2, 2, -635, "2:2 ratio 1"); + test_ifont_size(240000, 0, 2, 2, -848, "2:2 ratio 2"); + test_ifont_size(300000, 0, 2, 2, -1058, "2:2 ratio 3"); } static void test_QueryInterface(void)

1 0

Erich E. Hoover : oleaut32: Fix OLEFontImpl_SetRatio return when either cyLogical or cyHimetric are 0.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 00aeadc6b66f26ea4b57a2faba38ea913557f491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00aeadc6b66f26ea4b57a2fab… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Jan 17 16:09:21 2014 -0700 oleaut32: Fix OLEFontImpl_SetRatio return when either cyLogical or cyHimetric are 0. --- dlls/oleaut32/olefont.c | 2 +- dlls/oleaut32/tests/olefont.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 3155fc3..bf69950 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1083,7 +1083,7 @@ static HRESULT WINAPI OLEFontImpl_SetRatio( TRACE("(%p)->(%d, %d)\n", this, cyLogical, cyHimetric); if(cyLogical == 0 || cyHimetric == 0) - return E_INVALIDARG; + return E_FAIL; /* cyLogical and cyHimetric both set to 1 is a special case that does not change the scaling but also does not fail */ diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 5249b54..0eab729 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -88,13 +88,10 @@ static void test_ifont_size(LONG lo_size, LONG hi_size, test_name, hres); ok(pvObj != NULL,"%s: OCFI returns NULL.\n", test_name); - /* If scaling ration specified, change ratio. */ - if(ratio_logical && ratio_himetric) - { - hres = IFont_SetRatio(ifnt, ratio_logical, ratio_himetric); - ok(hres == S_OK,"%s: IFont_SetRatio returns 0x%08x instead of S_OK.\n", - test_name, hres); - } + /* Change the scaling ratio */ + hres = IFont_SetRatio(ifnt, ratio_logical, ratio_himetric); + ok((ratio_logical && ratio_himetric) ? hres == S_OK : hres == E_FAIL, + "%s: IFont_SetRatio unexpectedly returned 0x%08x.\n", test_name, hres); /* Read back size. */ hres = IFont_get_Size(ifnt, &psize);

1 0

Nikolay Sivov : wshom: Implement Arguments() property for a shortcut.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: f608c5d2ae7ee0dc82fbf2bae9ae82b7f8dbe5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f608c5d2ae7ee0dc82fbf2bae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 4 10:24:30 2014 +0400 wshom: Implement Arguments() property for a shortcut. --- dlls/wshom.ocx/shell.c | 24 ++++++++++++++++++++---- dlls/wshom.ocx/tests/wshom.c | 11 ++++++++--- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 385d2a3..2dc2bbe 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -394,15 +394,31 @@ static HRESULT WINAPI WshShortcut_get_FullName(IWshShortcut *iface, BSTR *name) static HRESULT WINAPI WshShortcut_get_Arguments(IWshShortcut *iface, BSTR *Arguments) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%p): stub\n", This, Arguments); - return E_NOTIMPL; + WCHAR buffW[INFOTIPSIZE]; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, Arguments); + + if (!Arguments) + return E_POINTER; + + *Arguments = NULL; + + hr = IShellLinkW_GetArguments(This->link, buffW, sizeof(buffW)/sizeof(WCHAR)); + if (FAILED(hr)) + return hr; + + *Arguments = SysAllocString(buffW); + return S_OK; } static HRESULT WINAPI WshShortcut_put_Arguments(IWshShortcut *iface, BSTR Arguments) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(Arguments)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(Arguments)); + + return IShellLinkW_SetArguments(This->link, Arguments); } static HRESULT WINAPI WshShortcut_get_Description(IWshShortcut *iface, BSTR *Description) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 50adb90..0e01304 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -40,8 +40,9 @@ static void test_wshshell(void) IDispatchEx *dispex; IWshCollection *coll; IDispatch *disp, *shortcut; - IUnknown *shell, *unk; + IUnknown *shell; IFolderCollection *folders; + IWshShortcut *shcut; ITypeInfo *ti; HRESULT hr; TYPEATTR *tattr; @@ -109,9 +110,13 @@ static void test_wshshell(void) hr = IWshShell3_CreateShortcut(sh3, str, &shortcut); EXPECT_HR(hr, S_OK); SysFreeString(str); - hr = IDispatch_QueryInterface(shortcut, &IID_IWshShortcut, (void**)&unk); + hr = IDispatch_QueryInterface(shortcut, &IID_IWshShortcut, (void**)&shcut); EXPECT_HR(hr, S_OK); - IUnknown_Release(unk); + + hr = IWshShortcut_get_Arguments(shcut, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + IWshShortcut_Release(shcut); IDispatch_Release(shortcut); /* ExpandEnvironmentStrings */

1 0