wine-commits November 2014

wine-commits@winehq.org

2 participants
394 discussions

Austin English : opengl32: Load dll below 2GB address space.
by Alexandre Julliard 21 Nov '14

21 Nov '14

Module: wine Branch: master Commit: c62514b953fb523107501277520030c335e9accb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c62514b953fb5231075012775… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 20 15:04:56 2014 -0600 opengl32: Load dll below 2GB address space. --- dlls/opengl32/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index 890b5b6..4df6bce 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -1,6 +1,7 @@ MODULE = opengl32.dll IMPORTLIB = opengl32 IMPORTS = user32 gdi32 advapi32 +EXTRADLLFLAGS = -Wl,--image-base,0x7a800000 C_SRCS = \ opengl_ext.c \

1 0

Yifu Wang : msvcp120: Added std::locale::facet::~facet() export.
by Alexandre Julliard 21 Nov '14

21 Nov '14

Module: wine Branch: master Commit: e23bfdd8318fd45bc2115c38f47de7f433cf0a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23bfdd8318fd45bc2115c38f… Author: Yifu Wang <ywang(a)esri.com> Date: Fri Nov 14 13:06:19 2014 -0800 msvcp120: Added std::locale::facet::~facet() export. --- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp90/locale.c | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 8ebdc80..422f0b6 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -517,9 +517,9 @@ @ cdecl -arch=arm ??1ctype_base@std@@UAA@XZ(ptr) ctype_base_dtor @ thiscall -arch=i386 ??1ctype_base@std@@UAE@XZ(ptr) ctype_base_dtor @ cdecl -arch=win64 ??1ctype_base@std@@UEAA@XZ(ptr) ctype_base_dtor -@ stub -arch=arm ??1facet@locale@std@@MAA@XZ -@ stub -arch=i386 ??1facet@locale@std@@MAE@XZ -@ stub -arch=win64 ??1facet@locale@std@@MEAA@XZ +@ cdecl -arch=arm ??1facet@locale@std@@MAA@XZ(ptr) locale_facet_dtor +@ thiscall -arch=i386 ??1facet@locale@std@@MAE@XZ(ptr) locale_facet_dtor +@ cdecl -arch=win64 ??1facet@locale@std@@MEAA@XZ(ptr) locale_facet_dtor @ cdecl -arch=arm ??1ios_base@std@@UAA@XZ(ptr) ios_base_dtor @ thiscall -arch=i386 ??1ios_base@std@@UAE@XZ(ptr) ios_base_dtor @ cdecl -arch=win64 ??1ios_base@std@@UEAA@XZ(ptr) ios_base_dtor diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 551a924d..097dad8 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -214,6 +214,9 @@ static void ostreambuf_iterator_wchar_put(ostreambuf_iterator_wchar *this, wchar /* ??1facet@locale@std@@UAE@XZ */ /* ??1facet@locale@std@@UEAA@XZ */ +/* ??1facet@locale@std@@MAA@XZ */ +/* ??1facet@locale@std@@MAE@XZ */ +/* ??1facet@locale@std@@MEAA@XZ */ DEFINE_THISCALL_WRAPPER(locale_facet_dtor, 4) void __thiscall locale_facet_dtor(locale_facet *this) {

1 0

Jacek Caban : mshtml: Don't try to null terminate post data if it' s not available.
by Alexandre Julliard 21 Nov '14

21 Nov '14

Module: wine Branch: master Commit: ec97e3fd57e84a4d231c0ee567ea1b1fcfbbf4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec97e3fd57e84a4d231c0ee56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 17:59:42 2014 +0100 mshtml: Don't try to null terminate post data if it's not available. --- dlls/mshtml/navigate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 39f298f..85e47aa 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -902,7 +902,8 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_heade post_data = new_data; } - post_data[data_len] = 0; + if(post_data) + post_data[data_len] = 0; request_data->post_data = post_data; request_data->post_data_len = data_len; TRACE("post_data = %s\n", debugstr_an(request_data->post_data, request_data->post_data_len));

1 0

Jacek Caban : mshtml: Merge htmlelem3.c into htmlelem.c.
by Alexandre Julliard 21 Nov '14

21 Nov '14

Module: wine Branch: master Commit: 6485a67a90c7d514ea9e700075fe9e07923e44d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6485a67a90c7d514ea9e70007… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 16:12:39 2014 +0100 mshtml: Merge htmlelem3.c into htmlelem.c. --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlelem.c | 648 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlelem3.c | 683 ------------------------------------------- dlls/mshtml/mshtml_private.h | 1 - 4 files changed, 646 insertions(+), 687 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6485a67a90c7d514ea9e7…

1 0

Nikolay Sivov : dwrite: Load freetype on module attach, create one FT_Face per fontface.
by Alexandre Julliard 21 Nov '14

21 Nov '14

Module: wine Branch: master Commit: a77b9ed0c733fcb71fe3189f533f80166efc577e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77b9ed0c733fcb71fe3189f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 21 11:48:23 2014 +0300 dwrite: Load freetype on module attach, create one FT_Face per fontface. --- dlls/dwrite/Makefile.in | 2 + dlls/dwrite/dwrite_private.h | 7 +++ dlls/dwrite/font.c | 25 ++++++++ dlls/dwrite/freetype.c | 138 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 1 + 5 files changed, 173 insertions(+) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index 2090883..ded14db 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,12 +1,14 @@ MODULE = dwrite.dll IMPORTLIB = dwrite IMPORTS = user32 gdi32 +EXTRAINCL = $(FREETYPE_CFLAGS) C_SRCS = \ analyzer.c \ bidi.c \ bracket.c \ font.c \ + freetype.c \ gdiinterop.c \ layout.c \ linebreak.c \ diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3b1d283..c600f3e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -119,9 +119,16 @@ extern void opentype_get_font_properties(const void*,const void*,DWRITE_FONT_STR extern void opentype_get_font_metrics(const void*,const void*,const void*,DWRITE_FONT_METRICS1*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +/* BiDi helpers */ extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLSPEC_HIDDEN; extern WCHAR bidi_get_mirrored_char(WCHAR) DECLSPEC_HIDDEN; +/* FreeType integration */ +struct ft_fontface; +extern BOOL init_freetype(void) DECLSPEC_HIDDEN; +extern HRESULT alloc_ft_fontface(const void*,UINT32,UINT32,struct ft_fontface**) DECLSPEC_HIDDEN; +extern void release_ft_fontface(struct ft_fontface*) DECLSPEC_HIDDEN; + /* Glyph shaping */ enum SCRIPT_JUSTIFY { diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ed38a6f..eb7a274 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -119,6 +119,7 @@ struct dwrite_fontface { DWRITE_FONT_METRICS1 metrics; struct dwrite_fonttable cmap; + struct ft_fontface *ft; }; struct dwrite_fontfile { @@ -254,6 +255,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace2 *iface) if (This->files[i]) IDWriteFontFile_Release(This->files[i]); } + release_ft_fontface(This->ft); heap_free(This); } @@ -1928,9 +1930,14 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFace2 **ret) { struct dwrite_fontface *fontface; + const void *data_ptr; HRESULT hr = S_OK; + void *context; + UINT64 size; int i; + *ret = NULL; + fontface = heap_alloc(sizeof(struct dwrite_fontface)); if (!fontface) return E_OUTOFMEMORY; @@ -1954,6 +1961,7 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW fontface->cmap.size = 0; fontface->index = index; fontface->simulations = simulations; + fontface->ft = NULL; for (i = 0; i < fontface->file_count; i++) { hr = get_stream_from_file(font_files[i], &fontface->streams[i]); @@ -1968,8 +1976,25 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW get_font_properties_from_stream(fontface->streams[0], facetype, index, &fontface->metrics, NULL, NULL, NULL); + hr = IDWriteFontFileStream_GetFileSize(fontface->streams[0], &size); + if (FAILED(hr)) + goto fail; + + hr = IDWriteFontFileStream_ReadFileFragment(fontface->streams[0], &data_ptr, 0, size, &context); + if (FAILED(hr)) + goto fail; + + hr = alloc_ft_fontface(data_ptr, size, fontface->index, &fontface->ft); + IDWriteFontFileStream_ReleaseFileFragment(fontface->streams[0], context); + if (FAILED(hr)) + goto fail; + *ret = &fontface->IDWriteFontFace2_iface; return S_OK; + +fail: + IDWriteFontFace2_Release(&fontface->IDWriteFontFace2_iface); + return hr; } /* IDWriteLocalFontFileLoader and its required IDWriteFontFileStream */ diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c new file mode 100644 index 0000000..86d85b3 --- /dev/null +++ b/dlls/dwrite/freetype.c @@ -0,0 +1,138 @@ +/* + * FreeType integration + * + * Copyright 2014 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifdef HAVE_FT2BUILD_H +#include <ft2build.h> +#include FT_FREETYPE_H +#endif /* HAVE_FT2BUILD_H */ + +#include "windef.h" +#include "wine/library.h" +#include "wine/debug.h" + +#include "dwrite_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dwrite); + +#ifdef HAVE_FREETYPE + +static void *ft_handle = NULL; +static FT_Library library = 0; +typedef struct +{ + FT_Int major; + FT_Int minor; + FT_Int patch; +} FT_Version_t; + +#define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL +MAKE_FUNCPTR(FT_Done_Face); +MAKE_FUNCPTR(FT_Init_FreeType); +MAKE_FUNCPTR(FT_Library_Version); +MAKE_FUNCPTR(FT_New_Memory_Face); +#undef MAKE_FUNCPTR + +struct ft_fontface +{ + FT_Face face; +}; + +BOOL init_freetype(void) +{ + FT_Version_t FT_Version; + + ft_handle = wine_dlopen(SONAME_LIBFREETYPE, RTLD_NOW, NULL, 0); + if (!ft_handle) { + WINE_MESSAGE("Wine cannot find the FreeType font library.\n"); + return FALSE; + } + +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ft_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} + LOAD_FUNCPTR(FT_Done_Face) + LOAD_FUNCPTR(FT_Init_FreeType) + LOAD_FUNCPTR(FT_Library_Version) + LOAD_FUNCPTR(FT_New_Memory_Face) +#undef LOAD_FUNCPTR + + if (pFT_Init_FreeType(&library) != 0) { + ERR("Can't init FreeType library\n"); + wine_dlclose(ft_handle, NULL, 0); + ft_handle = NULL; + return FALSE; + } + pFT_Library_Version(library, &FT_Version.major, &FT_Version.minor, &FT_Version.patch); + + TRACE("FreeType version is %d.%d.%d\n", FT_Version.major, FT_Version.minor, FT_Version.patch); + return TRUE; + +sym_not_found: + WINE_MESSAGE("Wine cannot find certain functions that it needs from FreeType library.\n"); + wine_dlclose(ft_handle, NULL, 0); + ft_handle = NULL; + return FALSE; +} + +HRESULT alloc_ft_fontface(const void *data_ptr, UINT32 data_size, UINT32 index, struct ft_fontface **ftface) +{ + FT_Face face; + FT_Error err; + + *ftface = heap_alloc_zero(sizeof(struct ft_fontface)); + if (!*ftface) + return E_OUTOFMEMORY; + + err = pFT_New_Memory_Face(library, data_ptr, data_size, index, &face); + if (err) { + ERR("FT_New_Memory_Face rets %d\n", err); + return E_FAIL; + } + (*ftface)->face = face; + + return S_OK; +} + +void release_ft_fontface(struct ft_fontface *ftface) +{ + if (!ftface) return; + pFT_Done_Face(ftface->face); + heap_free(ftface); +} + +#else /* HAVE_FREETYPE */ + +BOOL init_freetype(void) +{ + return FALSE; +} + +HRESULT alloc_ft_fontface(const void *data_ptr, UINT32 data_size, UINT32 index, struct ft_fontface **face) +{ + *face = NULL; + return S_FALSE; +} + +void release_ft_fontface(struct ft_fontface *face) +{ +} + +#endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 1292086..79aa7d0 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -45,6 +45,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); + init_freetype(); break; case DLL_PROCESS_DETACH: if (reserved) break;

1 0

Jacek Caban : mshtml: Added nsIURI::GetPrePath implementation.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 9a68ef40dd25394dcf396342b8d7ea5a26d9378a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a68ef40dd25394dcf396342b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 14:45:35 2014 +0100 mshtml: Added nsIURI::GetPrePath implementation. --- dlls/mshtml/nsio.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c016914..d8e1712 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2076,8 +2076,42 @@ static nsresult NSAPI nsURI_SetSpec(nsIFileURL *iface, const nsACString *aSpec) static nsresult NSAPI nsURI_GetPrePath(nsIFileURL *iface, nsACString *aPrePath) { nsWineURI *This = impl_from_nsIFileURL(iface); - FIXME("(%p)->(%p)\n", This, aPrePath); - return NS_ERROR_NOT_IMPLEMENTED; + IUriBuilder *uri_builder; + BSTR display_uri; + IUri *uri; + int len; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, aPrePath); + + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = CreateIUriBuilder(This->uri, 0, 0, &uri_builder); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + hres = IUriBuilder_RemoveProperties(uri_builder, Uri_HAS_PATH|Uri_HAS_QUERY|Uri_HAS_FRAGMENT); + if(SUCCEEDED(hres)) + hres = IUriBuilder_CreateUriSimple(uri_builder, 0, 0, &uri); + IUriBuilder_Release(uri_builder); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + hres = IUri_GetDisplayUri(uri, &display_uri); + IUri_Release(uri); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + /* Remove trailing slash that may be appended as default path. */ + len = SysStringLen(display_uri); + if(len && display_uri[len-1] == '/') + display_uri[len-1] = 0; + + nsres = return_wstr_nsacstr(aPrePath, display_uri, -1); + SysFreeString(display_uri); + return nsres; } static nsresult NSAPI nsURI_GetScheme(nsIFileURL *iface, nsACString *aScheme)

1 0

Jacek Caban : mshtml: Added missing nsIHttpChannelInternal functions.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: bcce460f9ed667e037afade8882682c310c516c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcce460f9ed667e037afade88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 14:45:27 2014 +0100 mshtml: Added missing nsIHttpChannelInternal functions. --- dlls/mshtml/nsio.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9216c1f..c016914 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1824,6 +1824,43 @@ static nsresult NSAPI nsHttpChannelInternal_SetLoadUnblocked(nsIHttpChannelInter return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsHttpChannelInternal_GetResponseTimeoutEnabled(nsIHttpChannelInternal *iface, + cpp_bool *aResponseTimeoutEnabled) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aResponseTimeoutEnabled); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_SetResponseTimeoutEnabled(nsIHttpChannelInternal *iface, + cpp_bool aResponseTimeoutEnabled) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%x)\n", This, aResponseTimeoutEnabled); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_GetApiRedirectToURI(nsIHttpChannelInternal *iface, nsIURI **aApiRedirectToURI) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aApiRedirectToURI); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_AddRedirect(nsIHttpChannelInternal *iface, nsIPrincipal *aPrincipal) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aPrincipal); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_GetLastModifiedTime(nsIHttpChannelInternal *iface, PRTime *aLastModifiedTime) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aLastModifiedTime); + return NS_ERROR_NOT_IMPLEMENTED; +} + static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_QueryInterface, nsHttpChannelInternal_AddRef, @@ -1851,7 +1888,12 @@ static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_GetLoadAsBlocking, nsHttpChannelInternal_SetLoadAsBlocking, nsHttpChannelInternal_GetLoadUnblocked, - nsHttpChannelInternal_SetLoadUnblocked + nsHttpChannelInternal_SetLoadUnblocked, + nsHttpChannelInternal_GetResponseTimeoutEnabled, + nsHttpChannelInternal_SetResponseTimeoutEnabled, + nsHttpChannelInternal_GetApiRedirectToURI, + nsHttpChannelInternal_AddRedirect, + nsHttpChannelInternal_GetLastModifiedTime };

