June 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : ntdll: Try to avoid an unnecessary syscall in fast_release_srw_exclusive().
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 07e86d3c9df23ea18166ff89503d1dc02d1bda36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07e86d3c9df23ea18166ff89… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 10 11:07:54 2019 -0400 ntdll: Try to avoid an unnecessary syscall in fast_release_srw_exclusive(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index c7a96b6..35b89df 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1667,7 +1667,10 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu * 30-16 - Number of exclusive waiters. Unlike the fallback implementation, * this does not include the thread owning the lock, or shared threads * waiting on the lock. - * 15-0 - Number of shared owners. Unlike the fallback implementation, this + * 15 - Does this lock have any shared waiters? We use this as an + * optimization to avoid unnecessary FUTEX_WAKE_BITSET calls when + * releasing an exclusive lock. + * 14-0 - Number of shared owners. Unlike the fallback implementation, this * does not include the number of shared threads waiting on the lock. * Thus the state [1, x, >=1] will never occur. */ @@ -1675,7 +1678,8 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu #define SRWLOCK_FUTEX_EXCLUSIVE_LOCK_BIT 0x80000000 #define SRWLOCK_FUTEX_EXCLUSIVE_WAITERS_MASK 0x7fff0000 #define SRWLOCK_FUTEX_EXCLUSIVE_WAITERS_INC 0x00010000 -#define SRWLOCK_FUTEX_SHARED_OWNERS_MASK 0x0000ffff +#define SRWLOCK_FUTEX_SHARED_WAITERS_BIT 0x00008000 +#define SRWLOCK_FUTEX_SHARED_OWNERS_MASK 0x00007fff #define SRWLOCK_FUTEX_SHARED_OWNERS_INC 0x00000001 /* Futex bitmasks; these are independent from the bits in the lock itself. */ @@ -1810,7 +1814,7 @@ static NTSTATUS fast_acquire_srw_shared( RTL_SRWLOCK *lock ) } else { - new = old; + new = old | SRWLOCK_FUTEX_SHARED_WAITERS_BIT; wait = TRUE; } } while (interlocked_cmpxchg( (int *)lock, new, old ) != old); @@ -1841,11 +1845,14 @@ static NTSTATUS fast_release_srw_exclusive( RTL_SRWLOCK *lock ) } new = old & ~SRWLOCK_FUTEX_EXCLUSIVE_LOCK_BIT; + + if (!(new & SRWLOCK_FUTEX_EXCLUSIVE_WAITERS_MASK)) + new &= ~SRWLOCK_FUTEX_SHARED_WAITERS_BIT; } while (interlocked_cmpxchg( (int *)lock, new, old ) != old); if (new & SRWLOCK_FUTEX_EXCLUSIVE_WAITERS_MASK) futex_wake_bitset( (int *)lock, 1, SRWLOCK_FUTEX_BITSET_EXCLUSIVE ); - else + else if (old & SRWLOCK_FUTEX_SHARED_WAITERS_BIT) futex_wake_bitset( (int *)lock, INT_MAX, SRWLOCK_FUTEX_BITSET_SHARED ); return STATUS_SUCCESS;

1 0

Aric Stewart : winemac.drv: Send state change notifications from ImeSelect.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: bb501445f1c97b4daddf4b048f3a7ce5b637093b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb501445f1c97b4daddf4b04… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 10 08:02:02 2019 -0500 winemac.drv: Send state change notifications from ImeSelect. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/ime.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index a071408..dabe665 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -630,6 +630,10 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) { LPIMEPRIVATE myPrivate; myPrivate = ImmLockIMCC(lpIMC->hPrivate); + if (myPrivate->bInComposition) + GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); + if (myPrivate->bInternalState) + ImmSetOpenStatus(RealIMC(FROM_MACDRV), FALSE); myPrivate->bInComposition = FALSE; myPrivate->bInternalState = FALSE; myPrivate->textfont = NULL;

1 0

