March 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : wine.inf: Create empty keys for all entries that are shared in Wow64.
by Alexandre Julliard March 5, 2010

March 5, 2010

Module: wine Branch: master Commit: 835895f285d757c69777e8bc859fdf1d7dd72fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=835895f285d757c69777e8bc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 4 20:48:57 2010 +0100 wine.inf: Create empty keys for all entries that are shared in Wow64. --- tools/wine.inf.in | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 4702761..bc695e6 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -136,6 +136,7 @@ HKCR,chm.file\shell\open\command,,2,"%10%\hh.exe %1" HKCR,cplfile,,2,"Control Panel Item" HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel" HKCR,cplfile\shell\cplopen\command,,2,"rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*" +HKCR,DirectShow,,16 HKCR,exefile,,2,"Application" HKCR,exefile\DefaultIcon,,2,"%1" HKCR,exefile\shell\open\command,,2,"""%1"" %*" @@ -160,6 +161,7 @@ HKCR,lnkfile,"IsShortcut",2,"yes" HKCR,lnkfile\CLSID,,2,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\IconHandler,,2,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,0x10, +HKCR,MediaFoundation,,16 HKCR,Msi.Package,,2,"Windows Installer Package" HKCR,Msi.Package\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Package\shell\Open\command,,2,"msiexec /i ""%1""" @@ -407,9 +409,17 @@ HKLM,%CurrentVersion%,"ProgramFilesDir",,"%16422%" HKLM,%CurrentVersion%,"ProgramFilesPath",0x20000,"%%ProgramFiles%%" HKLM,%CurrentVersion%,"RegisteredOrganization",2,"" HKLM,%CurrentVersion%,"RegisteredOwner",2,"" +HKLM,%CurrentVersion%\App Paths,,16 +HKLM,%CurrentVersion%\Control Panel\Cursors\Schemes,,16 HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMax",,"3600" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMin",,"3" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"LastID",,"5" +HKLM,%CurrentVersion%\Explorer\AutoplayHandlers,,16 +HKLM,%CurrentVersion%\Explorer\DriveIcons,,16 +HKLM,%CurrentVersion%\Explorer\KindMap,,16 +HKLM,%CurrentVersion%\Group Policy,,16 +HKLM,%CurrentVersion%\Policies,,16 +HKLM,%CurrentVersion%\PreviewHandlers,,16 HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" @@ -417,8 +427,21 @@ HKLM,%CurrentVersion%\Uninstall,,16 HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%" +HKLM,%CurrentVersionNT%\Console,,16 +HKLM,%CurrentVersionNT%\FontDpi,,16 +HKLM,%CurrentVersionNT%\FontLink,,16 +HKLM,%CurrentVersionNT%\FontMapper,,16 HKLM,%CurrentVersionNT%\Fonts,,16 +HKLM,%CurrentVersionNT%\FontSubstitutes,,16 +HKLM,%CurrentVersionNT%\Gre_Initialize,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" +HKLM,%CurrentVersionNT%\Image File Execution Options,,16 +HKLM,%CurrentVersionNT%\Language Pack,,16 +HKLM,%CurrentVersionNT%\NetworkCards,,16 +HKLM,%CurrentVersionNT%\Perflib,,16 +HKLM,%CurrentVersionNT%\Ports,,16 +HKLM,%CurrentVersionNT%\Print,,16 +HKLM,%CurrentVersionNT%\ProfileList,,16 [Debugger] HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" @@ -565,6 +588,20 @@ HKLM,Software\Clients\Mail,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,"DLLPath",2,"%11%\winemapi.dll" HKLM,Software\Microsoft\Advanced INF Setup,,16 +HKLM,Software\Microsoft\Clients,,16 +HKLM,Software\Microsoft\Cryptography\Calais\Current,,16 +HKLM,Software\Microsoft\Cryptography\Calais\Readers,,16 +HKLM,Software\Microsoft\Cryptography\Services,,16 +HKLM,Software\Microsoft\CTF\SystemShared,,16 +HKLM,Software\Microsoft\CTF\TIP,,16 +HKLM,Software\Microsoft\DFS,,16 +HKLM,Software\Microsoft\Driver Signing,,16 +HKLM,Software\Microsoft\EnterpriseCertificates,,16 +HKLM,Software\Microsoft\EventSystem,,16 +HKLM,Software\Microsoft\MSMQ,,16 +HKLM,Software\Microsoft\Non-Driver Signing,,16 +HKLM,Software\Microsoft\Notepad\DefaultFonts,,16 +HKLM,Software\Microsoft\RAS,,16 HKLM,Software\Microsoft\Rpc\SecurityService,1,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,10,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,14,2,"schannel.dll" @@ -572,6 +609,12 @@ HKLM,Software\Microsoft\Rpc\SecurityService,16,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,18,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,68,2,"netlogon.dll" HKLM,Software\Microsoft\Rpc\SecurityService,9,2,"secur32.dll" +HKLM,Software\Microsoft\Shared Tools\MSInfo,,16 +HKLM,Software\Microsoft\SystemCertificates,,16 +HKLM,Software\Microsoft\TermServLicensing,,16 +HKLM,Software\Microsoft\Transaction Server,,16 +HKLM,Software\Policies,,16 +HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\VMM32Files,,16 HKCU,AppEvents\Schemes\Apps\Explorer\Navigating\.Current,,,"" HKCU,Software\Microsoft\Protected Storage System Provider,,16 @@ -935,6 +978,7 @@ HKLM,%CurrentVersionNT%\Ports,"COM4:",2,"9600,n,8,1" [Tapi] HKLM,%CurrentVersion%\Telephony,"Perf1",0x10001,0x5045524a HKLM,%CurrentVersion%\Telephony,"Perf2",0x10001,0x50455246 +HKLM,%CurrentVersion%\Telephony\Locations,,16 HKLM,%CurrentVersion%\Telephony\Country List,"CountryListVersion",0x10001,0x00000019

1 0

Joris Huizer : mshtml: create_channelbsc: Handle OOM case correctly.
by Alexandre Julliard March 4, 2010

March 4, 2010

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 March 4, 2010

March 4, 2010

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

Alexandre Julliard : advapi32/tests: Add a number of tests for Wow64 registry redirection.
by Alexandre Julliard March 4, 2010

March 4, 2010

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

Nikolay Sivov : shell32: Use return value on failure updated in Vista+.
by Alexandre Julliard March 4, 2010

March 4, 2010

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 March 4, 2010

March 4, 2010

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

Arjun Comar : cmd: Fix cmd to take /? as a help parameter.
by Alexandre Julliard March 4, 2010

March 4, 2010

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

Yann Droneaud : aclocal.m4: Fix WINE_TRY_CFLAGS macro (LLVM/Clang).
by Alexandre Julliard March 4, 2010

March 4, 2010

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

Juan Lang : rpcrt4: Add tests for UuidCreateSequential.
by Alexandre Julliard March 4, 2010

March 4, 2010

Module: wine Branch: master Commit: b61c8f8b53ed9b138f86605225da51a5d7a2ad57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b61c8f8b53ed9b138f8660522… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 3 14:36:32 2010 -0800 rpcrt4: Add tests for UuidCreateSequential. --- dlls/rpcrt4/tests/rpc.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 3acb46e..7bd78ba 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -804,6 +804,58 @@ static void test_UuidCreate(void) } } +static void test_UuidCreateSequential(void) +{ + UUID guid1; + BYTE version; + RPC_STATUS (WINAPI *pUuidCreateSequential)(UUID *) = (void *)GetProcAddress(GetModuleHandle("rpcrt4.dll"), "UuidCreateSequential"); + RPC_STATUS ret; + + if (!pUuidCreateSequential) + { + skip("UuidCreateSequential not exported\n"); + return; + } + ret = pUuidCreateSequential(&guid1); + ok(!ret || ret == RPC_S_UUID_LOCAL_ONLY, + "expected RPC_S_OK or RPC_S_UUID_LOCAL_ONLY, got %08x\n", ret); + version = (guid1.Data3 & 0xf000) >> 12; + todo_wine + ok(version == 1, "unexpected version %d\n", version); + if (version == 1) + { + UUID guid2; + + if (!ret) + { + /* If the call succeeded, there's a valid (non-multicast) MAC + * address in the uuid: + */ + ok(!(guid1.Data4[2] & 0x01), + "GUID does not appear to contain a MAC address\n"); + } + else + { + /* Otherwise, there's a randomly generated multicast MAC address + * address in the uuid: + */ + ok((guid1.Data4[2] & 0x01), + "GUID does not appear to contain a multicast MAC address\n"); + } + /* Generate another GUID, and make sure its MAC address matches the + * first. + */ + ret = pUuidCreateSequential(&guid2); + ok(!ret || ret == RPC_S_UUID_LOCAL_ONLY, + "expected RPC_S_OK or RPC_S_UUID_LOCAL_ONLY, got %08x\n", ret); + version = (guid2.Data3 & 0xf000) >> 12; + todo_wine + ok(version == 1, "unexpected version %d\n", version); + ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)), + "unexpected value in MAC address\n"); + } +} + static void test_RpcBindingFree(void) { RPC_BINDING_HANDLE binding = NULL; @@ -826,5 +878,6 @@ START_TEST( rpc ) test_I_RpcExceptionFilter(); test_RpcStringBindingFromBinding(); test_UuidCreate(); + test_UuidCreateSequential(); test_RpcBindingFree(); }

1 0

Christian Costa : d3dx9_36: Avoid dereferencing null pointers in trace ( spotted by Paul Vriens).
by Alexandre Julliard March 4, 2010

March 4, 2010

Module: wine Branch: master Commit: 6dfe16fc480d73d272cf1fb1731b487238a4be42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dfe16fc480d73d272cf1fb17… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Mar 4 08:20:44 2010 +0100 d3dx9_36: Avoid dereferencing null pointers in trace (spotted by Paul Vriens). --- dlls/d3dx9_36/shader.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 9acad32..e4de6b3 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -154,11 +154,13 @@ HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVO /* Check if this is the comment we are looking for */ if (*(ptr + 1) == fourcc) { + UINT ctab_size = (comment_size - 1) * sizeof(DWORD); + LPCVOID ctab_data = ptr + 2; if (size) - *size = (comment_size - 1) * sizeof(DWORD); + *size = ctab_size; if (data) - *data = ptr + 2; - TRACE("Returning comment data at %p with size %d\n", *data, *size); + *data = ctab_data; + TRACE("Returning comment data at %p with size %d\n", ctab_data, ctab_size); return D3D_OK; } ptr += comment_size;

1 0