April 2017 - Wine-Commits - list.winehq.org

Paul Gofman : d3dx9/tests: Extend test for relative addressing in preshaders.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: b096f03ca63caed6747c8e7cf624cd38ec7625fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b096f03ca63caed6747c8e7cf… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 3 19:51:23 2017 +0200 d3dx9/tests: Extend test for relative addressing in preshaders. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 1244 ++++++++++++++++++++++-------------------- 1 file changed, 664 insertions(+), 580 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b096f03ca63caed6747c8…

1 0

Paul Gofman : d3dx9: Support relative addressing in preshaders.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 42cbd578f76b0ec0612d4dca1c9f3e3fd4e7a91e URL: http://source.winehq.org/git/wine.git/?a=commit;h=42cbd578f76b0ec0612d4dca1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 3 19:51:22 2017 +0200 d3dx9: Support relative addressing in preshaders. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 164 ++++++++++++++++++++++++++++++++++--------- dlls/d3dx9_36/tests/effect.c | 38 +++++----- 2 files changed, 151 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42cbd578f76b0ec0612d4…

1 0

Piotr Caban : msvcrt: Add _CurrentScheduler class implementation.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 858bdcb392ff6a833fe55a00229e251a195d3743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858bdcb392ff6a833fe55a002… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 15:06:25 2017 +0200 msvcrt: Add _CurrentScheduler class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 10 +++++----- dlls/msvcr110/msvcr110.spec | 10 +++++----- dlls/msvcr120/msvcr120.spec | 10 +++++----- dlls/msvcr120_app/msvcr120_app.spec | 10 +++++----- dlls/msvcrt/scheduler.c | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=858bdcb392ff6a833fe55…

1 0

Piotr Caban : msvcrt: Add _Scheduler class implementation.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: daccc568af284cc4265f969080ab92d96355e159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daccc568af284cc4265f96908… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 15:06:14 2017 +0200 msvcrt: Add _Scheduler class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 20 +++++++-------- dlls/msvcr110/msvcr110.spec | 30 +++++++++++----------- dlls/msvcr120/msvcr120.spec | 30 +++++++++++----------- dlls/msvcr120_app/msvcr120_app.spec | 30 +++++++++++----------- dlls/msvcrt/scheduler.c | 50 +++++++++++++++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=daccc568af284cc4265f9…

1 0

