December 2013 - Wine-Commits

Stefan Dösinger : wined3d: Remove a useless comment.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 60ecf707a798f3417f16e29c4336f3df14791f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ecf707a798f3417f16e29c4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 29 12:59:16 2013 +0100 wined3d: Remove a useless comment. --- dlls/wined3d/surface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5ff3b0d..02f1299 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3437,7 +3437,6 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined return WINED3D_OK; } -/* Read the framebuffer back into the surface */ static void read_from_framebuffer(struct wined3d_surface *surface) { struct wined3d_device *device = surface->resource.device;

1 0

Henri Verbeet : ddraw: Use hr_ddraw_from_wined3d() in ddraw_surface_create( ).
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: d56b7c20160fbaaecf36ce1e4279a82576000f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56b7c20160fbaaecf36ce1e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 2 12:07:35 2013 +0100 ddraw: Use hr_ddraw_from_wined3d() in ddraw_surface_create(). --- dlls/ddraw/surface.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e94876f..29385b7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5698,7 +5698,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { ERR("Failed to get display mode, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, texture); - return hr; + return hr_ddraw_from_wined3d(hr); } /* No pixelformat given? Use the current screen format. */ @@ -5757,7 +5757,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { ERR("Failed to reset device.\n"); HeapFree(GetProcessHeap(), 0, texture); - return hr; + return hr_ddraw_from_wined3d(hr); } } } @@ -5906,18 +5906,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); - switch (hr) - { - case WINED3DERR_INVALIDCALL: - hr = DDERR_INVALIDPARAMS; - break; - - default: - FIXME("Unexpected wined3d error %#x.\n", hr); - break; - } HeapFree(GetProcessHeap(), 0, texture); - return hr; + return hr_ddraw_from_wined3d(hr); } resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); @@ -6006,6 +5996,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) { HeapFree(GetProcessHeap(), 0, texture); + hr = hr_ddraw_from_wined3d(hr); goto fail; }

1 0

Francois Gouget : comctl32: TTM_ADDTOOLW must refuse to set a tooltip text to NULL.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 542652deab875c3966424dc831e0fea010ed0f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=542652deab875c3966424dc83… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 29 18:55:36 2013 +0100 comctl32: TTM_ADDTOOLW must refuse to set a tooltip text to NULL. --- dlls/comctl32/status.c | 2 + dlls/comctl32/tests/tooltips.c | 2 +- dlls/comctl32/tooltips.c | 47 ++++++++++++++++++++++----------------- dlls/comctl32/trackbar.c | 4 ++- 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index c4efedb..4528e24 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -700,10 +700,12 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) if (infoPtr->hwndToolTip) { INT nTipCount; TTTOOLINFOW ti; + WCHAR wEmpty = 0; ZeroMemory (&ti, sizeof(TTTOOLINFOW)); ti.cbSize = sizeof(TTTOOLINFOW); ti.hwnd = infoPtr->Self; + ti.lpszText = &wEmpty; nTipCount = SendMessageW (infoPtr->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0); if (nTipCount < infoPtr->numParts) { diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index d5f97b3..63436e0 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -420,7 +420,7 @@ static void test_gettext(void) toolinfoW.lParam = 0xdeadbeef; GetClientRect(hwnd, &toolinfoW.rect); r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); - todo_wine ok(!r, "Adding the tool to the tooltip failed\n"); + ok(!r, "Adding the tool to the tooltip succeeded!\n"); if (0) /* crashes on NT4 */ { diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index a325bcc..f74ea65 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1037,6 +1037,9 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) infoPtr->hwndSelf, ti->hwnd, ti->uId, (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); + if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW) + return FALSE; + if (infoPtr->uNumTools == 0) { infoPtr->tools = Alloc (sizeof(TTTOOL_INFO)); toolPtr = infoPtr->tools; @@ -1060,27 +1063,29 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->rect = ti->rect; toolPtr->hinst = ti->hinst; - if (IS_INTRESOURCE(ti->lpszText)) { - TRACE("add string id %x\n", LOWORD(ti->lpszText)); - toolPtr->lpszText = ti->lpszText; - } - else if (ti->lpszText) { - if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) { - TRACE("add CALLBACK!\n"); - toolPtr->lpszText = LPSTR_TEXTCALLBACKW; - } - else if (isW) { - INT len = lstrlenW (ti->lpszText); - TRACE("add text %s!\n", debugstr_w(ti->lpszText)); - toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); - strcpyW (toolPtr->lpszText, ti->lpszText); - } - else { - INT len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, NULL, 0); - TRACE("add text \"%s\"!\n", (LPSTR)ti->lpszText); - toolPtr->lpszText = Alloc (len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, toolPtr->lpszText, len); - } + if (ti->cbSize >= TTTOOLINFOW_V1_SIZE) { + if (IS_INTRESOURCE(ti->lpszText)) { + TRACE("add string id %x\n", LOWORD(ti->lpszText)); + toolPtr->lpszText = ti->lpszText; + } + else if (ti->lpszText) { + if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) { + TRACE("add CALLBACK!\n"); + toolPtr->lpszText = LPSTR_TEXTCALLBACKW; + } + else if (isW) { + INT len = lstrlenW (ti->lpszText); + TRACE("add text %s!\n", debugstr_w(ti->lpszText)); + toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); + strcpyW (toolPtr->lpszText, ti->lpszText); + } + else { + INT len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, NULL, 0); + TRACE("add text \"%s\"!\n", (LPSTR)ti->lpszText); + toolPtr->lpszText = Alloc (len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, toolPtr->lpszText, len); + } + } } if (ti->cbSize >= TTTOOLINFOW_V2_SIZE) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 9673771..6d092a3 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1525,11 +1525,13 @@ TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) hwnd, 0, 0, 0); if (infoPtr->hwndToolTip) { - TTTOOLINFOW ti; + TTTOOLINFOW ti; + WCHAR wEmpty = 0; ZeroMemory (&ti, sizeof(ti)); ti.cbSize = sizeof(ti); ti.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_ABSOLUTE; ti.hwnd = hwnd; + ti.lpszText = &wEmpty; SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW, 0, (LPARAM)&ti); }