1 0

Ralf Habacker : comdlg32: Update dmFormName when changing paper size in print UI.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 2b9d337f6d7848cde660ddc41c419eaefc446eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9d337f6d7848cde660ddc41… Author: Ralf Habacker <ralf.habacker(a)freenet.de> Date: Thu Nov 20 14:03:33 2014 +0100 comdlg32: Update dmFormName when changing paper size in print UI. --- dlls/comdlg32/printdlg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index d52b47d..bedd9c4 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1798,10 +1798,12 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, case cmb2: /* Papersize */ { DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0); - if(Sel != CB_ERR) + if(Sel != CB_ERR) { lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, Sel, 0); + GetDlgItemTextA(hDlg, cmb2, (char *)lpdm->dmFormName, CCHFORMNAME); + } } break; @@ -1954,10 +1956,12 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, case cmb2: /* Papersize */ { DWORD Sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0); - if(Sel != CB_ERR) + if(Sel != CB_ERR) { lpdm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, Sel, 0); + GetDlgItemTextW(hDlg, cmb2, lpdm->dmFormName, CCHFORMNAME); + } } break;

1 0

Jactry Zeng : explorer: Remove unnecessary backslash when parsing / select and /root.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: eaa747311fb13e6e6bf5753afe91bb0016b5d8c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa747311fb13e6e6bf5753af… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Nov 20 21:22:29 2014 +0800 explorer: Remove unnecessary backslash when parsing /select and /root. --- programs/explorer/explorer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 1b900d0..a4f93bc 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -639,6 +639,7 @@ static int copy_path_string(LPWSTR target, LPWSTR source) while (*source && *source != ',') target[i++] = *source++; target[i] = 0; } + PathRemoveBackslashW(target); return i; }

1 0

Michael Stefaniuc : shell32/tests: Fix a copy and paste error (PVS-Studio) .
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 61ed9130bf5d76ede29ef83c99fccb14ad93247a URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ed9130bf5d76ede29ef83c9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 20 13:43:54 2014 +0100 shell32/tests: Fix a copy and paste error (PVS-Studio). --- dlls/shell32/tests/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 51de635..07e4ee2 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -251,7 +251,7 @@ static void test_get_file_info(void) ok(rc == 1, "SHGetFileInfoA(c:\\nonexistent) should return 1, got 0x%x\n", rc); if (rc) { - ok(strcpy(shfi.szDisplayName, "dummy") != 0, "SHGetFileInfoA(c:\\nonexistent) displayname is not set\n"); + ok(strcmp(shfi.szDisplayName, "dummy"), "SHGetFileInfoA(c:\\nonexistent) displayname is not set\n"); ok(shfi.iIcon != 0xdeadbeef, "SHGetFileInfoA(c:\\nonexistent) iIcon is not set\n"); }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2014