Piotr Caban : msvcrt: Forward remaining CurrentScheduler functions to current scheduler object.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: d3020a606ab7716b50455b657cb1dea10f3de172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3020a606ab7716b50455b657… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 15:06:01 2017 +0200 msvcrt: Forward remaining CurrentScheduler functions to current scheduler object. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cxx.h | 7 +++++ dlls/msvcrt/scheduler.c | 69 +++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 476f66a..50bf7ca 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -267,9 +267,16 @@ typedef struct extern void *vtbl_wrapper_0; extern void *vtbl_wrapper_4; extern void *vtbl_wrapper_8; +extern void *vtbl_wrapper_12; extern void *vtbl_wrapper_16; extern void *vtbl_wrapper_20; +extern void *vtbl_wrapper_24; extern void *vtbl_wrapper_28; +extern void *vtbl_wrapper_32; +extern void *vtbl_wrapper_36; +extern void *vtbl_wrapper_40; +extern void *vtbl_wrapper_44; +extern void *vtbl_wrapper_48; #else diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index b405f39..619c89e 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -49,9 +49,16 @@ static int scheduler_id = -1; DEFINE_VTBL_WRAPPER(0); DEFINE_VTBL_WRAPPER(4); DEFINE_VTBL_WRAPPER(8); +DEFINE_VTBL_WRAPPER(12); DEFINE_VTBL_WRAPPER(16); DEFINE_VTBL_WRAPPER(20); +DEFINE_VTBL_WRAPPER(24); DEFINE_VTBL_WRAPPER(28); +DEFINE_VTBL_WRAPPER(32); +DEFINE_VTBL_WRAPPER(36); +DEFINE_VTBL_WRAPPER(40); +DEFINE_VTBL_WRAPPER(44); +DEFINE_VTBL_WRAPPER(48); #endif @@ -117,9 +124,27 @@ typedef struct Scheduler { } Scheduler; #define call_Scheduler_Id(this) CALL_VTBL_FUNC(this, 4, unsigned int, (const Scheduler*), (this)) #define call_Scheduler_GetNumberOfVirtualProcessors(this) CALL_VTBL_FUNC(this, 8, unsigned int, (const Scheduler*), (this)) +#define call_Scheduler_GetPolicy(this,policy) CALL_VTBL_FUNC(this, 12, \ + SchedulerPolicy*, (Scheduler*,SchedulerPolicy*), (this,policy)) #define call_Scheduler_Reference(this) CALL_VTBL_FUNC(this, 16, unsigned int, (Scheduler*), (this)) #define call_Scheduler_Release(this) CALL_VTBL_FUNC(this, 20, unsigned int, (Scheduler*), (this)) +#define call_Scheduler_RegisterShutdownEvent(this,event) CALL_VTBL_FUNC(this, 24, void, (Scheduler*,HANDLE), (this,event)) #define call_Scheduler_Attach(this) CALL_VTBL_FUNC(this, 28, void, (Scheduler*), (this)) +#if _MSVCR_VER > 100 +#define call_Scheduler_CreateScheduleGroup_loc(this,placement) CALL_VTBL_FUNC(this, 32, \ + /*ScheduleGroup*/void*, (Scheduler*,/*location*/void*), (this,placement)) +#define call_Scheduler_CreateScheduleGroup(this) CALL_VTBL_FUNC(this, 36, /*ScheduleGroup*/void*, (Scheduler*), (this)) +#define call_Scheduler_ScheduleTask_loc(this,proc,data,placement) CALL_VTBL_FUNC(this, 40, \ + void, (Scheduler*,void (__cdecl*)(void*),void*,/*location*/void*), (this,proc,data,placement)) +#define call_Scheduler_ScheduleTask(this,proc,data) CALL_VTBL_FUNC(this, 44, \ + void, (Scheduler*,void (__cdecl*)(void*),void*), (this,proc,data)) +#define call_Scheduler_IsAvailableLocation(this,placement) CALL_VTBL_FUNC(this, 48, \ + MSVCRT_bool, (Scheduler*,const /*location*/void*), (this,placement)) +#else +#define call_Scheduler_CreateScheduleGroup(this) CALL_VTBL_FUNC(this, 32, /*ScheduleGroup*/void*, (Scheduler*), (this)) +#define call_Scheduler_ScheduleTask(this,proc,data) CALL_VTBL_FUNC(this, 36, \ + void, (Scheduler*,void (__cdecl*)(void*),void*), (this,proc,data)) +#endif typedef struct { Scheduler scheduler; @@ -882,27 +907,31 @@ Scheduler* __cdecl CurrentScheduler_Get(void) return get_current_scheduler(); } +#if _MSVCR_VER > 100 /* ?CreateScheduleGroup(a)CurrentScheduler@Concurrency@@SAPAVScheduleGroup(a)2@AAVlocation(a)2@@Z */ /* ?CreateScheduleGroup(a)CurrentScheduler@Concurrency@@SAPEAVScheduleGroup(a)2@AEAVlocation(a)2@@Z */ /*ScheduleGroup*/void* __cdecl CurrentScheduler_CreateScheduleGroup_loc(/*location*/void *placement) { - FIXME("(%p) stub\n", placement); - return NULL; + TRACE("(%p)\n", placement); + return call_Scheduler_CreateScheduleGroup_loc(get_current_scheduler(), placement); } +#endif /* ?CreateScheduleGroup(a)CurrentScheduler@Concurrency@@SAPAVScheduleGroup(a)2@XZ */ /* ?CreateScheduleGroup(a)CurrentScheduler@Concurrency@@SAPEAVScheduleGroup(a)2@XZ */ /*ScheduleGroup*/void* __cdecl CurrentScheduler_CreateScheduleGroup(void) { - FIXME("() stub\n"); - return NULL; + TRACE("()\n"); + return call_Scheduler_CreateScheduleGroup(get_current_scheduler()); } /* ?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ */ unsigned int __cdecl CurrentScheduler_GetNumberOfVirtualProcessors(void) { Scheduler *scheduler = try_get_current_scheduler(); + TRACE("()\n"); + if(!scheduler) return -1; return call_Scheduler_GetNumberOfVirtualProcessors(scheduler); @@ -911,50 +940,62 @@ unsigned int __cdecl CurrentScheduler_GetNumberOfVirtualProcessors(void) /* ?GetPolicy(a)CurrentScheduler@Concurrency@@SA?AVSchedulerPolicy(a)2@XZ */ SchedulerPolicy* __cdecl CurrentScheduler_GetPolicy(SchedulerPolicy *policy) { - FIXME("(%p) stub\n", policy); - return NULL; + TRACE("(%p)\n", policy); + return call_Scheduler_GetPolicy(get_current_scheduler(), policy); } /* ?Id(a)CurrentScheduler@Concurrency@@SAIXZ */ unsigned int __cdecl CurrentScheduler_Id(void) { - Context *context = try_get_current_context(); + Scheduler *scheduler = try_get_current_scheduler(); TRACE("()\n"); - if(!context) + if(!scheduler) return -1; - return call_Scheduler_Id(CurrentScheduler_Get()); + return call_Scheduler_Id(scheduler); } +#if _MSVCR_VER > 100 /* ?IsAvailableLocation(a)CurrentScheduler@Concurrency@@SA_NABVlocation(a)2@@Z */ /* ?IsAvailableLocation(a)CurrentScheduler@Concurrency@@SA_NAEBVlocation(a)2@@Z */ MSVCRT_bool __cdecl CurrentScheduler_IsAvailableLocation(const /*location*/void *placement) { - FIXME("(%p) stub\n", placement); - return 0; + Scheduler *scheduler = try_get_current_scheduler(); + + TRACE("(%p)\n", placement); + + if(!scheduler) + return FALSE; + return call_Scheduler_IsAvailableLocation(scheduler, placement); } +#endif /* ?RegisterShutdownEvent(a)CurrentScheduler@Concurrency@@SAXPAX(a)Z */ /* ?RegisterShutdownEvent(a)CurrentScheduler@Concurrency@@SAXPEAX(a)Z */ void __cdecl CurrentScheduler_RegisterShutdownEvent(HANDLE event) { - FIXME("(%p) stub\n", event); + TRACE("(%p)\n", event); + call_Scheduler_RegisterShutdownEvent(get_current_scheduler(), event); } +#if _MSVCR_VER > 100 /* ?ScheduleTask(a)CurrentScheduler@Concurrency@@SAXP6AXPAX(a)Z0AAVlocation@2@@Z */ /* ?ScheduleTask(a)CurrentScheduler@Concurrency@@SAXP6AXPEAX(a)Z0AEAVlocation@2@@Z */ void __cdecl CurrentScheduler_ScheduleTask_loc(void (__cdecl *proc)(void*), void *data, /*location*/void *placement) { - FIXME("(%p %p %p) stub\n", proc, data, placement); + TRACE("(%p %p %p)\n", proc, data, placement); + call_Scheduler_ScheduleTask_loc(get_current_scheduler(), proc, data, placement); } +#endif /* ?ScheduleTask(a)CurrentScheduler@Concurrency@@SAXP6AXPAX(a)Z0@Z */ /* ?ScheduleTask(a)CurrentScheduler@Concurrency@@SAXP6AXPEAX(a)Z0@Z */ void __cdecl CurrentScheduler_ScheduleTask(void (__cdecl *proc)(void*), void *data) { - FIXME("(%p %p) stub\n", proc, data); + TRACE("(%p %p)\n", proc, data); + call_Scheduler_ScheduleTask(get_current_scheduler(), proc, data); } extern const vtable_ptr MSVCRT_type_info_vtable;

