wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Piotr Caban : msvcp110: Fix streamsize parameter size in spec file.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: f1105d3f81054ab7b3d181ceafdc3c1efd7a3b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1105d3f81054ab7b3d181cea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 8 12:13:36 2014 +0100 msvcp110: Fix streamsize parameter size in spec file. --- dlls/msvcp110/msvcp110.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index e822130..f00cb3e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3342,7 +3342,7 @@ @ cdecl -arch=arm ?setp@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IAAXPA_W0@Z(ptr ptr ptr) basic_streambuf_wchar_setp @ thiscall -arch=i386 ?setp@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IAEXPA_W0@Z(ptr ptr ptr) basic_streambuf_wchar_setp @ cdecl -arch=win64 ?setp@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEA_W0@Z(ptr ptr ptr) basic_streambuf_wchar_setp -@ cdecl ?setprecision@std@@YA?AU?$_Smanip@_J@1@_J@Z(ptr long) setprecision +@ cdecl ?setprecision@std@@YA?AU?$_Smanip@_J@1@_J@Z(ptr int64) setprecision @ cdecl -arch=arm ?setstate@?$basic_ios@DU?$char_traits@D@std@@@std@@QAAXH_N@Z(ptr long long) basic_ios_char_setstate_reraise @ thiscall -arch=i386 ?setstate@?$basic_ios@DU?$char_traits@D@std@@@std@@QAEXH_N@Z(ptr long long) basic_ios_char_setstate_reraise @ cdecl -arch=win64 ?setstate@?$basic_ios@DU?$char_traits@D@std@@@std@@QEAAXH_N@Z(ptr long long) basic_ios_char_setstate_reraise @@ -3370,7 +3370,7 @@ @ cdecl -arch=arm ?setstate@ios_base@std@@QAAXI@Z(ptr long) ios_base_setstate_unsigned @ thiscall -arch=i386 ?setstate@ios_base@std@@QAEXI@Z(ptr long) ios_base_setstate_unsigned @ cdecl -arch=win64 ?setstate@ios_base@std@@QEAAXI@Z(ptr long) ios_base_setstate_unsigned -@ cdecl ?setw@std@@YA?AU?$_Smanip@_J@1@_J@Z(ptr long) setw +@ cdecl ?setw@std@@YA?AU?$_Smanip@_J@1@_J@Z(ptr int64) setw @ cdecl -arch=arm ?sgetc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAAHXZ(ptr) basic_streambuf_char_sgetc @ thiscall -arch=i386 ?sgetc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAEHXZ(ptr) basic_streambuf_char_sgetc @ cdecl -arch=win64 ?sgetc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAAHXZ(ptr) basic_streambuf_char_sgetc

1 0

Piotr Caban : msvcrt: Handle null mbstr parameter in mbstowcs.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 544d179434f728fa649648aaad74d93e5abd099f URL: http://source.winehq.org/git/wine.git/?a=commit;h=544d179434f728fa649648aaa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 8 12:13:22 2014 +0100 msvcrt: Handle null mbstr parameter in mbstowcs. --- dlls/msvcrt/mbcs.c | 5 +++++ dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index b25649b6..e7eaf5e 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2127,6 +2127,11 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, MSVCRT_pthreadlocinfo locinfo; MSVCRT_size_t i, size; + if(!mbstr) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + if(!locale) locinfo = get_locinfo(); else diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c11c364..800a06b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1635,6 +1635,11 @@ static void test_mbstowcs(void) wOut[4] = '!'; wOut[5] = '\0'; mOut[4] = '!'; mOut[5] = '\0'; + errno = 0xdeadbeef; + ret = mbstowcs(wOut, NULL, 4); + ok(ret == -1, "mbstowcs did not return -1\n"); + ok(errno == EINVAL, "errno = %d\n", errno); + ret = mbstowcs(NULL, mSimple, 0); ok(ret == 4, "mbstowcs did not return 4\n");

1 0

