October 2013 - Wine-commits

Nikolay Sivov : ole32: Support activation context in CLSIDFromProgID().
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 0af3bd8365c9b975261a9cd9ddb23b7f791bc095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0af3bd8365c9b975261a9cd9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 24 22:49:20 2013 +0400 ole32: Support activation context in CLSIDFromProgID(). --- dlls/ole32/compobj.c | 19 +++++++++++++++++++ dlls/ole32/tests/compobj.c | 10 +++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4d791f4..8f3f303 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -135,6 +135,13 @@ struct ifacepsredirect_data ULONG name_offset; }; +struct progidredirect_data +{ + ULONG size; + DWORD reserved; + ULONG clsid_offset; +}; + struct class_reg_data { union @@ -2331,12 +2338,24 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) */ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) { + ACTCTX_SECTION_KEYED_DATA data; + if (!progid || !clsid) { ERR("neither progid (%p) nor clsid (%p) are optional\n", progid, clsid); return E_INVALIDARG; } + data.cbSize = sizeof(data); + if (FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION, + progid, &data)) + { + struct progidredirect_data *progiddata = (struct progidredirect_data*)data.lpData; + CLSID *alias = (CLSID*)((BYTE*)data.lpSectionBase + progiddata->clsid_offset); + *clsid = *alias; + return S_OK; + } + return clsid_from_string_reg(progid, clsid); } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 81f099c..3deedf3 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -379,12 +379,9 @@ static void test_CLSIDFromProgID(void) clsid = CLSID_NULL; hr = CLSIDFromProgID(progidW, &clsid); -todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - /* it returns generated CLSID here */ - ok(!IsEqualCLSID(&clsid, &CLSID_non_existent) && !IsEqualCLSID(&clsid, &CLSID_NULL), - "got wrong clsid %s\n", debugstr_guid(&clsid)); + /* it returns generated CLSID here */ + ok(!IsEqualCLSID(&clsid, &CLSID_non_existent) && !IsEqualCLSID(&clsid, &CLSID_NULL), + "got wrong clsid %s\n", debugstr_guid(&clsid)); /* duplicate progid present in context - returns generated guid here too */ clsid = CLSID_NULL; @@ -393,7 +390,6 @@ todo_wine clsid1 = CLSID_StdFont; /* that's where it differs from StdFont */ clsid1.Data4[7] = 0x52; -todo_wine ok(!IsEqualCLSID(&clsid, &CLSID_StdFont) && !IsEqualCLSID(&clsid, &CLSID_NULL) && !IsEqualCLSID(&clsid, &clsid1), "got %s\n", debugstr_guid(&clsid));

1 0

Vincent Povirk : mscoree: Remove support for multiple Mono ABI versions.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 6b889fe9188a97765bcbcc2cae5ca2480a73e7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b889fe9188a97765bcbcc2ca… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 24 14:34:24 2013 -0500 mscoree: Remove support for multiple Mono ABI versions. Having two instances of Mono loaded at once is problematic, and now that we use the 2.0 runtime to support 1.x there's no need to support old versions. --- dlls/mscoree/corruntimehost.c | 88 ++++++------- dlls/mscoree/metahost.c | 280 +++++++++++++++++----------------------- dlls/mscoree/mscoree_private.h | 72 ++++------- 3 files changed, 183 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b889fe9188a97765bcbc…

1 0

Vincent Povirk : mscoree: Do a "normal" runtime shutdown from _CorExeMain.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 770918a91b3c804d6427c936562e4136ba931e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770918a91b3c804d6427c9365… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 24 15:17:24 2013 -0500 mscoree: Do a "normal" runtime shutdown from _CorExeMain. This needs to work differently from CorExitProcess because we need to wait for foreground threads and abort the rest. --- dlls/mscoree/corruntimehost.c | 8 ++++++-- dlls/mscoree/metahost.c | 4 ++++ dlls/mscoree/mscoree_private.h | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index c37651a..4ae85b9 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1034,7 +1034,7 @@ __int32 WINAPI _CorExeMain(void) int exit_code; int argc; char **argv; - MonoDomain *domain; + MonoDomain *domain=NULL; MonoImage *image; MonoImageOpenStatus status; MonoAssembly *assembly=NULL; @@ -1101,7 +1101,11 @@ __int32 WINAPI _CorExeMain(void) HeapFree(GetProcessHeap(), 0, argv); - unload_all_runtimes(); + if (domain) + { + mono_thread_manage(); + mono_jit_cleanup(domain); + } return exit_code; } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index ae0e123..de1d004 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -88,6 +88,7 @@ static void (CDECL *mono_free)(void *); static MonoImage* (CDECL *mono_image_open)(const char *fname, MonoImageOpenStatus *status); MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); static void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); +void (CDECL *mono_jit_cleanup)(MonoDomain *domain); int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); MonoDomain* (CDECL *mono_jit_init)(const char *file); static int (CDECL *mono_jit_set_trace_options)(const char* options); @@ -106,6 +107,7 @@ static void (CDECL *mono_set_verbose_level)(DWORD level); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); +void (CDECL *mono_thread_manage)(void); static void (CDECL *mono_thread_pool_cleanup)(void); static void (CDECL *mono_thread_suspend_all_other_threads)(void); static void (CDECL *mono_threads_set_shutting_down)(void); @@ -204,6 +206,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This) LOAD_MONO_FUNCTION(mono_free); LOAD_MONO_FUNCTION(mono_image_open); LOAD_MONO_FUNCTION(mono_install_assembly_preload_hook); + LOAD_MONO_FUNCTION(mono_jit_cleanup); LOAD_MONO_FUNCTION(mono_jit_exec); LOAD_MONO_FUNCTION(mono_jit_init); LOAD_MONO_FUNCTION(mono_jit_set_trace_options); @@ -221,6 +224,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This) LOAD_MONO_FUNCTION(mono_stringify_assembly_name); LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); + LOAD_MONO_FUNCTION(mono_thread_manage); LOAD_MONO_FUNCTION(mono_trace_set_assembly); #undef LOAD_MONO_FUNCTION diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 58a5088..2a6d32e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -145,6 +145,7 @@ extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); extern MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); extern MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count); extern MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name); +extern void (CDECL *mono_jit_cleanup)(MonoDomain *domain); extern int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); extern MonoDomain* (CDECL *mono_jit_init)(const char *file); extern MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); @@ -157,6 +158,7 @@ extern MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, v extern void (CDECL *mono_runtime_object_init)(MonoObject *this_obj); extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); +extern void (CDECL *mono_thread_manage)(void); extern void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); /* loaded runtime interfaces */