1 0

Alexandre Julliard : makedep: Don' t look for header files in the build directories.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 202d046d685802640675651b3c039bf800e9732b URL: http://source.winehq.org/git/wine.git/?a=commit;h=202d046d685802640675651b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 30 12:50:30 2013 +0100 makedep: Don't look for header files in the build directories. --- tools/makedep.c | 62 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 23 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 692ee58..164b7e4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -88,7 +88,7 @@ struct strarray const char **str; }; -static struct strarray paths; +static struct strarray include_args; static struct strarray object_extensions; static const char *src_dir; @@ -574,20 +574,13 @@ static FILE *open_include_file( struct incl_file *pFile ) free( filename ); } - /* first try name as is */ - if ((file = fopen( pFile->name, "r" ))) - { - pFile->filename = xstrdup( pFile->name ); - return file; - } - /* now try in source dir */ if (src_dir) - { filename = strmake( "%s/%s", src_dir, pFile->name ); - if ((file = fopen( filename, "r" ))) goto found; - free( filename ); - } + else + filename = xstrdup( pFile->name ); + if ((file = fopen( filename, "r" ))) goto found; + free( filename ); /* now try in parent source dir */ if (parent_dir) @@ -621,6 +614,27 @@ static FILE *open_include_file( struct incl_file *pFile ) free( filename ); } + /* check for corresponding .in file in global includes (for config.h.in) */ + + if (strendswith( pFile->name, ".h" )) + { + filename = replace_extension( pFile->name, 2, ".h.in" ); + if (top_src_dir) + filename = strmake( "%s/include/%s", top_src_dir, filename ); + else if (top_obj_dir) + filename = strmake( "%s/include/%s", top_obj_dir, filename ); + else + filename = NULL; + + if (filename && (file = fopen( filename, "r" ))) + { + pFile->sourcename = filename; + pFile->filename = strmake( "%s/include/%s", top_obj_dir, pFile->name ); + return file; + } + free( filename ); + } + /* check for corresponding .x file in global includes */ if (strendswith( pFile->name, "tmpl.h" )) @@ -643,16 +657,17 @@ static FILE *open_include_file( struct incl_file *pFile ) } /* now search in include paths */ - for (i = 0; i < paths.count; i++) + for (i = 0; i < include_args.count; i++) { - if (paths.str[i][0] == '/') + const char *dir = include_args.str[i] + 2; /* skip -I */ + if (*dir == '/') { /* ignore absolute paths that don't point into the source dir */ if (!top_src_dir) continue; - if (strncmp( paths.str[i], top_src_dir, strlen(top_src_dir) )) continue; - if (paths.str[i][strlen(top_src_dir)] != '/') continue; + if (strncmp( dir, top_src_dir, strlen(top_src_dir) )) continue; + if (dir[strlen(top_src_dir)] != '/') continue; } - filename = strmake( "%s/%s", paths.str[i], pFile->name ); + filename = strmake( "%s/%s", dir, pFile->name ); if ((file = fopen( filename, "r" ))) goto found; free( filename ); } @@ -1155,7 +1170,8 @@ static void output_sources(void) if (src_dir) output_filename( strmake( "-I%s/%s", src_dir, parent_dir ), &column ); else output_filename( strmake( "-I%s", parent_dir ), &column ); } - for (i = 0; i < paths.count; i++) output_filename( strmake( "-I%s", paths.str[i] ), &column ); + if (top_src_dir && top_obj_dir) output_filename( strmake( "-I%s/include", top_obj_dir ), &column ); + for (i = 0; i < include_args.count; i++) output_filename( include_args.str[i], &column ); output( "\n" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) @@ -1436,7 +1452,7 @@ static void output_dependencies(void) } fclose( output_file ); output_file = tmp_file; - if (!found && list_head(&sources)) output( "\n%s\n", Separator ); + if (!found && !list_empty(&sources)) output( "\n%s\n", Separator ); } else { @@ -1444,7 +1460,7 @@ static void output_dependencies(void) fatal_perror( "%s", OutputFileName ); } - output_sources(); + if (!list_empty( &sources )) output_sources(); fclose( output_file ); output_file = NULL; @@ -1476,7 +1492,7 @@ static void parse_option( const char *opt ) switch(opt[1]) { case 'I': - if (opt[2]) strarray_add( &paths, xstrdup( opt + 2 )); + if (opt[2]) strarray_add( &include_args, opt ); break; case 'C': src_dir = opt + 2; @@ -1548,8 +1564,8 @@ int main( int argc, char *argv[] ) if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; - if (top_src_dir) strarray_insert( &paths, 0, strmake( "%s/include", top_src_dir )); - if (top_obj_dir) strarray_insert( &paths, 0, strmake( "%s/include", top_obj_dir )); + if (top_src_dir) strarray_insert( &include_args, 0, strmake( "-I%s/include", top_src_dir )); + else if (top_obj_dir) strarray_insert( &include_args, 0, strmake( "-I%s/include", top_obj_dir )); /* set the default extension list for object files */ if (!object_extensions.count) strarray_add( &object_extensions, "o" );

1 0

Alexandre Julliard : makefiles: Include AUTHORS file directly from the top-level directory.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: bc9650392ab72551c583c89afe464a94837e9a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9650392ab72551c583c89af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 30 12:43:20 2013 +0100 makefiles: Include AUTHORS file directly from the top-level directory. --- .gitignore | 1 - configure | 3 --- configure.ac | 1 - dlls/shell32/Makefile.in | 2 ++ tools/make_makefiles | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7cd10bb..63eba1c 100644 --- a/.gitignore +++ b/.gitignore @@ -126,7 +126,6 @@ dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c dlls/scrrun/scrrun.h dlls/scrrun/tests/scrrun.h -dlls/shell32/AUTHORS dlls/sti/sti_wia.h dlls/sti/sti_wia_p.c dlls/urlmon/urlmon_urlmon.h diff --git a/configure b/configure index 9b2f2c2..23eeb92 100755 --- a/configure +++ b/configure @@ -16679,8 +16679,6 @@ all: Makefile Makefile: Makefile.in Make.vars.in Make.rules config.status @./config.status Make.tmp Makefile" -ac_config_links="$ac_config_links dlls/shell32/AUTHORS:AUTHORS" -wine_fn_config_symlink -d dlls/shell32 dlls/shell32/AUTHORS if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" @@ -18286,7 +18284,6 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; - "dlls/shell32/AUTHORS") CONFIG_LINKS="$CONFIG_LINKS dlls/shell32/AUTHORS:AUTHORS" ;; "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; diff --git a/configure.ac b/configure.ac index c4021b4..d091370 100644 --- a/configure.ac +++ b/configure.ac @@ -2669,7 +2669,6 @@ all: Makefile Makefile: Makefile.in Make.vars.in Make.rules config.status @./config.status Make.tmp Makefile]) -WINE_CONFIG_SYMLINK(dlls/shell32,,[AUTHORS]) WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(po,po,[LINGUAS]) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index fb9b2c7..1303a10 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -4,6 +4,8 @@ IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 EXTRALIBS = @CORESERVICESLIB@ +# AUTHORS file is in the top-level directory +EXTRAINCL = -I$(top_srcdir) C_SRCS = \ appbar.c \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 0057c1d..d24dffc 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -87,7 +87,6 @@ my @ignores = ( "Makefile", "dlldata.c", "dlls/*/*.def", - "dlls/shell32/AUTHORS", "*/*/tests/testlist.c", "include/config.h", "include/stamp-h",