Alexandre Julliard : makefiles: Generate explicit commands to create object subdirectories.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: ec8e5c610b82369e8111c1c7fa724d29ab03c37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8e5c610b82369e8111c1c7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 8 16:04:33 2014 +0100 makefiles: Generate explicit commands to create object subdirectories. --- tools/makedep.c | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 3295359..e8a1161 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1394,7 +1394,6 @@ static struct strarray output_sources(void) struct strarray c2man_files = empty_strarray; struct strarray implib_objs = empty_strarray; struct strarray includes = empty_strarray; - struct strarray subdirs = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray all_targets = get_expanded_make_var_array( "PROGRAMS" ); struct strarray targetflags = get_expanded_make_var_array( "TARGETFLAGS" ); @@ -1423,7 +1422,7 @@ static struct strarray output_sources(void) LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) { struct strarray extradefs; - char *sourcedep; + char *subdir = NULL; char *obj = xstrdup( source->name ); char *ext = get_extension( obj ); @@ -1432,12 +1431,9 @@ static struct strarray output_sources(void) if (src_dir && strchr( obj, '/' )) { - char *dir = xstrdup( obj ); - *strrchr( dir, '/' ) = 0; - strarray_add_uniq( &subdirs, dir ); - sourcedep = strmake( "%s %s", dir, source->filename ); + subdir = xstrdup( obj ); + *strrchr( subdir, '/' ) = 0; } - else sourcedep = xstrdup( source->filename ); extradefs = get_expanded_make_var_array( strmake( "%s_EXTRADEFS", obj )); @@ -1448,28 +1444,32 @@ static struct strarray output_sources(void) if (find_include_file( header )) { - output( "%s.tab.h: %s\n", obj, sourcedep ); + output( "%s.tab.h: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o %s.tab.c -d %s\n", obj, obj, source->filename ); output( "%s.tab.c: %s %s\n", obj, source->filename, header ); strarray_add( &clean_files, strmake( "%s.tab.h", obj )); } - else output( "%s.tab.c: %s\n", obj, sourcedep ); + else output( "%s.tab.c: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o $@ %s\n", obj, source->filename ); free( header ); continue; /* no dependencies */ } else if (!strcmp( ext, "x" )) /* template file */ { - output( "%s.h: $(MAKEXFTMPL) %s\n", obj, sourcedep ); + output( "%s.h: $(MAKEXFTMPL) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(MAKEXFTMPL) -H -o $@ %s\n", source->filename ); strarray_add( &clean_files, strmake( "%s.h", obj )); continue; /* no dependencies */ } else if (!strcmp( ext, "l" )) /* lex file */ { - output( "%s.yy.c: %s\n", obj, sourcedep ); + output( "%s.yy.c: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(FLEX) $(LEXFLAGS) -o$@ %s\n", source->filename ); continue; /* no dependencies */ } @@ -1477,7 +1477,8 @@ static struct strarray output_sources(void) { if (source->flags & FLAG_RC_PO) { - output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); + output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WRC) -o $@ %s", source->filename ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); @@ -1491,7 +1492,8 @@ static struct strarray output_sources(void) } else { - output( "%s.res: $(WRC) %s\n", obj, sourcedep ); + output( "%s.res: $(WRC) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WRC) -o $@ %s", source->filename ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); @@ -1506,7 +1508,8 @@ static struct strarray output_sources(void) } else if (!strcmp( ext, "mc" )) /* message file */ { - output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); + output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WMC) -U -O res $(PORCFLAGS) -o $@ %s\n", source->filename ); strarray_add( &res_files, strmake( "%s.res", obj )); strarray_add( &mc_files, source->filename ); @@ -1531,6 +1534,7 @@ static struct strarray output_sources(void) if (source->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); output_filenames( targets ); output( ": $(WIDL)\n" ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WIDL) -o $@ %s", source->filename ); output_filenames( targetflags ); output_filenames( includes ); @@ -1539,7 +1543,7 @@ static struct strarray output_sources(void) output_filename( "$(IDLFLAGS)" ); output( "\n" ); output_filenames( targets ); - output( ": %s", sourcedep ); + output( ": %s", source->filename ); } else if (!strcmp( ext, "in" )) /* .in file or man page */ { @@ -1565,7 +1569,8 @@ static struct strarray output_sources(void) strarray_add_uniq( &phony_targets, "install-man-pages" ); } else strarray_add( &clean_files, xstrdup(obj) ); - output( "%s: %s\n", obj, sourcedep ); + output( "%s: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename ); output( "%s:", obj ); } @@ -1609,7 +1614,8 @@ static struct strarray output_sources(void) if (source->flags & FLAG_GENERATED) strarray_add( &clean_files, source->filename ); if (source->flags & FLAG_C_IMPLIB) strarray_add( &implib_objs, strmake( "%s.o", obj )); strarray_add( &object_files, strmake( "%s.o", obj )); - output( "%s.o: %s\n", obj, sourcedep ); + output( "%s.o: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(CC) -c -o $@ %s", source->filename ); output_filenames( includes ); output_filenames( define_args ); @@ -1620,7 +1626,8 @@ static struct strarray output_sources(void) if (crosstarget && need_cross) { strarray_add( &crossobj_files, strmake( "%s.cross.o", obj )); - output( "%s.cross.o: %s\n", obj, sourcedep ); + output( "%s.cross.o: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( includes ); output_filenames( define_args ); @@ -1643,7 +1650,6 @@ static struct strarray output_sources(void) output( ":" ); } free( obj ); - free( sourcedep ); for (i = 0; i < source->files_count; i++) output_include( source->files[i], source ); output( "\n" ); @@ -1947,13 +1953,6 @@ static struct strarray output_sources(void) strarray_add( &phony_targets, "clean" ); } - if (subdirs.count) - { - output_filenames( subdirs ); - output( ":\n" ); - output( "\t$(MKDIR_P) -m 755 $@\n" ); - } - if (top_obj_dir) { output( "depend:\n" );

1 0

Alexandre Julliard : makefiles: Automatically add the necessary msvcrt flags to the generated rules.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 3e40fea9d61e7a0c5fe562c0f2d42fa5d971837c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e40fea9d61e7a0c5fe562c0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 8 12:38:55 2014 +0100 makefiles: Automatically add the necessary msvcrt flags to the generated rules. --- Make.rules.in | 2 +- Make.vars.in | 1 + configure | 2 ++ configure.ac | 2 ++ dlls/crtdll/Makefile.in | 2 -- dlls/msvcirt/msvcirt.c | 1 - dlls/msvcp100/Makefile.in | 2 -- dlls/msvcp100/tests/Makefile.in | 2 -- dlls/msvcp110/Makefile.in | 2 -- dlls/msvcp60/Makefile.in | 2 -- dlls/msvcp60/tests/Makefile.in | 2 -- dlls/msvcp71/Makefile.in | 2 -- dlls/msvcp80/Makefile.in | 2 -- dlls/msvcp90/Makefile.in | 2 -- dlls/msvcp90/tests/Makefile.in | 2 -- dlls/msvcr100/Makefile.in | 2 -- dlls/msvcr100/tests/Makefile.in | 2 -- dlls/msvcr110/Makefile.in | 2 -- dlls/msvcr80/Makefile.in | 2 -- dlls/msvcr90/Makefile.in | 2 -- dlls/msvcr90/tests/Makefile.in | 2 -- dlls/msvcrt/tests/Makefile.in | 3 +-- dlls/msvcrtd/Makefile.in | 2 -- dlls/msvcrtd/tests/Makefile.in | 2 -- loader/Makefile.in | 1 - programs/notepad/Makefile.in | 3 --- programs/regedit/Makefile.in | 3 --- programs/taskmgr/Makefile.in | 3 --- programs/wordpad/Makefile.in | 3 --- programs/xcopy/Makefile.in | 2 -- tools/makedep.c | 31 ++++++++++++++++++++++++------- 31 files changed, 31 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e40fea9d61e7a0c5fe56…

1 0

Sebastian Lackner : kernel32: Forward condition variable functions to ntdll.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: ddc7f300e2cd5dd2e17783739fabbf74491e9eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc7f300e2cd5dd2e17783739… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 5 03:53:12 2014 +0100 kernel32: Forward condition variable functions to ntdll. --- dlls/kernel32/kernel32.spec | 4 ++++ dlls/kernel32/sync.c | 18 ++++++++++++++++++ dlls/kernel32/tests/sync.c | 6 ++---- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7779a75..02b1bdb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -750,6 +750,7 @@ @ stdcall InitOnceComplete(ptr long ptr) @ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) @ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize +@ stdcall InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall InitializeCriticalSectionEx(ptr long long) @@ -1194,6 +1195,7 @@ @ stdcall SignalObjectAndWait(long long long long) @ stdcall SizeofResource(long long) @ stdcall Sleep(long) +@ stdcall SleepConditionVariableCS(ptr ptr long) @ stdcall SleepEx(long long) @ stdcall SuspendThread(long) @ stdcall SwitchToFiber(ptr) @@ -1263,6 +1265,8 @@ @ stdcall WaitForSingleObjectEx(long long long) @ stdcall WaitNamedPipeA (str long) @ stdcall WaitNamedPipeW (wstr long) +@ stdcall WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable +@ stdcall WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable @ stdcall WerRegisterFile(wstr long long) @ stdcall WerRegisterMemoryBlock(ptr long) @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 5b7f810..2b7f4b0 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2321,3 +2321,21 @@ __ASM_STDCALL_FUNC(InterlockedDecrement, 4, "ret $4") #endif /* __i386__ */ + +/*********************************************************************** + * SleepConditionVariableCS (KERNEL32.@) + */ +BOOL WINAPI SleepConditionVariableCS( CONDITION_VARIABLE *variable, CRITICAL_SECTION *crit, DWORD timeout ) +{ + NTSTATUS status; + LARGE_INTEGER time; + + status = RtlSleepConditionVariableCS( variable, crit, get_nt_timeout( &time, timeout ) ); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; +} diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 84c44e0..d76aa16 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1477,8 +1477,7 @@ static void test_condvars_consumer_producer(void) if (!pInitializeConditionVariable) { /* function is not yet in XP, only in newer Windows */ - /* and not yet implemented in Wine for some days/weeks */ - todo_wine win_skip("no condition variable support.\n"); + win_skip("no condition variable support.\n"); return; } @@ -1640,8 +1639,7 @@ static void test_condvars_base(void) { if (!pInitializeConditionVariable) { /* function is not yet in XP, only in newer Windows */ - /* and not yet implemented in Wine for some days/weeks */ - todo_wine win_skip("no condition variable support.\n"); + win_skip("no condition variable support.\n"); return; }

1 0

Sebastian Lackner : ntdll: Implement condition variable functions using keyed events.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 5472b9f9ca1a393c0153e256da67798a3afe53c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5472b9f9ca1a393c0153e256d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 5 03:48:34 2014 +0100 ntdll: Implement condition variable functions using keyed events. --- dlls/ntdll/ntdll.spec | 4 +++ dlls/ntdll/sync.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 6 +++- 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6418671..2e507bb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -672,6 +672,7 @@ @ stdcall RtlInitUnicodeStringEx(ptr wstr) # @ stub RtlInitializeAtomPackage @ stdcall RtlInitializeBitMap(ptr long long) +@ stdcall RtlInitializeConditionVariable(ptr) @ stub RtlInitializeContext @ stdcall RtlInitializeCriticalSection(ptr) @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) @@ -867,6 +868,7 @@ @ stub RtlSetUserFlagsHeap @ stub RtlSetUserValueHeap @ stdcall RtlSizeHeap(long long ptr) +@ stdcall RtlSleepConditionVariableCS(ptr ptr ptr) @ stub RtlSplay @ stub RtlStartRXact # @ stub RtlStatMemoryStream @@ -932,6 +934,8 @@ # @ stub RtlValidateUnicodeString @ stdcall RtlVerifyVersionInfo(ptr long int64) @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) +@ stdcall RtlWakeAllConditionVariable(ptr) +@ stdcall RtlWakeConditionVariable(ptr) @ stub RtlWalkFrameChain @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index b05bd19..c94d9c4 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -63,6 +63,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); HANDLE keyed_event = NULL; +static inline int interlocked_dec_if_nonzero( int *dest ) +{ + int val, tmp; + for (val = *dest;; val = tmp) + { + if (!val || (tmp = interlocked_cmpxchg( dest, val - 1, val )) == val) + break; + } + return val; +} + /* creates a struct security_descriptor and contained information in one contiguous piece of memory */ NTSTATUS NTDLL_create_struct_sd(PSECURITY_DESCRIPTOR nt_sd, struct security_descriptor **server_sd, data_size_t *server_sd_len) @@ -1410,3 +1421,85 @@ void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) { FIXME( "%p stub\n", lock ); } + +/*********************************************************************** + * RtlInitializeConditionVariable (NTDLL.@) + * + * Initializes the condition variable with NULL. + * + * PARAMS + * variable [O] condition variable + * + * RETURNS + * Nothing. + */ +void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) +{ + variable->Ptr = NULL; +} + +/*********************************************************************** + * RtlWakeConditionVariable (NTDLL.@) + * + * Wakes up one thread waiting on the condition variable. + * + * PARAMS + * variable [I/O] condition variable to wake up. + * + * RETURNS + * Nothing. + * + * NOTES + * The calling thread does not have to own any lock in order to call + * this function. + */ +void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) +{ + if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); +} + +/*********************************************************************** + * RtlWakeAllConditionVariable (NTDLL.@) + * + * See WakeConditionVariable, wakes up all waiting threads. + */ +void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) +{ + int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); + while (val-- > 0) + NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); +} + +/*********************************************************************** + * RtlSleepConditionVariableCS (NTDLL.@) + * + * Atomically releases the critical section and suspends the thread, + * waiting for a Wake(All)ConditionVariable event. Afterwards it enters + * the critical section again and returns. + * + * PARAMS + * variable [I/O] condition variable + * crit [I/O] critical section to leave temporarily + * timeout [I] timeout + * + * RETURNS + * see NtWaitForKeyedEvent for all possible return values. + */ +NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, RTL_CRITICAL_SECTION *crit, + const LARGE_INTEGER *timeout ) +{ + NTSTATUS status; + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + RtlLeaveCriticalSection( crit ); + + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + if (status != STATUS_SUCCESS) + { + if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } + + RtlEnterCriticalSection( crit ); + return status; +} diff --git a/include/winternl.h b/include/winternl.h index d93b37a..c840732 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2418,10 +2418,11 @@ NTSYSAPI void WINAPI RtlInitAnsiString(PANSI_STRING,PCSZ); NTSYSAPI NTSTATUS WINAPI RtlInitAnsiStringEx(PANSI_STRING,PCSZ); NTSYSAPI void WINAPI RtlInitUnicodeString(PUNICODE_STRING,PCWSTR); NTSYSAPI NTSTATUS WINAPI RtlInitUnicodeStringEx(PUNICODE_STRING,PCWSTR); +NTSYSAPI void WINAPI RtlInitializeBitMap(PRTL_BITMAP,PULONG,ULONG); +NTSYSAPI void WINAPI RtlInitializeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSectionAndSpinCount(RTL_CRITICAL_SECTION *,ULONG); NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSectionEx(RTL_CRITICAL_SECTION *,ULONG,ULONG); -NTSYSAPI void WINAPI RtlInitializeBitMap(PRTL_BITMAP,PULONG,ULONG); NTSYSAPI void WINAPI RtlInitializeHandleTable(ULONG,ULONG,RTL_HANDLE_TABLE *); NTSYSAPI void WINAPI RtlInitializeResource(LPRTL_RWLOCK); NTSYSAPI void WINAPI RtlInitializeSRWLock(RTL_SRWLOCK*); @@ -2501,6 +2502,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOL NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); NTSYSAPI SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,const void*); +NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableCS(RTL_CONDITION_VARIABLE*,RTL_CRITICAL_SECTION*,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI RtlStringFromGUID(REFGUID,PUNICODE_STRING); NTSYSAPI LPDWORD WINAPI RtlSubAuthoritySid(PSID,DWORD); NTSYSAPI LPBYTE WINAPI RtlSubAuthorityCountSid(PSID); @@ -2544,6 +2546,8 @@ NTSYSAPI BOOLEAN WINAPI RtlValidAcl(PACL); NTSYSAPI BOOLEAN WINAPI RtlValidSid(PSID); NTSYSAPI BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID); NTSYSAPI NTSTATUS WINAPI RtlVerifyVersionInfo(const RTL_OSVERSIONINFOEXW*,DWORD,DWORDLONG); +NTSYSAPI void WINAPI RtlWakeAllConditionVariable(RTL_CONDITION_VARIABLE *); +NTSYSAPI void WINAPI RtlWakeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*);

1 0

Henri Verbeet : d3d9/tests: Make sure create_device() returns NULL on failure.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 86ffd6c4eaacaadceaaa9b47e67c495fff8709e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ffd6c4eaacaadceaaa9b47e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 8 10:56:16 2014 +0100 d3d9/tests: Make sure create_device() returns NULL on failure. --- dlls/d3d9/tests/visual.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d4e7bd0..534d8bd 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -177,7 +177,6 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device; - HRESULT hr; present_parameters.Windowed = TRUE; present_parameters.hDeviceWindow = create_window(); @@ -188,14 +187,12 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, - "Failed to create a device, hr %#x.\n", hr); - if (FAILED(hr)) - DestroyWindow(present_parameters.hDeviceWindow); + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) + return device; - return device; + DestroyWindow(present_parameters.hDeviceWindow); + return NULL; } static IDirect3DDevice9 *init_d3d9(void)