1 0

Hugh McMaster : regedit: Skip any leading spaces and tabs that may be present in the line being parsed.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: aacae1960299875160f1552b45bc3e3c3e2527a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aacae1960299875160f1552b4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 3 12:02:14 2017 +0000 regedit: Skip any leading spaces and tabs that may be present in the line being parsed. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 ++ programs/regedit/tests/regedit.c | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 5610c87..e0049c6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -748,6 +748,7 @@ static char *get_lineA(FILE *fp) next = line; continue; } + while (*line == ' ' || *line == '\t') line++; if (*line == ';' || *line == '#') { line = next; @@ -859,6 +860,7 @@ static WCHAR *get_lineW(FILE *fp) next = line; continue; } + while (*line == ' ' || *line == '\t') line++; if (*line == ';' || *line == '#') { line = next; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 354ddac..bbe5c4b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -673,32 +673,32 @@ static void test_import_with_whitespace(void) exec_import_str("REGEDIT4\n\n" " [HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine2a\"=\"Value\"\n\n"); - todo_wine verify_reg(hkey, "Wine2a", REG_SZ, "Value", 6, 0); + verify_reg(hkey, "Wine2a", REG_SZ, "Value", 6, 0); exec_import_str("REGEDIT4\n\n" "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine2b\"=\"Value\"\n\n"); - todo_wine verify_reg(hkey, "Wine2b", REG_SZ, "Value", 6, 0); + verify_reg(hkey, "Wine2b", REG_SZ, "Value", 6, 0); exec_import_str("REGEDIT4\n\n" " \t [HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine2c\"=\"Value\"\n\n"); - todo_wine verify_reg(hkey, "Wine2c", REG_SZ, "Value", 6, 0); + verify_reg(hkey, "Wine2c", REG_SZ, "Value", 6, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" " \"Wine3a\"=\"Two leading spaces\"\n\n"); - todo_wine verify_reg(hkey, "Wine3a", REG_SZ, "Two leading spaces", 19, 0); + verify_reg(hkey, "Wine3a", REG_SZ, "Two leading spaces", 19, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\t\"Wine3b\"=\"One leading tab\"\n\n"); - todo_wine verify_reg(hkey, "Wine3b", REG_SZ, "One leading tab", 16, 0); + verify_reg(hkey, "Wine3b", REG_SZ, "One leading tab", 16, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" " \t \"Wine3c\"=\"Space, tab, space\"\n\n"); - todo_wine verify_reg(hkey, "Wine3c", REG_SZ, "Space, tab, space", 18, 0); + verify_reg(hkey, "Wine3c", REG_SZ, "Space, tab, space", 18, 0); exec_import_str(" REGEDIT4\n\n" "\t\t\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -708,9 +708,9 @@ static void test_import_with_whitespace(void) " 63,6f,6e,\\;comment\n" "\t\t\t\t63,61,74,\\;comment\n" " \t65,6e,61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Wine4a", REG_SZ, "Tab and four spaces", 20, 0); + verify_reg(hkey, "Wine4a", REG_SZ, "Tab and four spaces", 20, 0); dword = 0x112233; - todo_wine verify_reg(hkey, "Wine4b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine4b", REG_DWORD, &dword, sizeof(dword), 0); todo_wine verify_reg(hkey, "Wine4c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); exec_import_str(" REGEDIT4\n\n" @@ -719,10 +719,10 @@ static void test_import_with_whitespace(void) "\t\t\"Wine5b\"\t\t=\"Leading tabs\"\n" "\t \"Wine5c\"=\t \"Tabs and spaces\"\n" " \"Wine5d\" \t = \t \"More whitespace\"\n\n"); - todo_wine verify_reg(hkey, "Wine5a", REG_SZ, "Leading spaces", 15, 0); - todo_wine verify_reg(hkey, "Wine5b", REG_SZ, "Leading tabs", 13, 0); - todo_wine verify_reg(hkey, "Wine5c", REG_SZ, "Tabs and spaces", 16, 0); - todo_wine verify_reg(hkey, "Wine5d", REG_SZ, "More whitespace", 16, 0); + verify_reg(hkey, "Wine5a", REG_SZ, "Leading spaces", 15, 0); + verify_reg(hkey, "Wine5b", REG_SZ, "Leading tabs", 13, 0); + verify_reg(hkey, "Wine5c", REG_SZ, "Tabs and spaces", 16, 0); + verify_reg(hkey, "Wine5d", REG_SZ, "More whitespace", 16, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -731,7 +731,7 @@ static void test_import_with_whitespace(void) " \" Wine6c \" = \" Spaces everywhere \" \n\n"); verify_reg(hkey, " Wine6a", REG_SZ, "Leading spaces", 15, 0); verify_reg(hkey, "\t\tWine6b", REG_SZ, "Leading tabs", 13, 0); - todo_wine verify_reg(hkey, " Wine6c ", REG_SZ, " Spaces everywhere ", 22, 0); + verify_reg(hkey, " Wine6c ", REG_SZ, " Spaces everywhere ", 22, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Daniel Lehman : msvcp140: Add __crtFlushProcessWriteBuffers.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: d22569e83c166eedd99dabf0f8b00935575eb3b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22569e83c166eedd99dabf0f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 16:04:32 2017 -0700 msvcp140: Add __crtFlushProcessWriteBuffers. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 8 ++++++++ include/winbase.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 15b558df..14e0fa1 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3762,7 +3762,7 @@ @ stub __crtCreateSymbolicLinkW @ cdecl __crtCreateThreadpoolTimer(ptr ptr ptr) MSVCP__crtCreateThreadpoolTimer @ cdecl __crtCreateThreadpoolWait(ptr ptr ptr) MSVCP__crtCreateThreadpoolWait -@ stub __crtFlushProcessWriteBuffers +@ cdecl __crtFlushProcessWriteBuffers() MSVCP__crtFlushProcessWriteBuffers @ cdecl __crtFreeLibraryWhenCallbackReturns(ptr ptr) MSVCP__crtFreeLibraryWhenCallbackReturns @ cdecl __crtGetCurrentProcessorNumber() MSVCP__crtGetCurrentProcessorNumber @ stub __crtGetFileInformationByHandleEx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 7d9c408..9f3724a 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1263,6 +1263,14 @@ DWORD CDECL MSVCP__crtGetCurrentProcessorNumber(void) } /********************************************************************* + * __crtFlushProcessWriteBuffers (MSVCP140.@) + */ +VOID CDECL MSVCP__crtFlushProcessWriteBuffers(void) +{ + return FlushProcessWriteBuffers(); +} + +/********************************************************************* * __crtCreateSemaphoreExW (MSVCP140.@) */ HANDLE CDECL MSVCP__crtCreateSemaphoreExW( diff --git a/include/winbase.h b/include/winbase.h index b7f86a2..67c29b5 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1985,6 +1985,7 @@ WINBASEAPI PVOID WINAPI FlsGetValue(DWORD); WINBASEAPI BOOL WINAPI FlsSetValue(DWORD,PVOID); WINBASEAPI BOOL WINAPI FlushFileBuffers(HANDLE); WINBASEAPI BOOL WINAPI FlushInstructionCache(HANDLE,LPCVOID,SIZE_T); +WINBASEAPI VOID WINAPI FlushProcessWriteBuffers(void); WINBASEAPI BOOL WINAPI FlushViewOfFile(LPCVOID,SIZE_T); WINBASEAPI DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,__ms_va_list*); WINBASEAPI DWORD WINAPI FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,DWORD,__ms_va_list*);

