November 2013 - Wine-Commits

Ken Thomases : winemac: Add support for the CF_ENHMETAFILE clipboard format .
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: 29236cce4c3bb54fcd3e52b90e863036991ed34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29236cce4c3bb54fcd3e52b90… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:31 2013 -0600 winemac: Add support for the CF_ENHMETAFILE clipboard format. --- dlls/winemac.drv/clipboard.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 9f4a81f..71b9975 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -72,6 +72,7 @@ typedef struct static HANDLE import_clipboard_data(CFDataRef data); static HANDLE import_bmp_to_bitmap(CFDataRef data); static HANDLE import_bmp_to_dib(CFDataRef data); +static HANDLE import_enhmetafile(CFDataRef data); static HANDLE import_metafilepict(CFDataRef data); static HANDLE import_nsfilenames_to_hdrop(CFDataRef data); static HANDLE import_oemtext_to_text(CFDataRef data); @@ -90,6 +91,7 @@ static HANDLE import_utf16_to_unicodetext(CFDataRef data); static CFDataRef export_clipboard_data(HANDLE data); static CFDataRef export_bitmap_to_bmp(HANDLE data); static CFDataRef export_dib_to_bmp(HANDLE data); +static CFDataRef export_enhmetafile(HANDLE data); static CFDataRef export_hdrop_to_filenames(HANDLE data); static CFDataRef export_metafilepict(HANDLE data); static CFDataRef export_oemtext_to_utf8(HANDLE data); @@ -197,6 +199,7 @@ static const struct { CF_HDROP, CFSTR("org.winehq.builtin.hdrop"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_HDROP, CFSTR("NSFilenamesPboardType"), import_nsfilenames_to_hdrop, export_hdrop_to_filenames, TRUE }, + { CF_ENHMETAFILE, CFSTR("org.winehq.builtin.enhmetafile"), import_enhmetafile, export_enhmetafile, FALSE }, { CF_METAFILEPICT, CFSTR("org.winehq.builtin.metafilepict"), import_metafilepict, export_metafilepict, FALSE }, }; @@ -675,6 +678,25 @@ static HANDLE import_bmp_to_dib(CFDataRef data) /************************************************************************** + * import_enhmetafile + * + * Import enhanced metafile data, converting it to CF_ENHMETAFILE. + */ +static HANDLE import_enhmetafile(CFDataRef data) +{ + HANDLE ret = 0; + CFIndex len = CFDataGetLength(data); + + TRACE("data %s\n", debugstr_cf(data)); + + if (len) + ret = SetEnhMetaFileBits(len, (const BYTE*)CFDataGetBytePtr(data)); + + return ret; +} + + +/************************************************************************** * import_metafilepict * * Import metafile picture data, converting it to CF_METAFILEPICT. @@ -1169,6 +1191,30 @@ static CFDataRef export_dib_to_bmp(HANDLE data) /************************************************************************** + * export_enhmetafile + * + * Export an enhanced metafile to data. + */ +static CFDataRef export_enhmetafile(HANDLE data) +{ + CFMutableDataRef ret = NULL; + unsigned int size = GetEnhMetaFileBits(data, 0, NULL); + + TRACE("data %p\n", data); + + ret = CFDataCreateMutable(NULL, size); + if (ret) + { + CFDataSetLength(ret, size); + GetEnhMetaFileBits(data, size, (BYTE*)CFDataGetMutableBytePtr(ret)); + } + + TRACE(" -> %s\n", debugstr_cf(ret)); + return ret; +} + + +/************************************************************************** * export_hdrop_to_filenames * * Export CF_HDROP to NSFilenamesPboardType data, which is a CFArray of

1 0

Ken Thomases : winemac: Add support for the CF_METAFILEPICT clipboard format.
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: cdad61369c94eb2d90fb330176fc6fd2c31885c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdad61369c94eb2d90fb33017… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:28 2013 -0600 winemac: Add support for the CF_METAFILEPICT clipboard format. --- dlls/winemac.drv/clipboard.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index a648fcc..9f4a81f 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -72,6 +72,7 @@ typedef struct static HANDLE import_clipboard_data(CFDataRef data); static HANDLE import_bmp_to_bitmap(CFDataRef data); static HANDLE import_bmp_to_dib(CFDataRef data); +static HANDLE import_metafilepict(CFDataRef data); static HANDLE import_nsfilenames_to_hdrop(CFDataRef data); static HANDLE import_oemtext_to_text(CFDataRef data); static HANDLE import_oemtext_to_unicodetext(CFDataRef data); @@ -90,6 +91,7 @@ static CFDataRef export_clipboard_data(HANDLE data); static CFDataRef export_bitmap_to_bmp(HANDLE data); static CFDataRef export_dib_to_bmp(HANDLE data); static CFDataRef export_hdrop_to_filenames(HANDLE data); +static CFDataRef export_metafilepict(HANDLE data); static CFDataRef export_oemtext_to_utf8(HANDLE data); static CFDataRef export_oemtext_to_utf16(HANDLE data); static CFDataRef export_text_to_utf8(HANDLE data); @@ -194,6 +196,8 @@ static const struct { CF_HDROP, CFSTR("org.winehq.builtin.hdrop"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_HDROP, CFSTR("NSFilenamesPboardType"), import_nsfilenames_to_hdrop, export_hdrop_to_filenames, TRUE }, + + { CF_METAFILEPICT, CFSTR("org.winehq.builtin.metafilepict"), import_metafilepict, export_metafilepict, FALSE }, }; static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; @@ -671,6 +675,33 @@ static HANDLE import_bmp_to_dib(CFDataRef data) /************************************************************************** + * import_metafilepict + * + * Import metafile picture data, converting it to CF_METAFILEPICT. + */ +static HANDLE import_metafilepict(CFDataRef data) +{ + HANDLE ret = 0; + CFIndex len = CFDataGetLength(data); + METAFILEPICT *mfp; + + TRACE("data %s\n", debugstr_cf(data)); + + if (len >= sizeof(*mfp) && (ret = GlobalAlloc(0, sizeof(*mfp)))) + { + const BYTE *bytes = (const BYTE*)CFDataGetBytePtr(data); + + mfp = GlobalLock(ret); + memcpy(mfp, bytes, sizeof(*mfp)); + mfp->hMF = SetMetaFileBitsEx(len - sizeof(*mfp), bytes + sizeof(*mfp)); + GlobalUnlock(ret); + } + + return ret; +} + + +/************************************************************************** * import_nsfilenames_to_hdrop * * Import NSFilenamesPboardType data, converting the property-list- @@ -1231,6 +1262,33 @@ done: /************************************************************************** + * export_metafilepict + * + * Export a metafile to data. + */ +static CFDataRef export_metafilepict(HANDLE data) +{ + CFMutableDataRef ret = NULL; + METAFILEPICT *mfp = GlobalLock(data); + unsigned int size = GetMetaFileBitsEx(mfp->hMF, 0, NULL); + + TRACE("data %p\n", data); + + ret = CFDataCreateMutable(NULL, sizeof(*mfp) + size); + if (ret) + { + CFDataAppendBytes(ret, (UInt8*)mfp, sizeof(*mfp)); + CFDataIncreaseLength(ret, size); + GetMetaFileBitsEx(mfp->hMF, size, (BYTE*)CFDataGetMutableBytePtr(ret) + sizeof(*mfp)); + } + + GlobalUnlock(data); + TRACE(" -> %s\n", debugstr_cf(ret)); + return ret; +} + + +/************************************************************************** * export_oemtext_to_utf8 * * Export CF_OEMTEXT to UTF-8.

1 0

Ken Thomases : winemac: Add support for a "Decorated" registry setting to control whether windows get Mac-style decorations.
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: 788e2034f6de55383d641cbb8ff08f70c2f6f600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=788e2034f6de55383d641cbb8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Nov 21 14:47:57 2013 -0600 winemac: Add support for a "Decorated" registry setting to control whether windows get Mac-style decorations. --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 5 +++++ dlls/winemac.drv/window.c | 1 + 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 120fa51..32a342b 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -39,6 +39,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; extern BOOL allow_software_rendering DECLSPEC_HIDDEN; +extern BOOL disable_window_decorations DECLSPEC_HIDDEN; extern HMODULE macdrv_module DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index ba15706..2c3ec23 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -53,6 +53,7 @@ BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; BOOL allow_software_rendering = FALSE; +BOOL disable_window_decorations = FALSE; HMODULE macdrv_module = 0; @@ -166,6 +167,10 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "AllowSoftwareRendering", buffer, sizeof(buffer))) allow_software_rendering = IS_OPTION_TRUE(buffer[0]); + /* Value name chosen to match what's used in the X11 driver. */ + if (!get_config_key(hkey, appkey, "Decorated", buffer, sizeof(buffer))) + disable_window_decorations = !IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); } diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 1ad8ac2..f8e30ca 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -57,6 +57,7 @@ static void get_cocoa_window_features(struct macdrv_win_data *data, { memset(wf, 0, sizeof(*wf)); + if (disable_window_decorations) return; if (IsRectEmpty(&data->window_rect)) return; if ((style & WS_CAPTION) == WS_CAPTION && !(ex_style & WS_EX_LAYERED))

1 0

Alexandre Julliard : kernel32: Validate the architecture of newly created processes on the server side.
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: 1e78c99388c61d353cf60787eac6415328f54560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e78c99388c61d353cf60787e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 22 12:32:48 2013 +0100 kernel32: Validate the architecture of newly created processes on the server side. --- dlls/kernel32/process.c | 64 +++++++++++++++++++++++++++++++++------ dlls/ntdll/server.c | 12 ++++---- include/wine/server_protocol.h | 4 ++- server/process.c | 5 +++ server/protocol.def | 1 + server/request.h | 5 ++- server/thread.c | 27 ++++++++++------ server/thread.h | 1 + server/trace.c | 6 ++++ 9 files changed, 96 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e78c99388c61d353cf60…

1 0

Alexandre Julliard : kernel32: Determine the module architecture for all binary types.
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: f2c54dba015f6f3e359f87c0950b25b9ffeb1e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c54dba015f6f3e359f87c09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 22 12:18:31 2013 +0100 kernel32: Determine the module architecture for all binary types. --- dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/module.c | 34 +++++++++++++++++++++++++++++++++- dlls/kernel32/process.c | 20 ++++++++++++++++---- 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index cfc2935..5c6c197 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -81,6 +81,7 @@ enum binary_type struct binary_info { enum binary_type type; + DWORD arch; DWORD flags; void *res_start; void *res_end; diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index babc756..63cf012 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -264,22 +264,52 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) if (!memcmp( header.elf.magic, "\177ELF", 4 )) { if (header.elf.class == 2) info->flags |= BINARY_FLAG_64BIT; - /* FIXME: we don't bother to check byte order, architecture, etc. */ +#ifdef WORDS_BIGENDIAN + if (header.elf.data == 1) +#else + if (header.elf.data == 2) +#endif + { + header.elf.type = RtlUshortByteSwap( header.elf.type ); + header.elf.machine = RtlUshortByteSwap( header.elf.machine ); + } switch(header.elf.type) { case 2: info->type = BINARY_UNIX_EXE; break; case 3: info->type = BINARY_UNIX_LIB; break; } + switch(header.elf.machine) + { + case 3: info->arch = IMAGE_FILE_MACHINE_I386; break; + case 20: info->arch = IMAGE_FILE_MACHINE_POWERPC; break; + case 40: info->arch = IMAGE_FILE_MACHINE_ARMNT; break; + case 50: info->arch = IMAGE_FILE_MACHINE_IA64; break; + case 62: info->arch = IMAGE_FILE_MACHINE_AMD64; break; + case 183: info->arch = IMAGE_FILE_MACHINE_ARM64; break; + } } /* Mach-o File with Endian set to Big Endian or Little Endian */ else if (header.macho.magic == 0xfeedface || header.macho.magic == 0xcefaedfe) { if ((header.macho.cputype >> 24) == 1) info->flags |= BINARY_FLAG_64BIT; + if (header.macho.magic == 0xcefaedfe) + { + header.macho.filetype = RtlUlongByteSwap( header.macho.filetype ); + header.macho.cputype = RtlUlongByteSwap( header.macho.cputype ); + } switch(header.macho.filetype) { case 2: info->type = BINARY_UNIX_EXE; break; case 8: info->type = BINARY_UNIX_LIB; break; } + switch(header.macho.cputype) + { + case 0x00000007: info->arch = IMAGE_FILE_MACHINE_I386; break; + case 0x01000007: info->arch = IMAGE_FILE_MACHINE_AMD64; break; + case 0x0000000c: info->arch = IMAGE_FILE_MACHINE_ARMNT; break; + case 0x0100000c: info->arch = IMAGE_FILE_MACHINE_ARM64; break; + case 0x00000012: info->arch = IMAGE_FILE_MACHINE_POWERPC; break; + } } /* Not ELF, try DOS */ else if (header.mz.e_magic == IMAGE_DOS_SIGNATURE) @@ -298,6 +328,7 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) * to read or not. */ info->type = BINARY_DOS; + info->arch = IMAGE_FILE_MACHINE_I386; if (SetFilePointer( hfile, header.mz.e_lfanew, NULL, SEEK_SET ) == -1) return; if (!ReadFile( hfile, &ext_header, sizeof(ext_header), &len, NULL ) || len < 4) return; @@ -309,6 +340,7 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) if (len >= sizeof(ext_header.nt.FileHeader)) { info->type = BINARY_PE; + info->arch = ext_header.nt.FileHeader.Machine; if (ext_header.nt.FileHeader.Characteristics & IMAGE_FILE_DLL) info->flags |= BINARY_FLAG_DLL; if (len < sizeof(ext_header.nt)) /* clear remaining part of header if missing */ diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index afbdf72..0bacd60 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -208,6 +208,18 @@ static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *fil binary_info->flags = flags; binary_info->res_start = NULL; binary_info->res_end = NULL; + /* assume current arch */ +#if defined(__i386__) || defined(__x86_64__) + binary_info->arch = (flags & BINARY_FLAG_64BIT) ? IMAGE_FILE_MACHINE_AMD64 : IMAGE_FILE_MACHINE_I386; +#elif defined(__powerpc__) + binary_info->arch = IMAGE_FILE_MACHINE_POWERPC; +#elif defined(__arm__) && !defined(__ARMEB__) + binary_info->arch = IMAGE_FILE_MACHINE_ARMNT; +#elif defined(__aarch64__) + binary_info->arch = IMAGE_FILE_MACHINE_ARM64; +#else + binary_info->arch = IMAGE_FILE_MACHINE_UNKNOWN; +#endif return TRUE; } @@ -2286,9 +2298,9 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A else switch (binary_info.type) { case BINARY_PE: - TRACE( "starting %s as Win%d binary (%p-%p)\n", + TRACE( "starting %s as Win%d binary (%p-%p, arch %04x)\n", debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, - binary_info.res_start, binary_info.res_end ); + binary_info.res_start, binary_info.res_end, binary_info.arch ); retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); break; @@ -2431,9 +2443,9 @@ static void exec_process( LPCWSTR name ) switch (binary_info.type) { case BINARY_PE: - TRACE( "starting %s as Win%d binary (%p-%p)\n", + TRACE( "starting %s as Win%d binary (%p-%p, arch %04x)\n", debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, - binary_info.res_start, binary_info.res_end ); + binary_info.res_start, binary_info.res_end, binary_info.arch ); create_process( hFile, name, GetCommandLineW(), NULL, NULL, NULL, NULL, FALSE, 0, &startup_info, &info, NULL, &binary_info, TRUE ); break;

1 0

Henri Verbeet : wined3d: surface_load() should never fail.
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: c025b5d06b8cdefb5a03e19bfc441022c038fb6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c025b5d06b8cdefb5a03e19bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 22 10:45:01 2013 +0100 wined3d: surface_load() should never fail. --- dlls/wined3d/surface.c | 9 ++------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 878b848..1523d5c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2255,7 +2255,7 @@ void surface_set_dirty(struct wined3d_surface *surface) wined3d_texture_set_dirty(surface->container); } -HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) +void surface_load(struct wined3d_surface *surface, BOOL srgb) { DWORD flag = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; BOOL ck_changed; @@ -2263,10 +2263,7 @@ HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) TRACE("surface %p, srgb %#x.\n", surface, srgb); if (surface->resource.pool == WINED3D_POOL_SCRATCH) - { ERR("Not supported on scratch surfaces.\n"); - return WINED3DERR_INVALIDCALL; - } ck_changed = !(surface->flags & SFLAG_GLCKEY) != !(surface->CKeyFlags & WINEDDSD_CKSRCBLT); @@ -2293,13 +2290,11 @@ HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) else { TRACE("surface is already in texture\n"); - return WINED3D_OK; + return; } surface_load_location(surface, flag); surface_evict_sysmem(surface); - - return WINED3D_OK; } /* See also float_16_to_32() in wined3d_private.h */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31235f2..e8bc18b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2251,7 +2251,7 @@ void surface_internal_preload(struct wined3d_surface *surface, struct wined3d_context *context, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; -HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; +void surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Reimplement wined3d_ftoa().
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: 12f16f2127ffce9a05eedf008c3aa3732751a7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f16f2127ffce9a05eedf008… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 22 10:45:00 2013 +0100 wined3d: Reimplement wined3d_ftoa(). The current implementation is not precise enough when the FPU is in REAL4 mode, which also happens to be the mode d3d9 sets by default. Doing the same thing with integer math is a huge pain, so just replace the decimal separator instead. --- dlls/wined3d/utils.c | 47 +++++++---------------------------------------- 1 files changed, 7 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f6d3a44..c37b677 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3806,51 +3806,18 @@ const char *wined3d_debug_location(DWORD location) return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; } -/* This should be equivalent to using the %.8e format specifier, but always - * using '.' as decimal separator. This doesn't handle +/-INF or NAN, since - * the GLSL and ARB parsers wouldn't be able to handle those anyway. */ +/* Print a floating point value with the %.8e format specifier, always using + * '.' as decimal separator. */ void wined3d_ftoa(float value, char *s) { - int x, frac, exponent; - const char *sign = ""; - double d; + int idx = 1; - d = value; if (copysignf(1.0f, value) < 0.0f) - { - d = -d; - sign = "-"; - } - - if (d == 0.0f) - { - x = 0; - frac = 0; - exponent = 0; - } - else - { - double t, diff; - - exponent = floorf(log10f(d)); - d /= pow(10.0, exponent); - - x = d; - t = (d - x) * 100000000; - frac = t; - diff = t - frac; - - if ((diff > 0.5) || (diff == 0.5 && (frac & 1))) - { - if (++frac >= 100000000) - { - frac = 0; - ++x; - } - } - } + ++idx; - sprintf(s, "%s%d.%08de%+03d", sign, x, frac, exponent); + sprintf(s, "%.8e", value); + if (isfinite(value)) + s[idx] = '.'; } void wined3d_release_dc(HWND window, HDC dc)

