wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Alexandre Julliard : server: Add a helper function for the common functionality between open_key and create_key .
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: 606cc0614840459be900628e48be3638cc40a781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=606cc0614840459be900628e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 4 20:46:42 2010 +0100 server: Add a helper function for the common functionality between open_key and create_key. --- server/registry.c | 66 +++++++++++++++++++++++++---------------------------- 1 files changed, 31 insertions(+), 35 deletions(-) diff --git a/server/registry.c b/server/registry.c index ad57bd2..c342603 100644 --- a/server/registry.c +++ b/server/registry.c @@ -643,33 +643,45 @@ static struct key *follow_symlink( struct key *key, int iteration ) return key; } -/* open a subkey */ -static struct key *open_key( struct key *key, const struct unicode_str *name, unsigned int access, - unsigned int attributes ) +/* open a key until we find an element that doesn't exist */ +/* helper for open_key and create_key */ +static struct key *open_key_prefix( struct key *key, const struct unicode_str *name, + unsigned int access, struct unicode_str *token, int *index ) { - int index; - struct unicode_str token; - - token.str = NULL; - if (!get_path_token( name, &token )) return NULL; - if (access & KEY_WOW64_32KEY) key = find_wow64_subkey( key, &token ); - while (token.len) + token->str = NULL; + if (!get_path_token( name, token )) return NULL; + if (access & KEY_WOW64_32KEY) key = find_wow64_subkey( key, token ); + while (token->len) { - if (!(key = find_subkey( key, &token, &index ))) - { - set_error( STATUS_OBJECT_NAME_NOT_FOUND ); - return NULL; - } - get_path_token( name, &token ); - if (!token.len) break; - if (!(access & KEY_WOW64_64KEY)) key = find_wow64_subkey( key, &token ); + struct key *subkey; + if (!(subkey = find_subkey( key, token, index ))) break; + key = subkey; + get_path_token( name, token ); + if (!token->len) break; + if (!(access & KEY_WOW64_64KEY)) key = find_wow64_subkey( key, token ); if (!(key = follow_symlink( key, 0 ))) { set_error( STATUS_OBJECT_NAME_NOT_FOUND ); return NULL; } } + return key; +} +/* open a subkey */ +static struct key *open_key( struct key *key, const struct unicode_str *name, unsigned int access, + unsigned int attributes ) +{ + int index; + struct unicode_str token; + + if (!(key = open_key_prefix( key, name, access, &token, &index ))) return NULL; + + if (token.len) + { + set_error( STATUS_OBJECT_NAME_NOT_FOUND ); + return NULL; + } if (!(access & KEY_WOW64_64KEY)) key = find_wow64_subkey( key, &token ); if (!(attributes & OBJ_OPENLINK) && !(key = follow_symlink( key, 0 ))) { @@ -695,24 +707,8 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, return NULL; } - token.str = NULL; - if (!get_path_token( name, &token )) return NULL; *created = 0; - if (access & KEY_WOW64_32KEY) key = find_wow64_subkey( key, &token ); - while (token.len) - { - struct key *subkey; - if (!(subkey = find_subkey( key, &token, &index ))) break; - key = subkey; - get_path_token( name, &token ); - if (!token.len) break; - if (!(access & KEY_WOW64_64KEY)) key = find_wow64_subkey( key, &token ); - if (!(key = follow_symlink( key, 0 ))) - { - set_error( STATUS_OBJECT_NAME_NOT_FOUND ); - return NULL; - } - } + if (!(key = open_key_prefix( key, name, access, &token, &index ))) return NULL; if (!token.len) /* the key already exists */ {

1 0

Joris Huizer : mshtml: create_channelbsc: Handle OOM case correctly.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: b6f2919b9094c1291e046c270a885c0afb8d13ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f2919b9094c1291e046c270… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Thu Mar 4 12:39:18 2010 +0100 mshtml: create_channelbsc: Handle OOM case correctly. --- dlls/mshtml/navigate.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 16d38a1..a09ea7f 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1136,7 +1136,8 @@ HRESULT create_channelbsc(IMoniker *mon, WCHAR *headers, BYTE *post_data, DWORD if(post_data) { ret->bsc.post_data = GlobalAlloc(0, post_data_size); - if(!ret->bsc.headers) { + if(!ret->bsc.post_data) { + heap_free(ret->bsc.headers); IBindStatusCallback_Release(STATUSCLB(&ret->bsc)); return E_OUTOFMEMORY; }

1 0

Jeff Latimer : usp10: Remove duplicate code.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 3b6498a520575fbcf7cad302935a974ca408f878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6498a520575fbcf7cad3029… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Mar 4 23:47:20 2010 +1100 usp10: Remove duplicate code. --- dlls/usp10/usp10.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a8ae4ce..28984e0 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -592,8 +592,6 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem pItems[index].a.s.uBidiLevel = 1; pItems[index].a.eScript = New_Script; - if (New_Script == Script_Arabic) - pItems[index].a.s.uBidiLevel = 1; TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); }

1 0

Arjun Comar : cmd: Fix cmd to take /? as a help parameter.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: a607f53779e9cde1d706e9c2976889f13f292ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a607f53779e9cde1d706e9c29… Author: Arjun Comar <mandaya(a)rose-hulman.edu> Date: Tue Mar 2 16:26:09 2010 -0500 cmd: Fix cmd to take /? as a help parameter. --- programs/cmd/builtins.c | 4 ++-- programs/cmd/wcmdmain.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index fdb4404..15d320c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1134,12 +1134,12 @@ void WCMD_give_help (WCHAR *command) { else { for (i=0; i<=WCMD_EXIT; i++) { if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - param1, -1, inbuilt[i], -1) == 2) { + command, -1, inbuilt[i], -1) == 2) { WCMD_output_asis (WCMD_LoadMessage(i)); return; } } - WCMD_output (WCMD_LoadMessage(WCMD_NOCMDHELP), param1); + WCMD_output (WCMD_LoadMessage(WCMD_NOCMDHELP), command); } return; } diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index f97a1fd..b2243e3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1411,6 +1411,15 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, WCMD_parse (p, quals, param1, param2); WINE_TRACE("param1: %s, param2: %s\n", wine_dbgstr_w(param1), wine_dbgstr_w(param2)); + if((p[0] == '/') && (p[1] == '?')) { + + /*this is a help request for a program*/ + i = WCMD_HELP; + memcpy(p, whichcmd, count * sizeof(WCHAR)); + p[count] = '\0'; + + } + switch (i) { case WCMD_ATTRIB:

1 0

Nikolay Sivov : shell32: Use return value on failure updated in Vista+.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: fb45de3f66f0dafd64a101f3f4091f6b94998274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb45de3f66f0dafd64a101f3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 14:22:49 2010 +0300 shell32: Use return value on failure updated in Vista+. --- dlls/shell32/pidl.c | 2 +- dlls/shell32/tests/shlfolder.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index ecda891..99bbed8 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1333,7 +1333,7 @@ HRESULT WINAPI SHParseDisplayName(LPCWSTR name, IBindCtx *bindctx, LPITEMIDLIST *pidlist = NULL; - if (!name) return E_OUTOFMEMORY; + if (!name) return E_INVALIDARG; hr = SHGetDesktopFolder(&desktop); if (hr != S_OK) return hr; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 85f04a9..bce7c3e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2007,7 +2007,8 @@ if (0) pidl1 = (LPITEMIDLIST)0xdeadbeef; hr = pSHParseDisplayName(NULL, NULL, &pidl1, 0, NULL); - ok(hr == E_OUTOFMEMORY, "failed %08x\n", hr); + ok(broken(hr == E_OUTOFMEMORY) /* < Vista */ || + hr == E_INVALIDARG, "failed %08x\n", hr); ok(pidl1 == 0, "expected null ptr, got %p\n", pidl1); /* dummy name */

1 0

Henri Verbeet : wined3d: Split TEXT shader comments into separate lines.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: ba519be60f06ac0ed937b84dc058a74de9d23611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba519be60f06ac0ed937b84dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 4 12:19:56 2010 +0100 wined3d: Split TEXT shader comments into separate lines. Based on a patch by Christian Costa. --- dlls/wined3d/shader.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2dc9522..307cadf 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1231,7 +1231,27 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe fe->shader_read_comment(&ptr, &comment, &comment_size); if (comment) { - TRACE("// %s\n", debugstr_an(comment, comment_size)); + if (comment_size > 4 && *(const DWORD *)comment == WINEMAKEFOURCC('T', 'E', 'X', 'T')) + { + const char *end = comment + comment_size; + const char *ptr = comment + 4; + const char *line = ptr; + + TRACE("// TEXT\n"); + while (ptr != end) + { + if (*ptr == '\n') + { + UINT len = ptr - line; + if (len && *(ptr - 1) == '\r') --len; + TRACE("// %s\n", debugstr_an(line, len)); + line = ++ptr; + } + else ++ptr; + } + if (line != ptr) TRACE("// %s\n", debugstr_an(line, ptr - line)); + } + else TRACE("// %s\n", debugstr_an(comment, comment_size)); continue; }

1 0

Alexandre Julliard : advapi32/tests: Add a number of tests for Wow64 registry redirection.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: e7ff9925fbae520993112210d253253ec00016be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ff9925fbae520993112210d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 4 15:02:00 2010 +0100 advapi32/tests: Add a number of tests for Wow64 registry redirection. --- dlls/advapi32/tests/registry.c | 271 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 271 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7ff9925fbae520993112…

1 0

Alexandre Julliard : wine.inf: Create a few Wow64 symbolic links.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 562ba3c91c17e6bac91b68b7ae7a64de2e793427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=562ba3c91c17e6bac91b68b7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 4 14:17:23 2010 +0100 wine.inf: Create a few Wow64 symbolic links. --- tools/wine.inf.in | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e4e3829..4702761 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -75,6 +75,32 @@ AddReg=\ Timezones,\ VersionInfo +[DefaultInstall.ntamd64] +RegisterDlls=RegisterDllsSection +WineFakeDlls=FakeDllsSection +UpdateInis=SystemIni +AddReg=\ + Classes,\ + ContentIndex,\ + ControlClass,\ + CurrentVersion,\ + Debugger,\ + Desktop,\ + Metrics,\ + DirectX,\ + Fonts,\ + MCI,\ + Misc,\ + Nls,\ + OLE,\ + Printing,\ + Services, \ + SessionMgr,\ + Tapi,\ + Timezones,\ + VersionInfo,\ + Wow64 + [DefaultInstall.Services] AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService @@ -2868,3 +2894,9 @@ HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x300 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" + +[Wow64] +HKLM,Software\Classes\Wow6432Node\AppId,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Classes\AppId" +HKLM,Software\Classes\Wow6432Node\Protocols,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Classes\Protocols" +HKLM,Software\Classes\Wow6432Node\TypeLib,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Classes\TypeLib" +HKLM,Software\Wow6432Node\Classes,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Classes\Wow6432Node"

1 0

Yann Droneaud : aclocal.m4: Fix WINE_TRY_CFLAGS macro (LLVM/Clang).
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 5d3eacd25009dd531c52f4a08572eabf8a899810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d3eacd25009dd531c52f4a08… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Thu Mar 4 11:43:17 2010 +0100 aclocal.m4: Fix WINE_TRY_CFLAGS macro (LLVM/Clang). --- aclocal.m4 | 2 +- configure | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 7f5f040..1aba083 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -75,7 +75,7 @@ AC_DEFUN([WINE_TRY_CFLAGS], AC_CACHE_CHECK([whether the compiler supports $1], ac_var, [ac_wine_try_cflags_saved=$CFLAGS CFLAGS="$CFLAGS $1" -AC_LINK_IFELSE(AC_LANG_SOURCE([int main(int argc, char *argv[]) { return 0; }]), +AC_LINK_IFELSE(AC_LANG_SOURCE([[int main(int argc, char **argv) { return 0; }]]), [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) CFLAGS=$ac_wine_try_cflags_saved]) AS_IF([test AS_VAR_GET(ac_var) = yes], diff --git a/configure b/configure index 6d98218..48ad51a 100755 --- a/configure +++ b/configure @@ -6546,7 +6546,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,confest.so.1" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1=yes @@ -6571,7 +6571,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,-h,confest.so.1" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1=yes @@ -6598,7 +6598,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic,-z,defs" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs=yes @@ -6624,7 +6624,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic,-init,__wine_spec_init,-fini,__wine_spec_fini" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini=yes @@ -6651,7 +6651,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,--version-script=conftest.map" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map=yes @@ -6678,7 +6678,7 @@ else CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__Wl___export_dynamic=yes @@ -6706,7 +6706,7 @@ else CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_var=yes" @@ -6734,7 +6734,7 @@ else CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_var=yes" @@ -6763,7 +6763,7 @@ else CFLAGS="$CFLAGS -Wl,--enable-new-dtags" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wl___enable_new_dtags=yes @@ -6791,7 +6791,7 @@ else CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes @@ -11504,7 +11504,7 @@ else CFLAGS="$CFLAGS -fno-builtin" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fno_builtin=yes @@ -11530,7 +11530,7 @@ else CFLAGS="$CFLAGS -fno-strict-aliasing" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fno_strict_aliasing=yes @@ -11555,7 +11555,7 @@ else CFLAGS="$CFLAGS -Wdeclaration-after-statement" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wdeclaration_after_statement=yes @@ -11580,7 +11580,7 @@ else CFLAGS="$CFLAGS -Wstrict-prototypes" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wstrict_prototypes=yes @@ -11605,7 +11605,7 @@ else CFLAGS="$CFLAGS -Wtype-limits" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wtype_limits=yes @@ -11630,7 +11630,7 @@ else CFLAGS="$CFLAGS -Wwrite-strings" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wwrite_strings=yes @@ -11691,7 +11691,7 @@ else CFLAGS="$CFLAGS -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Werror=yes

1 0

Dylan Smith : gdi32: Provide a non-blank font face name for ANSI_FIXED_FONT .
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: e2d7da06047e40b6f3a0e174e22a70fe59d2c93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d7da06047e40b6f3a0e174e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Mar 4 05:17:29 2010 -0500 gdi32: Provide a non-blank font face name for ANSI_FIXED_FONT. This patch avoids using the wrong font when this stock font is selected, which could be seen by modifying notepad to send WM_SETFONT to the edit control with GetStockObject(ANSI_FIXED_FONT) for wParam. --- dlls/gdi32/gdiobj.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 3c8bdfa..3f84f9c 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -89,7 +89,8 @@ static const LOGFONTW OEMFixedFont = static const LOGFONTW AnsiFixedFont = { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, {'\0'} }; + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, + {'C','o','u','r','i','e','r','\0'} }; static const LOGFONTW AnsiVarFont = { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
92
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 March 2010