1 0

Vincent Povirk : mscoree: Call Mono's System.Environment. Exit instead of duplicating it.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 5e81bad2395b17c7f4d3697ceb76f363ef38a940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e81bad2395b17c7f4d3697ce… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 24 16:01:11 2013 -0500 mscoree: Call Mono's System.Environment.Exit instead of duplicating it. --- dlls/mscoree/corruntimehost.c | 54 +++++++++++++++++++++++++++++++++++++++ dlls/mscoree/metahost.c | 55 ++++++++++----------------------------- dlls/mscoree/mscoree_main.c | 3 +- dlls/mscoree/mscoree_private.h | 6 +++- 4 files changed, 73 insertions(+), 45 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 4ae85b9..5cea669 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -214,6 +214,60 @@ static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *d return hr; } +void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) +{ + HRESULT hr; + void *args[2]; + MonoDomain *domain; + MonoAssembly *assembly; + MonoImage *image; + MonoClass *klass; + MonoMethod *method; + + hr = RuntimeHost_GetDefaultDomain(This, &domain); + if (FAILED(hr)) + { + ERR("Cannot get domain, hr=%x\n", hr); + return; + } + + mono_thread_attach(domain); + + assembly = mono_domain_assembly_open(domain, "mscorlib"); + if (!assembly) + { + ERR("Cannot load mscorlib\n"); + return; + } + + image = mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image\n"); + return; + } + + klass = mono_class_from_name(image, "System", "Environment"); + if (!klass) + { + ERR("Couldn't get class from image\n"); + return; + } + + method = mono_class_get_method_from_name(klass, "Exit", 0); + if (!method) + { + ERR("Couldn't get method from class\n"); + return; + } + + args[0] = &exitcode; + args[1] = NULL; + mono_runtime_invoke(method, NULL, args, NULL); + + ERR("Process should have exited\n"); +} + static inline RuntimeHost *impl_from_ICLRRuntimeHost( ICLRRuntimeHost *iface ) { return CONTAINING_RECORD(iface, RuntimeHost, ICLRRuntimeHost_iface); diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index de1d004..4264f3a 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -100,17 +100,12 @@ static void (CDECL *mono_profiler_install)(MonoProfiler *prof, MonoProfileFunc s MonoType* (CDECL *mono_reflection_type_from_name)(char *name, MonoImage *image); MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc); void (CDECL *mono_runtime_object_init)(MonoObject *this_obj); -static void (CDECL *mono_runtime_quit)(void); -static void (CDECL *mono_runtime_set_shutting_down)(void); static void (CDECL *mono_set_dirs)(const char *assembly_dir, const char *config_dir); static void (CDECL *mono_set_verbose_level)(DWORD level); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); -static void (CDECL *mono_thread_pool_cleanup)(void); -static void (CDECL *mono_thread_suspend_all_other_threads)(void); -static void (CDECL *mono_threads_set_shutting_down)(void); void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); @@ -134,10 +129,6 @@ static void set_environment(LPCWSTR bin_path) SetEnvironmentVariableW(pathW, path_env); } -static void CDECL do_nothing(void) -{ -} - static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) { @@ -218,7 +209,6 @@ static HRESULT load_mono(CLRRuntimeInfo *This) LOAD_MONO_FUNCTION(mono_reflection_type_from_name); LOAD_MONO_FUNCTION(mono_runtime_invoke); LOAD_MONO_FUNCTION(mono_runtime_object_init); - LOAD_MONO_FUNCTION(mono_runtime_quit); LOAD_MONO_FUNCTION(mono_set_dirs); LOAD_MONO_FUNCTION(mono_set_verbose_level); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); @@ -237,10 +227,6 @@ static HRESULT load_mono(CLRRuntimeInfo *This) } while (0); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); - LOAD_OPT_MONO_FUNCTION(mono_runtime_set_shutting_down, do_nothing); - LOAD_OPT_MONO_FUNCTION(mono_thread_pool_cleanup, do_nothing); - LOAD_OPT_MONO_FUNCTION(mono_thread_suspend_all_other_threads, do_nothing); - LOAD_OPT_MONO_FUNCTION(mono_threads_set_shutting_down, do_nothing); #undef LOAD_OPT_MONO_FUNCTION @@ -306,31 +292,6 @@ static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost * return hr; } -void unload_all_runtimes(void) -{ - int i; - HMODULE handle; - - /* If the only references to mscoree are through dll's that were loaded by - * Mono, shutting down the Mono runtime will free mscoree, so take a - * reference to prevent that from happening. */ - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)unload_all_runtimes, &handle); - - if (mono_handle && is_mono_started && !is_mono_shutdown) - { - /* Copied from Mono's ves_icall_System_Environment_Exit */ - mono_threads_set_shutting_down(); - mono_runtime_set_shutting_down(); - mono_thread_pool_cleanup(); - mono_thread_suspend_all_other_threads(); - mono_runtime_quit(); - } - - for (i=0; i<NUM_RUNTIMES; i++) - if (runtimes[i].loaded_runtime) - RuntimeHost_Destroy(runtimes[i].loaded_runtime); -} - void expect_no_runtimes(void) { if (mono_handle && is_mono_started && !is_mono_shutdown) @@ -1147,9 +1108,21 @@ static HRESULT WINAPI CLRMetaHost_QueryLegacyV2RuntimeBinding(ICLRMetaHost* ifac return E_NOTIMPL; } -static HRESULT WINAPI CLRMetaHost_ExitProcess(ICLRMetaHost* iface, INT32 iExitCode) +HRESULT WINAPI CLRMetaHost_ExitProcess(ICLRMetaHost* iface, INT32 iExitCode) { - FIXME("%i: stub\n", iExitCode); + TRACE("%i\n", iExitCode); + + EnterCriticalSection(&runtime_list_cs); + + if (is_mono_started && !is_mono_shutdown) + { + /* search for a runtime and call System.Environment.Exit() */ + int i; + + for (i=0; i<NUM_RUNTIMES; i++) + if (runtimes[i].loaded_runtime) + RuntimeHost_ExitProcess(runtimes[i].loaded_runtime, iExitCode); + } ExitProcess(iExitCode); } diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 2ca0ce7..7b655b9 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -249,8 +249,7 @@ __int32 WINAPI _CorExeMain2(PBYTE ptrMemory, DWORD cntMemory, LPWSTR imageName, void WINAPI CorExitProcess(int exitCode) { TRACE("(%x)\n", exitCode); - unload_all_runtimes(); - ExitProcess(exitCode); + CLRMetaHost_ExitProcess(0, exitCode); } VOID WINAPI _CorImageUnloading(PVOID imageBase) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 2a6d32e..820d081 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -162,12 +162,12 @@ extern void (CDECL *mono_thread_manage)(void); extern void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); /* loaded runtime interfaces */ -extern void unload_all_runtimes(void) DECLSPEC_HIDDEN; - extern void expect_no_runtimes(void) DECLSPEC_HIDDEN; extern HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, RuntimeHost** result) DECLSPEC_HIDDEN; +extern void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) DECLSPEC_HIDDEN; + extern HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, IUnknown **ppUnk) DECLSPEC_HIDDEN; @@ -177,6 +177,8 @@ extern HRESULT RuntimeHost_CreateManagedInstance(RuntimeHost *This, LPCWSTR name extern HRESULT RuntimeHost_Destroy(RuntimeHost *This) DECLSPEC_HIDDEN; +HRESULT WINAPI CLRMetaHost_ExitProcess(ICLRMetaHost* iface, INT32 iExitCode) DECLSPEC_HIDDEN; + HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, LPCWSTR pwzVersion, REFIID iid, LPVOID *ppRuntime) DECLSPEC_HIDDEN; extern HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winetest: Disable caching for php files.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: tools Branch: master Commit: 755172c04c2eb2b128796860df5a079aeaeb54c2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=755172c04c2eb2b128796860… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 25 12:35:47 2013 +0200 winetest: Disable caching for php files. --- winetest/tests/.htaccess | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess index f6c2d00..3189dbd 100644 --- a/winetest/tests/.htaccess +++ b/winetest/tests/.htaccess @@ -8,3 +8,13 @@ SetEnv no-gzip dont-vary Options ExecCGI SetHandler cgi-script </Files> + +<FilesMatch "\.php$"> +FileETag None +<ifModule mod_headers.c> +Header unset ETag +Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" +Header set Pragma "no-cache" +Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" +</ifModule> +</FilesMatch>

1 0

Vincent Povirk : gdiplus: Implement GdipWidenPath for custom dashed lines.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 1c35dd6cb422c575a5cbfb3d2dd402a1cd9a1f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c35dd6cb422c575a5cbfb3d2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 23 13:05:50 2013 -0500 gdiplus: Implement GdipWidenPath for custom dashed lines. --- dlls/gdiplus/graphicspath.c | 142 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 127 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 62f8490..8fa3cc0 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1851,8 +1851,9 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, } } -static void widen_open_figure(GpPath *path, GpPen *pen, int start, int end, - path_list_node_t **last_point) +static void widen_open_figure(const GpPointF *points, GpPen *pen, int start, int end, + GpLineCap start_cap, GpCustomLineCap *start_custom, GpLineCap end_cap, + GpCustomLineCap *end_custom, path_list_node_t **last_point) { int i; path_list_node_t *prev_point; @@ -1862,22 +1863,22 @@ static void widen_open_figure(GpPath *path, GpPen *pen, int start, int end, prev_point = *last_point; - widen_cap(&path->pathdata.Points[start], &path->pathdata.Points[start+1], - pen, pen->startcap, pen->customstart, FALSE, TRUE, last_point); + widen_cap(&points[start], &points[start+1], + pen, start_cap, start_custom, FALSE, TRUE, last_point); for (i=start+1; i<end; i++) - widen_joint(&path->pathdata.Points[i-1], &path->pathdata.Points[i], - &path->pathdata.Points[i+1], pen, last_point); + widen_joint(&points[i-1], &points[i], + &points[i+1], pen, last_point); - widen_cap(&path->pathdata.Points[end], &path->pathdata.Points[end-1], - pen, pen->endcap, pen->customend, TRUE, TRUE, last_point); + widen_cap(&points[end], &points[end-1], + pen, end_cap, end_custom, TRUE, TRUE, last_point); for (i=end-1; i>start; i--) - widen_joint(&path->pathdata.Points[i+1], &path->pathdata.Points[i], - &path->pathdata.Points[i-1], pen, last_point); + widen_joint(&points[i+1], &points[i], + &points[i-1], pen, last_point); - widen_cap(&path->pathdata.Points[start], &path->pathdata.Points[start+1], - pen, pen->startcap, pen->customstart, TRUE, FALSE, last_point); + widen_cap(&points[start], &points[start+1], + pen, start_cap, start_custom, TRUE, FALSE, last_point); prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; @@ -1925,6 +1926,111 @@ static void widen_closed_figure(GpPath *path, GpPen *pen, int start, int end, (*last_point)->type |= PathPointTypeCloseSubpath; } +static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end, + int closed, path_list_node_t **last_point) +{ + int i, j; + REAL dash_pos=0.0; + int dash_index=0; + const REAL *dash_pattern; + int dash_count; + GpPointF *tmp_points; + REAL segment_dy; + REAL segment_dx; + REAL segment_length; + REAL segment_pos; + int num_tmp_points=0; + int draw_start_cap=0; + + if (end <= start) + return; + + dash_pattern = pen->dashes; + dash_count = pen->numdashes; + + tmp_points = GdipAlloc((end - start + 2) * sizeof(GpPoint)); + if (!tmp_points) return; /* FIXME */ + + if (!closed) + draw_start_cap = 1; + + for (j=start; j <= end; j++) + { + if (j == start) + { + if (closed) + i = end; + else + continue; + } + else + i = j-1; + + segment_dy = path->pathdata.Points[j].Y - path->pathdata.Points[i].Y; + segment_dx = path->pathdata.Points[j].X - path->pathdata.Points[i].X; + segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + segment_pos = 0.0; + + while (1) + { + if (dash_pos == 0.0) + { + if ((dash_index % 2) == 0) + { + /* start dash */ + num_tmp_points = 1; + tmp_points[0].X = path->pathdata.Points[i].X + segment_dx * segment_pos / segment_length; + tmp_points[0].Y = path->pathdata.Points[i].Y + segment_dy * segment_pos / segment_length; + } + else + { + /* end dash */ + tmp_points[num_tmp_points].X = path->pathdata.Points[i].X + segment_dx * segment_pos / segment_length; + tmp_points[num_tmp_points].Y = path->pathdata.Points[i].Y + segment_dy * segment_pos / segment_length; + + widen_open_figure(tmp_points, pen, 0, num_tmp_points, + draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart, + LineCapFlat, NULL, last_point); + draw_start_cap = 0; + num_tmp_points = 0; + } + } + + if (dash_pattern[dash_index] - dash_pos > segment_length - segment_pos) + { + /* advance to next segment */ + if ((dash_index % 2) == 0) + { + tmp_points[num_tmp_points] = path->pathdata.Points[j]; + num_tmp_points++; + } + dash_pos += segment_length - segment_pos; + break; + } + else + { + /* advance to next dash in pattern */ + segment_pos += dash_pattern[dash_index] - dash_pos; + dash_pos = 0.0; + if (++dash_index == dash_count) + dash_index = 0; + continue; + } + } + } + + if (dash_index % 2 == 0 && num_tmp_points != 0) + { + /* last dash overflows last segment */ + tmp_points[num_tmp_points] = path->pathdata.Points[end]; + widen_open_figure(tmp_points, pen, 0, num_tmp_points, + draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart, + closed ? LineCapFlat : pen->endcap, pen->customend, last_point); + } + + GdipFree(tmp_points); +} + GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, REAL flatness) { @@ -1966,7 +2072,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if (pen->join == LineJoinRound) FIXME("unimplemented line join %d\n", pen->join); - if (pen->dash != DashStyleSolid) + if (pen->dash != DashStyleSolid && pen->dash != DashStyleCustom) FIXME("unimplemented dash style %d\n", pen->dash); if (pen->align != PenAlignmentCenter) @@ -1981,12 +2087,18 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) { - widen_closed_figure(flat_path, pen, subpath_start, i, &last_point); + if (pen->dash == DashStyleCustom) + widen_dashed_figure(flat_path, pen, subpath_start, i, 1, &last_point); + else + widen_closed_figure(flat_path, pen, subpath_start, i, &last_point); } else if (i == flat_path->pathdata.Count-1 || (flat_path->pathdata.Types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) { - widen_open_figure(flat_path, pen, subpath_start, i, &last_point); + if (pen->dash == DashStyleCustom) + widen_dashed_figure(flat_path, pen, subpath_start, i, 0, &last_point); + else + widen_open_figure(flat_path->pathdata.Points, pen, subpath_start, i, pen->startcap, pen->customstart, pen->endcap, pen->customend, &last_point); } }