1 0

Rico Schüller : shell32: Use lParam for BFFM_SETOKTEXT .
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: 5f15a5633c338352aed17474eaa9acec2fe07a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f15a5633c338352aed17474e… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 22 10:35:44 2013 +0100 shell32: Use lParam for BFFM_SETOKTEXT. --- dlls/shell32/brsfolder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 9d95293..86948ea 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1027,8 +1027,8 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, break; case BFFM_SETOKTEXT: /* unicode only */ - TRACE("Set OK text %s\n", debugstr_w((LPWSTR)wParam)); - SetWindowTextW(GetDlgItem(hWnd, 1), (LPWSTR)wParam); + TRACE("Set OK text %s\n", debugstr_w((LPWSTR)lParam)); + SetWindowTextW(GetDlgItem(hWnd, 1), (LPWSTR)lParam); break; case BFFM_SETSELECTIONA:

1 0

Alistair Leslie-Hughes : mscoree: Implement IMetahostPolicy GetRequestedRuntime.
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: d8f54b4d4922de8a73527368ec1d741db543b621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f54b4d4922de8a73527368e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 5 15:13:34 2013 +1100 mscoree: Implement IMetahostPolicy GetRequestedRuntime. --- dlls/mscoree/metahost.c | 48 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 6d87b25..3a7e109 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1190,11 +1190,52 @@ static HRESULT WINAPI metahostpolicy_GetRequestedRuntime(ICLRMetaHostPolicy *ifa LPWSTR pwzImageVersion, DWORD *pcchImageVersion, DWORD *pdwConfigFlags, REFIID riid, LPVOID *ppRuntime) { - FIXME("%d %p %p %p %p %p %p %p %s %p\n", dwPolicyFlags, pwzBinary, pCfgStream, + ICLRRuntimeInfo *result; + HRESULT hr; + WCHAR filename[MAX_PATH]; + const WCHAR *path = NULL; + int flags = 0; + + TRACE("%d %p %p %p %p %p %p %p %s %p\n", dwPolicyFlags, pwzBinary, pCfgStream, pwzVersion, pcchVersion, pwzImageVersion, pcchImageVersion, pdwConfigFlags, debugstr_guid(riid), ppRuntime); - return E_NOTIMPL; + if (pCfgStream) + FIXME("ignoring config file stream\n"); + + if (pdwConfigFlags) + FIXME("ignoring config flags\n"); + + if(dwPolicyFlags & METAHOST_POLICY_USE_PROCESS_IMAGE_PATH) + { + GetModuleFileNameW(0, filename, MAX_PATH); + path = filename; + } + else if(pwzBinary) + { + path = pwzBinary; + } + + if(dwPolicyFlags & METAHOST_POLICY_APPLY_UPGRADE_POLICY) + flags |= RUNTIME_INFO_UPGRADE_VERSION; + + hr = get_runtime_info(path, pwzImageVersion, NULL, 0, flags, FALSE, &result); + if (SUCCEEDED(hr)) + { + if (pwzImageVersion) + { + /* Ignoring errors on purpose */ + ICLRRuntimeInfo_GetVersionString(result, pwzImageVersion, pcchImageVersion); + } + + hr = ICLRRuntimeInfo_QueryInterface(result, riid, ppRuntime); + + ICLRRuntimeInfo_Release(result); + } + + TRACE("<- 0x%08x\n", hr); + + return hr; } static const struct ICLRMetaHostPolicyVtbl CLRMetaHostPolicy_vtbl = @@ -1327,6 +1368,9 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, if (runtimeinfo_flags & ~supported_runtime_flags) FIXME("unsupported runtimeinfo flags %x\n", runtimeinfo_flags & ~supported_runtime_flags); + if (exefile && !exefile[0]) + exefile = NULL; + if (exefile && !config_file) { strcpyW(local_config_file, exefile);

1 0

Andrew Eikum : dsound: Don' t change play position if IAudioClient methods fail.
by Alexandre Julliard Nov. 22, 2013

Nov. 22, 2013

Module: wine Branch: master Commit: ace3c315b891fbfc801ab20303dce08ad1c76e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace3c315b891fbfc801ab2030… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 21 12:42:41 2013 -0600 dsound: Don't change play position if IAudioClient methods fail. --- dlls/dsound/mixer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 282808e..43b7dca 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -605,8 +605,6 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) if(!prebuf_bytes) return; - device->in_mmdev_bytes += prebuf_bytes; - if(prebuf_bytes + read_offs_bytes > device->buflen){ DWORD chunk_bytes = device->buflen - read_offs_bytes; prebuf_frames = chunk_bytes / device->pwfx->nBlockAlign; @@ -631,6 +629,8 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) return; } + device->in_mmdev_bytes += prebuf_frames * device->pwfx->nBlockAlign; + /* check if anything wrapped */ if(prebuf_bytes > 0){ prebuf_frames = prebuf_bytes / device->pwfx->nBlockAlign; @@ -648,6 +648,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) WARN("ReleaseBuffer failed: %08x\n", hr); return; } + device->in_mmdev_bytes += prebuf_frames * device->pwfx->nBlockAlign; } TRACE("in_mmdev_bytes now = %i\n", device->in_mmdev_bytes);

1 0