1 0

Matteo Bruni : d3dx9: Dump preshader immediates table.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: b1cea9b1003d8129a6a357432d17f1e9b633f373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1cea9b1003d8129a6a357432… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 3 17:26:16 2017 +0200 d3dx9: Dump preshader immediates table. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 9aedc99..b3481f8 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -599,7 +599,7 @@ static void dump_ins(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins) { unsigned int i; - TRACE(" %s ", pres_op_info[ins->op].mnem); + TRACE("%s ", pres_op_info[ins->op].mnem); dump_arg(rs, &ins->output, pres_op_info[ins->op].func_all_comps ? 1 : ins->component_count); for (i = 0; i < pres_op_info[ins->op].input_count; ++i) { @@ -611,11 +611,24 @@ static void dump_ins(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins) static void dump_preshader(struct d3dx_preshader *pres) { - unsigned int i; + unsigned int i, immediate_count = pres->regs.table_sizes[PRES_REGTAB_IMMED]; + const double *immediates = pres->regs.tables[PRES_REGTAB_IMMED]; + if (immediate_count) + TRACE("// Immediates:\n"); + for (i = 0; i < immediate_count; ++i) + { + if (!(i % 4)) + TRACE("// "); + TRACE("%.8e", immediates[i]); + if (i % 4 == 3) + TRACE("\n"); + else + TRACE(", "); + } TRACE("// Preshader registers:\n"); dump_registers(&pres->inputs); - TRACE(" preshader\n"); + TRACE("preshader\n"); for (i = 0; i < pres->ins_count; ++i) dump_ins(&pres->regs, &pres->ins[i]); }

1 0

Piotr Caban : msvcrt: Improve CurrentScheduler::Get implementation.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 6ad1e9a95414534694f66a7fd751e91ab9c18a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad1e9a95414534694f66a7fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 15:05:49 2017 +0200 msvcrt: Improve CurrentScheduler::Get implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index ff5cf6f..b405f39 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -196,6 +196,17 @@ static Scheduler* try_get_current_scheduler(void) return context->scheduler.scheduler; } +static Scheduler* get_current_scheduler(void) +{ + ExternalContextBase *context = (ExternalContextBase*)get_current_context(); + + if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { + ERR("unknown context set\n"); + return NULL; + } + return context->scheduler.scheduler; +} + /* ?CurrentContext(a)Context@Concurrency@@SAPAV12(a)XZ */ /* ?CurrentContext(a)Context@Concurrency@@SAPEAV12(a)XZ */ Context* __cdecl Context_CurrentContext(void) @@ -867,22 +878,8 @@ static void create_default_scheduler(void) /* ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ */ Scheduler* __cdecl CurrentScheduler_Get(void) { - ExternalContextBase *context = (ExternalContextBase*)get_current_context(); - TRACE("()\n"); - - if(context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { - ERR("unknown context set\n"); - return NULL; - } - - if(context->scheduler.scheduler) - return context->scheduler.scheduler; - - create_default_scheduler(); - context->scheduler.scheduler = &default_scheduler->scheduler; - call_Scheduler_Reference(&default_scheduler->scheduler); - return &default_scheduler->scheduler; + return get_current_scheduler(); } /* ?CreateScheduleGroup(a)CurrentScheduler@Concurrency@@SAPAVScheduleGroup(a)2@AAVlocation(a)2@@Z */

1 0

Huw Davies : wbemdisp: Implement ISWbemPropertySet::Item.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 6721725689e5b7ae05ef501a90b56181c5d12e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6721725689e5b7ae05ef501a9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 3 09:57:32 2017 +0100 wbemdisp: Implement ISWbemPropertySet::Item. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 213 ++++++++++++++++++++++++++++++++++++++++- dlls/wbemdisp/tests/wbemdisp.c | 16 +++- 2 files changed, 225 insertions(+), 4 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 4abb80e..570de5a 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -43,6 +43,7 @@ enum type_id ISWbemLocator_tid, ISWbemObject_tid, ISWbemObjectSet_tid, + ISWbemProperty_tid, ISWbemPropertySet_tid, ISWbemServices_tid, last_tid @@ -56,6 +57,7 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemLocator, &IID_ISWbemObject, &IID_ISWbemObjectSet, + &IID_ISWbemProperty, &IID_ISWbemPropertySet, &IID_ISWbemServices }; @@ -95,6 +97,202 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) return S_OK; } +struct property +{ + ISWbemProperty ISWbemProperty_iface; + LONG refs; + IWbemClassObject *object; + BSTR name; +}; + +static inline struct property *impl_from_ISWbemProperty( ISWbemProperty *iface ) +{ + return CONTAINING_RECORD( iface, struct property, ISWbemProperty_iface ); +} + +static ULONG WINAPI property_AddRef( ISWbemProperty *iface ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + return InterlockedIncrement( &property->refs ); +} + +static ULONG WINAPI property_Release( ISWbemProperty *iface ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + LONG refs = InterlockedDecrement( &property->refs ); + if (!refs) + { + TRACE( "destroying %p\n", property ); + IWbemClassObject_Release( property->object ); + SysFreeString( property->name ); + heap_free( property ); + } + return refs; +} + +static HRESULT WINAPI property_QueryInterface( ISWbemProperty *iface, REFIID riid, void **obj ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + + TRACE( "%p %s %p\n", property, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID_ISWbemProperty ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemProperty_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI property_GetTypeInfoCount( ISWbemProperty *iface, UINT *count ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + TRACE( "%p, %p\n", property, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI property_GetTypeInfo( ISWbemProperty *iface, UINT index, + LCID lcid, ITypeInfo **info ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + TRACE( "%p, %u, %u, %p\n", property, index, lcid, info ); + + return get_typeinfo( ISWbemProperty_tid, info ); +} + +static HRESULT WINAPI property_GetIDsOfNames( ISWbemProperty *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", property, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemProperty_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI property_Invoke( ISWbemProperty *iface, DISPID member, REFIID riid, + LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + struct property *property = impl_from_ISWbemProperty( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", property, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemProperty_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &property->ISWbemProperty_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI property_get_Value( ISWbemProperty *iface, VARIANT *varValue ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_put_Value( ISWbemProperty *iface, VARIANT *varValue ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_get_Name( ISWbemProperty *iface, BSTR *strName ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_get_IsLocal( ISWbemProperty *iface, VARIANT_BOOL *bIsLocal ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_get_Origin( ISWbemProperty *iface, BSTR *strOrigin ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_get_CIMType( ISWbemProperty *iface, WbemCimtypeEnum *iCimType ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_get_Qualifiers_( ISWbemProperty *iface, ISWbemQualifierSet **objWbemQualifierSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI property_get_IsArray( ISWbemProperty *iface, VARIANT_BOOL *bIsArray ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const ISWbemPropertyVtbl property_vtbl = +{ + property_QueryInterface, + property_AddRef, + property_Release, + property_GetTypeInfoCount, + property_GetTypeInfo, + property_GetIDsOfNames, + property_Invoke, + property_get_Value, + property_put_Value, + property_get_Name, + property_get_IsLocal, + property_get_Origin, + property_get_CIMType, + property_get_Qualifiers_, + property_get_IsArray +}; + +static HRESULT SWbemProperty_create( IWbemClassObject *wbem_object, BSTR name, ISWbemProperty **obj ) +{ + struct property *property; + + TRACE( "%p, %p\n", obj, wbem_object ); + + if (!(property = heap_alloc( sizeof(*property) ))) return E_OUTOFMEMORY; + property->ISWbemProperty_iface.lpVtbl = &property_vtbl; + property->refs = 1; + property->object = wbem_object; + IWbemClassObject_AddRef( property->object ); + property->name = SysAllocStringLen( name, SysStringLen( name ) ); + *obj = &property->ISWbemProperty_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + struct propertyset { ISWbemPropertySet ISWbemPropertySet_iface; @@ -216,8 +414,19 @@ static HRESULT WINAPI propertyset_get__NewEnum( ISWbemPropertySet *iface, IUnkno static HRESULT WINAPI propertyset_Item( ISWbemPropertySet *iface, BSTR name, LONG flags, ISWbemProperty **prop ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + HRESULT hr; + VARIANT var; + + TRACE( "%p, %s, %08x, %p", propertyset, debugstr_w(name), flags, prop ); + + hr = IWbemClassObject_Get( propertyset->object, name, 0, &var, NULL, NULL ); + if (SUCCEEDED(hr)) + { + hr = SWbemProperty_create( propertyset->object, name, prop ); + VariantClear( &var ); + } + return hr; } static HRESULT WINAPI propertyset_get_Count( ISWbemPropertySet *iface, LONG *count ) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index f88ed1a..bfc81f9 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "objidl.h" #include "wbemdisp.h" +#include "wbemcli.h" #include "wine/test.h" DEFINE_GUID(CLSID_WINMGMTS,0x172bddf8,0xceea,0x11d1,0x8b,0x05,0x00,0x60,0x08,0x06,0xd9,0xb6); @@ -250,18 +251,20 @@ static const WCHAR query[] = {'S','e','l','e','c','t',' ','P','r','o','c','e','s ' ','W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR lang[] = {'W','Q','L',0}; static const WCHAR props[] = {'P','r','o','p','e','r','t','i','e','s','_',0}; +static const WCHAR procid[] = {'P','r','o','c','e','s','s','o','r','I','d',0}; static void test_locator(void) { HRESULT hr; DISPID id; - BSTR host_bstr, root_bstr, query_bstr, lang_bstr, props_bstr; + BSTR host_bstr, root_bstr, query_bstr, lang_bstr, props_bstr, procid_bstr; ISWbemLocator *locator; ISWbemServices *services; ISWbemObjectSet *object_set; IEnumVARIANT *enum_var; ISWbemObject *object; ISWbemPropertySet *prop_set; + ISWbemProperty *prop; VARIANT var; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); @@ -293,7 +296,6 @@ static void test_locator(void) hr = IDispatch_GetIDsOfNames( V_DISPATCH(&var), &IID_NULL, &props_bstr, 1, english, &id ); ok( hr == S_OK, "got %x\n", hr ); ok( id == 21, "got %d\n", id ); - SysFreeString( props_bstr ); hr = IDispatch_QueryInterface( V_DISPATCH(&var), &IID_ISWbemObject, (void**)&object ); ok( hr == S_OK, "got %x\n", hr ); @@ -302,6 +304,16 @@ static void test_locator(void) hr = ISWbemObject_get_Properties_( object, &prop_set ); ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemPropertySet_Item( prop_set, props_bstr, 0, &prop ); + ok( hr == WBEM_E_NOT_FOUND, "got %x\n", hr ); + SysFreeString( props_bstr ); + + procid_bstr = SysAllocString( procid ); + hr = ISWbemPropertySet_Item( prop_set, procid_bstr, 0, &prop ); + ok( hr == S_OK, "got %x\n", hr ); + SysFreeString( procid_bstr ); + + ISWbemProperty_Release( prop ); ISWbemPropertySet_Release( prop_set ); ISWbemObject_Release( object ); IEnumVARIANT_Release( enum_var );

1 0