1 0

Vincent Povirk : gdiplus: Implement remaining dash styles in GdipWidenPath.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 2dbd0e1694ad498d1953b5bf64e1565dede1ebd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbd0e1694ad498d1953b5bf6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 23 14:55:13 2013 -0500 gdiplus: Implement remaining dash styles in GdipWidenPath. --- dlls/gdiplus/graphicspath.c | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8fa3cc0..8508b9b 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1941,12 +1941,35 @@ static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end, REAL segment_pos; int num_tmp_points=0; int draw_start_cap=0; + static const REAL dash_dot_dot[6] = { 3.0, 1.0, 1.0, 1.0, 1.0, 1.0 }; if (end <= start) return; - dash_pattern = pen->dashes; - dash_count = pen->numdashes; + switch (pen->dash) + { + case DashStyleDash: + default: + dash_pattern = dash_dot_dot; + dash_count = 2; + break; + case DashStyleDot: + dash_pattern = &dash_dot_dot[2]; + dash_count = 2; + break; + case DashStyleDashDot: + dash_pattern = dash_dot_dot; + dash_count = 4; + break; + case DashStyleDashDotDot: + dash_pattern = dash_dot_dot; + dash_count = 6; + break; + case DashStyleCustom: + dash_pattern = pen->dashes; + dash_count = pen->numdashes; + break; + } tmp_points = GdipAlloc((end - start + 2) * sizeof(GpPoint)); if (!tmp_points) return; /* FIXME */ @@ -2072,9 +2095,6 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if (pen->join == LineJoinRound) FIXME("unimplemented line join %d\n", pen->join); - if (pen->dash != DashStyleSolid && pen->dash != DashStyleCustom) - FIXME("unimplemented dash style %d\n", pen->dash); - if (pen->align != PenAlignmentCenter) FIXME("unimplemented pen alignment %d\n", pen->align); @@ -2087,7 +2107,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) { - if (pen->dash == DashStyleCustom) + if (pen->dash != DashStyleSolid) widen_dashed_figure(flat_path, pen, subpath_start, i, 1, &last_point); else widen_closed_figure(flat_path, pen, subpath_start, i, &last_point); @@ -2095,7 +2115,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, else if (i == flat_path->pathdata.Count-1 || (flat_path->pathdata.Types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) { - if (pen->dash == DashStyleCustom) + if (pen->dash != DashStyleSolid) widen_dashed_figure(flat_path, pen, subpath_start, i, 0, &last_point); else widen_open_figure(flat_path->pathdata.Points, pen, subpath_start, i, pen->startcap, pen->customstart, pen->endcap, pen->customend, &last_point);

1 0

André Hentschel : msacm32/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 0a9531f9b8425c593985fa05018295f6b57b62da URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9531f9b8425c593985fa050… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 23 22:38:41 2013 +0200 msacm32/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/msacm32/tests/Makefile.in | 1 - dlls/msacm32/tests/msacm.c | 76 ++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/msacm32/tests/Makefile.in b/dlls/msacm32/tests/Makefile.in index 2f7707d..2206ba9 100644 --- a/dlls/msacm32/tests/Makefile.in +++ b/dlls/msacm32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = msacm32.dll IMPORTS = msacm32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ msacm.c diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index a961067..95ab578 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -33,7 +33,7 @@ #include "msacm.h" static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, - PACMFORMATTAGDETAILS paftd, + PACMFORMATTAGDETAILSA paftd, DWORD_PTR dwInstance, DWORD fdwSupport) { @@ -44,7 +44,7 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, } static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid, - LPACMFORMATDETAILS pafd, + LPACMFORMATDETAILSA pafd, DWORD_PTR dwInstance, DWORD fd) { @@ -59,7 +59,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, DWORD fdwSupport) { MMRESULT rc; - ACMDRIVERDETAILS dd; + ACMDRIVERDETAILSA dd; HACMDRIVER had; DWORD dwDriverPriority; @@ -79,48 +79,48 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, } /* try an invalid pointer */ - rc = acmDriverDetails(hadid, 0, 0); + rc = acmDriverDetailsA(hadid, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try an invalid structure size */ ZeroMemory(&dd, sizeof(dd)); - rc = acmDriverDetails(hadid, &dd, 0); + rc = acmDriverDetailsA(hadid, &dd, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* MSDN says this should fail but it doesn't in practice */ dd.cbStruct = 4; - rc = acmDriverDetails(hadid, &dd, 0); + rc = acmDriverDetailsA(hadid, &dd, 0); ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* try an invalid handle */ dd.cbStruct = sizeof(dd); - rc = acmDriverDetails((HACMDRIVERID)1, &dd, 0); + rc = acmDriverDetailsA((HACMDRIVERID)1, &dd, 0); ok(rc == MMSYSERR_INVALHANDLE, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALHANDLE); /* try an invalid handle and pointer */ - rc = acmDriverDetails((HACMDRIVERID)1, 0, 0); + rc = acmDriverDetailsA((HACMDRIVERID)1, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try invalid details */ - rc = acmDriverDetails(hadid, &dd, -1); + rc = acmDriverDetailsA(hadid, &dd, -1); ok(rc == MMSYSERR_INVALFLAG, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALFLAG); /* try valid parameters */ - rc = acmDriverDetails(hadid, &dd, 0); + rc = acmDriverDetailsA(hadid, &dd, 0); ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* cbStruct should contain size of returned data (at most sizeof(dd)) @@ -128,7 +128,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, */ if (rc == MMSYSERR_NOERROR) { ok(dd.cbStruct == sizeof(dd), - "acmDriverDetails(): cbStruct = %08x\n", dd.cbStruct); + "acmDriverDetailsA(): cbStruct = %08x\n", dd.cbStruct); } if (rc == MMSYSERR_NOERROR && winetest_interactive) { @@ -274,27 +274,27 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, "acmMetrics(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); if (rc == MMSYSERR_NOERROR) { - ACMFORMATDETAILS fd; + ACMFORMATDETAILSA fd; WAVEFORMATEX * pwfx; - ACMFORMATTAGDETAILS aftd; + ACMFORMATTAGDETAILSA aftd; /* try bad pointer */ - rc = acmFormatEnum(had, 0, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, 0, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try bad structure size */ ZeroMemory(&fd, sizeof(fd)); - rc = acmFormatEnum(had, &fd, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); fd.cbStruct = sizeof(fd) - 1; - rc = acmFormatEnum(had, &fd, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); if (dwSize < sizeof(WAVEFORMATEX)) @@ -311,43 +311,43 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; /* try valid parameters */ - rc = acmFormatEnum(had, &fd, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_NOERROR, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* try bad pointer */ - rc = acmFormatTagEnum(had, 0, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, 0, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try bad structure size */ ZeroMemory(&aftd, sizeof(aftd)); - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); aftd.cbStruct = sizeof(aftd) - 1; - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); aftd.cbStruct = sizeof(aftd); aftd.dwFormatTag = WAVE_FORMAT_UNKNOWN; /* try bad flag */ - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 1); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 1); ok(rc == MMSYSERR_INVALFLAG, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALFLAG); /* try valid parameters */ - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_NOERROR, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); HeapFree(GetProcessHeap(), 0, pwfx);

1 0

André Hentschel : imm32/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 33018d393ac3f38325afb4e2a3451ad5471e4cfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=33018d393ac3f38325afb4e2a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:29:35 2013 +0200 imm32/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/imm32/tests/Makefile.in | 1 - dlls/imm32/tests/imm32.c | 78 +++++++++++++++++++++--------------------- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/dlls/imm32/tests/Makefile.in b/dlls/imm32/tests/Makefile.in index 6991d94..6893521 100644 --- a/dlls/imm32/tests/Makefile.in +++ b/dlls/imm32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = imm32.dll IMPORTS = imm32 user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ imm32.c diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7b81965..a37190c 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -102,9 +102,9 @@ static LRESULT CALLBACK call_wnd_proc_filter(int nCode, WPARAM wParam, static void msg_spy_pump_msg_queue(void) { MSG msg; - while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { + while(PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } return; @@ -143,11 +143,11 @@ static imm_msgs* msg_spy_find_msg(UINT message) { static void msg_spy_init(HWND hwnd) { msg_spy.hwnd = hwnd; msg_spy.get_msg_hook = - SetWindowsHookEx(WH_GETMESSAGE, get_msg_filter, GetModuleHandle(0), - GetCurrentThreadId()); + SetWindowsHookExW(WH_GETMESSAGE, get_msg_filter, GetModuleHandleW(NULL), + GetCurrentThreadId()); msg_spy.call_wnd_proc_hook = - SetWindowsHookEx(WH_CALLWNDPROC, call_wnd_proc_filter, - GetModuleHandle(0), GetCurrentThreadId()); + SetWindowsHookExW(WH_CALLWNDPROC, call_wnd_proc_filter, + GetModuleHandleW(NULL), GetCurrentThreadId()); msg_spy.i_msg = 0; msg_spy_flush_msgs(); @@ -182,7 +182,7 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) } static BOOL init(void) { - WNDCLASSEX wc; + WNDCLASSEXA wc; HIMC imc; HMODULE hmod,huser; @@ -192,25 +192,25 @@ static BOOL init(void) { pImmIsUIMessageA = (void*)GetProcAddress(hmod, "ImmIsUIMessageA"); pSendInput = (void*)GetProcAddress(huser, "SendInput"); - wc.cbSize = sizeof(WNDCLASSEX); + wc.cbSize = sizeof(WNDCLASSEXA); wc.style = 0; wc.lpfnWndProc = wndProc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; - wc.hInstance = GetModuleHandle(0); - wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wc.lpszMenuName = NULL; wc.lpszClassName = wndcls; - wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION); + wc.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); if (!RegisterClassExA(&wc)) return FALSE; - hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); if (!hwnd) return FALSE; @@ -234,7 +234,7 @@ static void cleanup(void) { msg_spy_cleanup(); if (hwnd) DestroyWindow(hwnd); - UnregisterClass(wndcls, GetModuleHandle(0)); + UnregisterClassA(wndcls, GetModuleHandleW(NULL)); } static void test_ImmNotifyIME(void) { @@ -254,14 +254,14 @@ static void test_ImmNotifyIME(void) { "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n"); - ImmSetCompositionString(imc, SCS_SETSTR, string, sizeof(string), NULL, 0); + ImmSetCompositionStringA(imc, SCS_SETSTR, string, sizeof(string), NULL, 0); msg_spy_flush_msgs(); ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); msg_spy_flush_msgs(); /* behavior differs between win9x and NT */ - ret = ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr)); + ret = ImmGetCompositionStringA(imc, GCS_COMPSTR, resstr, sizeof(resstr)); ok(!ret, "After being cancelled the composition string is empty.\n"); msg_spy_flush_msgs(); @@ -426,9 +426,9 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) COMPOSITIONFORM cf; POINT pt; igc_threadinfo *info= (igc_threadinfo*)lpParam; - info->hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + info->hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); h1 = ImmGetContext(hwnd); todo_wine ok(info->himc == h1, "hwnd context changed in new thread\n"); @@ -437,9 +437,9 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) info->himc = h2; ImmReleaseContext(hwnd,h1); - hwnd2 = CreateWindowEx(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + hwnd2 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); h1 = ImmGetContext(hwnd2); ok(h1 == h2, "Windows in same thread should have same default context\n"); @@ -463,14 +463,14 @@ static void test_ImmThreads(void) HANDLE hThread; DWORD dwThreadId; BOOL rc; - LOGFONT lf; + LOGFONTA lf; COMPOSITIONFORM cf; CANDIDATEFORM cdf; DWORD status, sentence; POINT pt; himc = ImmGetContext(hwnd); - threadinfo.event = CreateEvent(NULL, TRUE, FALSE, NULL); + threadinfo.event = CreateEventA(NULL, TRUE, FALSE, NULL); threadinfo.himc = himc; hThread = CreateThread(NULL, 0, ImmGetContextThreadFunc, &threadinfo, 0, &dwThreadId ); WaitForSingleObject(threadinfo.event, INFINITE); @@ -510,14 +510,14 @@ static void test_ImmThreads(void) ok(rc == 0, "ImmGetOpenStatus failed\n"); /* CompositionFont */ - rc = ImmGetCompositionFont(himc, &lf); + rc = ImmGetCompositionFontA(himc, &lf); ok(rc != 0, "ImmGetCompositionFont failed\n"); - rc = ImmSetCompositionFont(himc, &lf); + rc = ImmSetCompositionFontA(himc, &lf); ok(rc != 0, "ImmSetCompositionFont failed\n"); - rc = ImmGetCompositionFont(otherHimc, &lf); + rc = ImmGetCompositionFontA(otherHimc, &lf); ok(rc != 0 || broken(rc == 0), "ImmGetCompositionFont failed\n"); - rc = ImmSetCompositionFont(otherHimc, &lf); + rc = ImmSetCompositionFontA(otherHimc, &lf); todo_wine ok(rc == 0, "ImmSetCompositionFont should fail\n"); /* CompositionWindow */ @@ -705,9 +705,9 @@ static void test_ImmDefaultHwnd(void) HWND def1, def3; HWND hwnd; - hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); ShowWindow(hwnd, SW_SHOWNORMAL); @@ -907,9 +907,9 @@ static void test_ImmMessages(void) HIMC imc; UINT idx = 0; - HWND hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + HWND hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleA(NULL), NULL); ShowWindow(hwnd, SW_SHOWNORMAL); defwnd = ImmGetDefaultIMEWnd(hwnd); @@ -917,7 +917,7 @@ static void test_ImmMessages(void) ImmSetOpenStatus(imc, TRUE); msg_spy_flush_msgs(); - SendMessage(defwnd, WM_IME_CONTROL, IMC_GETCANDIDATEPOS, (LPARAM)&cf ); + SendMessageA(defwnd, WM_IME_CONTROL, IMC_GETCANDIDATEPOS, (LPARAM)&cf ); do { msg = msg_spy_find_next_msg(WM_IME_CONTROL,&idx); @@ -952,8 +952,8 @@ static void test_ime_processkey(void) wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = processkey_wnd_proc; wclass.hInstance = hInstance; - wclass.hIcon = LoadIcon(0, IDI_APPLICATION); - wclass.hCursor = LoadCursor( NULL, IDC_ARROW); + wclass.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + wclass.hCursor = LoadCursorW( NULL, (LPCWSTR)IDC_ARROW); wclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wclass.lpszMenuName = 0; wclass.cbClsExtra = 0;

1 0

André Hentschel : version/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: ae206d75178fcc97854556910bf1e3b2ce4858c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae206d75178fcc97854556910… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:30:01 2013 +0200 version/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/version/tests/Makefile.in | 1 - dlls/version/tests/info.c | 38 +++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/version/tests/Makefile.in b/dlls/version/tests/Makefile.in index 26f106a..2653299 100644 --- a/dlls/version/tests/Makefile.in +++ b/dlls/version/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = version.dll IMPORTS = version -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ info.c \ diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index f19b3d7..aa1982c 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -457,7 +457,7 @@ static void test_32bit_win(void) HeapFree( GetProcessHeap(), 0, pVersionInfoW); } -static void test_VerQueryValue(void) +static void test_VerQueryValueA(void) { static const char * const value_name[] = { "Product", "CompanyName", "FileDescription", "Internal", @@ -468,24 +468,24 @@ static void test_VerQueryValue(void) UINT len, ret, translation, i; char buf[MAX_PATH]; - ret = GetModuleFileName(NULL, buf, sizeof(buf)); + ret = GetModuleFileNameA(NULL, buf, sizeof(buf)); assert(ret); SetLastError(0xdeadbeef); - len = GetFileVersionInfoSize(buf, NULL); - ok(len, "GetFileVersionInfoSize(%s) error %u\n", buf, GetLastError()); + len = GetFileVersionInfoSizeA(buf, NULL); + ok(len, "GetFileVersionInfoSizeA(%s) error %u\n", buf, GetLastError()); ver = HeapAlloc(GetProcessHeap(), 0, len); assert(ver); SetLastError(0xdeadbeef); - ret = GetFileVersionInfo(buf, 0, len, ver); - ok(ret, "GetFileVersionInfo error %u\n", GetLastError()); + ret = GetFileVersionInfoA(buf, 0, len, ver); + ok(ret, "GetFileVersionInfoA error %u\n", GetLastError()); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "\\VarFileInfo\\Translation", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "\\VarFileInfo\\Translation", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); @@ -495,7 +495,7 @@ static void test_VerQueryValue(void) p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "String", (LPVOID*)&p, &len); ok(!ret, "VerQueryValue should fail\n"); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || GetLastError() == 0xdeadbeef /* NT4, W2K */, @@ -506,7 +506,7 @@ static void test_VerQueryValue(void) p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "StringFileInfo", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "StringFileInfo", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); @@ -514,7 +514,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "\\StringFileInfo", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "\\StringFileInfo", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); @@ -522,7 +522,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "\\\\StringFileInfo", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "\\\\StringFileInfo", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); @@ -530,7 +530,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "\\StringFileInfo\\\\", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "\\StringFileInfo\\\\", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); @@ -539,7 +539,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); @@ -550,20 +550,20 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); - ok(ret, "VerQueryValue(%s) error %u\n", buf, GetLastError()); + ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len); + ok(ret, "VerQueryValueA(%s) error %u\n", buf, GetLastError()); ok(len == strlen(value_name[i]) + 1, "VerQueryValue returned %u\n", len); ok(!strcmp(value_name[i], p), "expected \"%s\", got \"%s\"\n", value_name[i], p); /* test partial value names */ - len = lstrlen(buf); + len = lstrlenA(buf); buf[len - 2] = 0; p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); - ok(!ret, "VerQueryValue(%s) succeeded\n", buf); + ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len); + ok(!ret, "VerQueryValueA(%s) succeeded\n", buf); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); @@ -579,5 +579,5 @@ START_TEST(info) test_info_size(); test_info(); test_32bit_win(); - test_VerQueryValue(); + test_VerQueryValueA(); }

1 0