1 0

Alexandre Julliard : configure: Update FreeType configure checks for the changed headers location.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 67f9b6e3c5d2397446d39ab454f691c1ee46d2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67f9b6e3c5d2397446d39ab45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 30 11:22:25 2013 +0100 configure: Update FreeType configure checks for the changed headers location. --- configure | 78 ++++++++++++++---------------------------------- configure.ac | 40 ++++++------------------- dlls/gdi32/freetype.c | 62 +++++++++++++------------------------- include/config.h.in | 33 -------------------- 4 files changed, 54 insertions(+), 159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67f9b6e3c5d2397446d39…

1 0

Hans Leidekker : msi: Fix handling of empty mask edit templates.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 3271b982632e7730d6cee373f4c9a4af37012036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3271b982632e7730d6cee373f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 2 11:18:06 2013 +0100 msi: Fix handling of empty mask edit templates. --- dlls/msi/dialog.c | 59 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 42 insertions(+), 17 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 245ed1e..baa6890 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1822,24 +1822,33 @@ static void msi_mask_control_change( struct msi_maskedit_info *info ) val = msi_alloc( (info->num_chars+1)*sizeof(WCHAR) ); for( i=0, n=0; i<info->num_groups; i++ ) { - if( (info->group[i].len + n) > info->num_chars ) + if (info->group[i].len == ~0u) { - ERR("can't fit control %d text into template\n",i); - break; - } - if (!msi_mask_editable(info->group[i].type)) - { - for(r=0; r<info->group[i].len; r++) - val[n+r] = info->group[i].type; - val[n+r] = 0; + UINT len = SendMessageW( info->group[i].hwnd, WM_GETTEXTLENGTH, 0, 0 ); + val = msi_realloc( val, (len + 1) * sizeof(WCHAR) ); + GetWindowTextW( info->group[i].hwnd, val, len + 1 ); } else { - r = GetWindowTextW( info->group[i].hwnd, &val[n], info->group[i].len+1 ); - if( r != info->group[i].len ) + if (info->group[i].len + n > info->num_chars) + { + ERR("can't fit control %d text into template\n",i); break; + } + if (!msi_mask_editable(info->group[i].type)) + { + for(r=0; r<info->group[i].len; r++) + val[n+r] = info->group[i].type; + val[n+r] = 0; + } + else + { + r = GetWindowTextW( info->group[i].hwnd, &val[n], info->group[i].len+1 ); + if( r != info->group[i].len ) + break; + } + n += r; } - n += r; } TRACE("%d/%d controls were good\n", i, info->num_groups); @@ -1934,14 +1943,14 @@ msi_maskedit_set_text( struct msi_maskedit_info *info, LPCWSTR text ) static struct msi_maskedit_info * msi_dialog_parse_groups( LPCWSTR mask ) { - struct msi_maskedit_info * info = NULL; + struct msi_maskedit_info *info; int i = 0, n = 0, total = 0; LPCWSTR p; TRACE("masked control, template %s\n", debugstr_w(mask)); if( !mask ) - return info; + return NULL; info = msi_alloc_zero( sizeof *info ); if( !info ) @@ -1957,7 +1966,16 @@ static struct msi_maskedit_info * msi_dialog_parse_groups( LPCWSTR mask ) { /* stop at the end of the string */ if( p[0] == 0 || p[0] == '>' ) + { + if (!total) + { + /* create a group for the empty mask */ + info->group[0].type = '&'; + info->group[0].len = ~0u; + i = 1; + } break; + } /* count the number of the same identifier */ for( n=0; p[n] == p[0]; n++ ) @@ -2003,9 +2021,16 @@ msi_maskedit_create_children( struct msi_maskedit_info *info, LPCWSTR font ) { if (!msi_mask_editable( info->group[i].type )) continue; - wx = (info->group[i].ofs * width) / info->num_chars; - ww = (info->group[i].len * width) / info->num_chars; - + if (info->num_chars) + { + wx = (info->group[i].ofs * width) / info->num_chars; + ww = (info->group[i].len * width) / info->num_chars; + } + else + { + wx = 0; + ww = width; + } hwnd = CreateWindowW( szEdit, NULL, style, wx, 0, ww, height, info->hwnd, NULL, NULL, NULL ); if( !hwnd )

1 0

Henri Verbeet : wined3d: Properly check for the front buffer in d3dfmt_get_conv().
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 7052c87358ee3d54fc07cd4ae26f9cc21c530323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7052c87358ee3d54fc07cd4ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 2 12:07:34 2013 +0100 wined3d: Properly check for the front buffer in d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ac168dd..ccf6249 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1823,7 +1823,7 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ * in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which * conflicts with this. */ - if (!((blit_supported && device->fb.render_targets && surface == device->fb.render_targets[0])) + if (!((blit_supported && surface->swapchain && surface == surface->swapchain->front_buffer)) || colorkey_active || !use_texturing) { format->glFormat = GL_RGBA;

1 0

Andrey Gusev : d3dcompiler_43: Fix a typo.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 1f29734b185fa06759c38075cb9f3bd9abbef45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f29734b185fa06759c38075c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 30 23:54:51 2013 +0200 d3dcompiler_43: Fix a typo. --- dlls/d3dcompiler_43/reflection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 9d59ce4..e2955f0 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -182,7 +182,7 @@ static BOOL copy_value(const char *ptr, void **value, DWORD size) *value = HeapAlloc(GetProcessHeap(), 0, size); if (!*value) { - ERR("Failed to allocate vlaue memory.\n"); + ERR("Failed to allocate value memory.\n"); return FALSE; }

1 0

Andrey Gusev : d3d11: Add version.rc file.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: f5be799b07fda8d79e53fd6cc981dc777c92d19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5be799b07fda8d79e53fd6cc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 30 01:56:03 2013 +0200 d3d11: Add version.rc file. --- dlls/d3d11/Makefile.in | 2 ++ dlls/d3d11/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in index da7bbe6..d8ca7fb 100644 --- a/dlls/d3d11/Makefile.in +++ b/dlls/d3d11/Makefile.in @@ -3,4 +3,6 @@ MODULE = d3d11.dll C_SRCS = \ d3d11_main.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ diff --git a/dlls/d3d11/version.rc b/dlls/d3d11/version.rc new file mode 100644 index 0000000..4246bda --- /dev/null +++ b/dlls/d3d11/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2013 Andrey Gusev + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Direct3D" +#define WINE_FILENAME_STR "d3d11.dll" +#define WINE_FILEVERSION 7,0,6002,18107 +#define WINE_FILEVERSION_STR "7.0.6002.18107" +#define WINE_PRODUCTVERSION 7,0,6002,18107 +#define WINE_PRODUCTVERSION_STR "7.0.6002.18107" + +#include "wine/wine_common_ver.rc"

1 0