1 0

Henri Verbeet : wined3d: Fix up the backbuffer count on failure in swapchain_init().
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: ddae20b6899e65456750981ba002e426e6d35539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddae20b6899e65456750981ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 8 10:56:15 2014 +0100 wined3d: Fix up the backbuffer count on failure in swapchain_init(). --- dlls/wined3d/swapchain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ff2ac64..40fabc6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -952,6 +952,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 parent, &surface_desc, &swapchain->back_buffers[i]))) { WARN("Failed to create back buffer %u, hr %#x.\n", i, hr); + swapchain->desc.backbuffer_count = i; goto err; } surface_set_swapchain(swapchain->back_buffers[i], swapchain);

1 0

Henri Verbeet : wined3d: Get rid of the unused screen_palents field in struct wined3d_palette.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 2401a82bdc99fe8daf00ca0683bc1c625cbcfb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2401a82bdc99fe8daf00ca068… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 8 10:56:14 2014 +0100 wined3d: Get rid of the unused screen_palents field in struct wined3d_palette. --- dlls/wined3d/wined3d_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a0cb5bb..0735116 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2951,8 +2951,6 @@ struct wined3d_palette WORD palVersion; /*| */ WORD palNumEntries; /*| LOGPALETTE */ PALETTEENTRY palents[256]; /*| */ - /* This is to store the palette in 'screen format' */ - int screen_palents[256]; DWORD flags; };

1 0

Nikolay Sivov : scrrun: Fill find data on second Next() call before testing it.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: fac0d13ee74979bcfe954ebab66f291efa7eda5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac0d13ee74979bcfe954ebab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:37:59 2014 +0400 scrrun: Fill find data on second Next() call before testing it. --- dlls/scrrun/filesystem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index e0c9a34..bfb201c 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -510,6 +510,8 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel This->data.u.foldercoll.find = handle; } + else if (celt) + FindNextFileW(handle, &data); do { @@ -663,6 +665,8 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, This->data.u.filecoll.find = handle; } + else if (celt) + FindNextFileW(handle, &data); do {

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
82
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 January 2014