Michael Muller : ddraw: Properly set DDCAPS.ddsOldCaps in ddraw7_GetCaps() .
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 50dfd232a4f2052b767a96e7dd8ec186d15fbe69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50dfd232a4f2052b767a96e7… Author: Michael Muller <michael(a)fds-team.de> Date: Mon Jun 10 23:54:22 2019 +0430 ddraw: Properly set DDCAPS.ddsOldCaps in ddraw7_GetCaps(). Signed-off-by: David Adam <david.adam.cnrs(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 ++ dlls/ddraw/tests/ddraw1.c | 26 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 25 +++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 26 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 26 ++++++++++++++++++++++++++ 5 files changed, 105 insertions(+) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 04a94b6..8dce5ce 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1510,6 +1510,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD caps.dwCaps |= DDCAPS_ALIGNSTRIDE; caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT; + caps.ddsOldCaps.dwCaps = caps.ddsCaps.dwCaps; + if(DriverCaps) { DD_STRUCT_COPY_BYSIZE(DriverCaps, &caps); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 68428e2..860e101 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12874,6 +12874,31 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw_Release(ddraw); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -12984,4 +13009,5 @@ START_TEST(ddraw1) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d056949..2c047a5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13750,6 +13750,30 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw2 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw2_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw2_Release(ddraw); +} START_TEST(ddraw2) { @@ -13868,4 +13892,5 @@ START_TEST(ddraw2) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 823af43..fa6cca6 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16170,6 +16170,31 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw4 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw4_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -16302,4 +16327,5 @@ START_TEST(ddraw4) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e8c36dc..b0fc634 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16264,6 +16264,31 @@ static void test_begin_end_state_block(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw7 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw7_Release(ddraw); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16410,4 +16435,5 @@ START_TEST(ddraw7) test_alphatest(); test_clipper_refcount(); test_begin_end_state_block(); + test_caps(); }

1 0

Alexandre Julliard : fltmgr.sys: Fix duplicate dll flags.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: a6b1c493be482c3301163f61675d001eaa7ce841 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6b1c493be482c3301163f61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 15:36:17 2019 +0200 fltmgr.sys: Fix duplicate dll flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/Makefile.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in index 87fe4c3..cbe124c 100644 --- a/dlls/fltmgr.sys/Makefile.in +++ b/dlls/fltmgr.sys/Makefile.in @@ -1,7 +1,5 @@ MODULE = fltmgr.sys -EXTRADLLFLAGS = -Wl,--subsystem,native - -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ main.c

1 0

Alexandre Julliard : mprapi: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 5afcbaa30f922187ab3f362ba8d3fd0f1fb244b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5afcbaa30f922187ab3f362b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:29:36 2019 +0200 mprapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mprapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mprapi/Makefile.in b/dlls/mprapi/Makefile.in index 2bf309f..e33e57e 100644 --- a/dlls/mprapi/Makefile.in +++ b/dlls/mprapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = mprapi.dll IMPORTLIB = mprapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mprapi.c

1 0

Alexandre Julliard : monodebg.vxd: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 15287e0fd214bdbf28676a76344b69db8f2bcf4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=15287e0fd214bdbf28676a76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:28:46 2019 +0200 monodebg.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/monodebg.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/monodebg.vxd/Makefile.in b/dlls/monodebg.vxd/Makefile.in index ccbfdba..8fea327 100644 --- a/dlls/monodebg.vxd/Makefile.in +++ b/dlls/monodebg.vxd/Makefile.in @@ -1,4 +1,6 @@ MODULE = monodebg.vxd +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ monodebg.c

1 0

Alexandre Julliard : mmsystem: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: c1df11c167346df70bbdbb3e939417ba7ad593f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1df11c167346df70bbdbb3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:28:37 2019 +0200 mmsystem: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmsystem.dll16/Makefile.in | 2 +- dlls/mmsystem.dll16/message16.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmsystem.dll16/Makefile.in b/dlls/mmsystem.dll16/Makefile.in index 1eb0ce9..e1033b4 100644 --- a/dlls/mmsystem.dll16/Makefile.in +++ b/dlls/mmsystem.dll16/Makefile.in @@ -1,7 +1,7 @@ MODULE = mmsystem.dll16 IMPORTS = winmm user32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,winmm.dll C_SRCS = \ driver.c \ diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index 012d3dc..32c5192 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -844,7 +844,7 @@ static LRESULT CALLBACK MMSYSTDRV_Callback3216(struct mmsystdrv_thunk* thunk, HD SetEvent((HANDLE)thunk->callback); break; default: - WARN("Unknown callback type %x\n", thunk->flags & CALLBACK_TYPEMASK); + WARN("Unknown callback type %x\n", thunk->flags); return FALSE; } TRACE("Done\n");

1 0

Alexandre Julliard : mmcndmgr: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: ca0f73c0ce0d143870294e9cd1b742bc7df82455 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca0f73c0ce0d143870294e9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:27:03 2019 +0200 mmcndmgr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmcndmgr/Makefile.in | 2 ++ dlls/mmcndmgr/mmcndmgr.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmcndmgr/Makefile.in b/dlls/mmcndmgr/Makefile.in index adf36ce..3bc8209 100644 --- a/dlls/mmcndmgr/Makefile.in +++ b/dlls/mmcndmgr/Makefile.in @@ -1,6 +1,8 @@ MODULE = mmcndmgr.dll IMPORTS = uuid oleaut32 ole32 user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mmcndmgr.c diff --git a/dlls/mmcndmgr/mmcndmgr.c b/dlls/mmcndmgr/mmcndmgr.c index 255b27d..4e6e2e6 100644 --- a/dlls/mmcndmgr/mmcndmgr.c +++ b/dlls/mmcndmgr/mmcndmgr.c @@ -26,9 +26,7 @@ #include "ole2.h" #include "rpcproxy.h" -#include "wine/unicode.h" #include "wine/debug.h" -#include "wine/library.h" #include "initguid.h" #include "mmc.h"

1 0

Alexandre Julliard : mfreadwrite: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 3db44e9940ddaac72a4542cb824a6e7d625fb8d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3db44e9940ddaac72a4542cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:26:09 2019 +0200 mfreadwrite: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/Makefile.in | 2 ++ dlls/mfreadwrite/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index ce8a4d4..ce63ad5 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -2,6 +2,8 @@ MODULE = mfreadwrite.dll IMPORTLIB = mfreadwrite IMPORTS = mfuuid uuid mfplat ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 5ec5c91..dd92337 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -16,7 +16,6 @@ * 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 "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : mf: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: c7d06a084b5c70e9325d85ac264639d90cafb34b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7d06a084b5c70e9325d85ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:23:31 2019 +0200 mf: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 ++ dlls/mf/main.c | 6 ++---- dlls/mf/session.c | 1 - dlls/mf/topology.c | 4 +--- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index bdf5887..d23349c 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -2,6 +2,8 @@ MODULE = mf.dll IMPORTLIB = mf IMPORTS = mfplat ole32 uuid mfuuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c \ samplegrabber.c \ diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 6db13f1..2e6dc78 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> @@ -39,7 +38,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -705,7 +703,7 @@ static WCHAR *heap_strdupW(const WCHAR *str) { unsigned int size; - size = (strlenW(str) + 1) * sizeof(WCHAR); + size = (lstrlenW(str) + 1) * sizeof(WCHAR); ret = heap_alloc(size); if (ret) memcpy(ret, str, size); @@ -930,7 +928,7 @@ static HRESULT WINAPI file_scheme_handler_callback_Invoke(IMFAsyncCallback *ifac /* Strip from scheme, MFCreateFile() won't be expecting it. */ url = context->url; - if (!strncmpiW(context->url, schemeW, ARRAY_SIZE(schemeW))) + if (!wcsnicmp(context->url, schemeW, ARRAY_SIZE(schemeW))) url += ARRAY_SIZE(schemeW); hr = MFCreateFile(context->flags & MF_RESOLUTION_WRITE ? MF_ACCESSMODE_READWRITE : MF_ACCESSMODE_READ, diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 3fce937..c43e6d2 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -15,7 +15,6 @@ * 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 "config.h" #include <stdarg.h> diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 81fd175..e48792e 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdarg.h> @@ -806,7 +804,7 @@ static TOPOID topology_generate_id(void) { old = next_topology_id; } - while (interlocked_cmpxchg64((LONG64 *)&next_topology_id, old + 1, old) != old); + while (InterlockedCompareExchange64((LONG64 *)&next_topology_id, old + 1, old) != old); return next_topology_id; }

1 0