August 2006 - Wine-commits - list.winehq.org

Robert Reif : secur32: Fix secur32 test to pass on windows.
by Alexandre Julliard 26 Aug '06

26 Aug '06

Module: wine Branch: master Commit: de0619e3a7a6427baeb96d7547b1ce2154eb5fd1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=de0619e3a7a6427baeb96d7… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Aug 26 07:34:53 2006 -0400 secur32: Fix secur32 test to pass on windows. --- dlls/secur32/tests/secur32.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 77e47ce..b3240ca 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -51,7 +51,8 @@ static void testGetComputerObjectNameA(v rc = pGetComputerObjectNameA(formats[i], name, &size); ok(rc || ((formats[i] == NameUnknown) && (GetLastError() == ERROR_INVALID_PARAMETER)) || - (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO), + (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || + (GetLastError() == ERROR_NO_SUCH_DOMAIN), "GetComputerObjectNameA(%d) failed: %ld\n", formats[i], GetLastError()); if (rc) @@ -72,9 +73,15 @@ static void testGetComputerObjectNameW(v rc = pGetComputerObjectNameW(formats[i], nameW, &size); ok(rc || ((formats[i] == NameUnknown) && (GetLastError() == ERROR_INVALID_PARAMETER)) || - (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO), + (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || + (GetLastError() == ERROR_NO_SUCH_DOMAIN), "GetComputerObjectNameW(%d) failed: %ld\n", formats[i], GetLastError()); + if (rc) { + char name[256]; + WideCharToMultiByte( CP_ACP, 0, nameW, -1, name, sizeof(name), NULL, NULL ); + trace("GetComputerObjectNameW() returned %s\n", name); + } } }

1 0

Robert Reif : advapi32: Fix LookupAccountSid and tests to pass on windows and wine.
by Alexandre Julliard 26 Aug '06

26 Aug '06

Module: wine Branch: master Commit: f0085e637678429b8937ce1025fa4bd2d38d9807 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f0085e637678429b8937ce1… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Aug 25 18:14:58 2006 -0400 advapi32: Fix LookupAccountSid and tests to pass on windows and wine. --- dlls/advapi32/security.c | 18 +++- dlls/advapi32/tests/security.c | 190 +++++++++++++++++++++++++++++----------- 2 files changed, 150 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f0085e637678429b893…

1 0

Robert Reif : advapi32: Fix lsa tests.
by Alexandre Julliard 26 Aug '06

26 Aug '06

Module: wine Branch: master Commit: ee32bd99dd54013614b56a66f55f44f446680d96 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee32bd99dd54013614b56a6… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Aug 25 19:24:23 2006 -0400 advapi32: Fix lsa tests. --- dlls/advapi32/tests/lsa.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 8158783..78cd57f 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -137,7 +137,7 @@ static void test_lsa(void) LPSTR guidstr = NULL; WCHAR guidstrW[64]; UINT len; - guidstr[0] = '\0'; + guidstrW[0] = '\0'; ConvertSidToStringSidA(dns_domain_info->Sid, &strsid); StringFromGUID2(&dns_domain_info->DomainGuid, guidstrW, sizeof(guidstrW)/sizeof(WCHAR)); len = WideCharToMultiByte( CP_ACP, 0, guidstrW, -1, NULL, 0, NULL, NULL ); @@ -151,12 +151,12 @@ static void test_lsa(void) if (dns_domain_info->DnsDomainName.Buffer) { len = WideCharToMultiByte( CP_ACP, 0, dns_domain_info->DnsDomainName.Buffer, -1, NULL, 0, NULL, NULL ); domain = LocalAlloc( 0, len ); - WideCharToMultiByte( CP_ACP, 0, dns_domain_info->DnsDomainName.Buffer, -1, name, len, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, dns_domain_info->DnsDomainName.Buffer, -1, domain, len, NULL, NULL ); } if (dns_domain_info->DnsForestName.Buffer) { len = WideCharToMultiByte( CP_ACP, 0, dns_domain_info->DnsForestName.Buffer, -1, NULL, 0, NULL, NULL ); forest = LocalAlloc( 0, len ); - WideCharToMultiByte( CP_ACP, 0, dns_domain_info->DnsForestName.Buffer, -1, name, len, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, dns_domain_info->DnsForestName.Buffer, -1, forest, len, NULL, NULL ); } trace(" name: %s domain: %s forest: %s guid: %s sid: %s\n", name ? name : "NULL", domain ? domain : "NULL",

1 0

Piotr Caban : oleview: Added data freeing in EnumFuncs function.
by Alexandre Julliard 26 Aug '06

26 Aug '06

Module: wine Branch: master Commit: e213b7e8aa83d82e72378dfdc7518b3c02a1cb86 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e213b7e8aa83d82e72378df… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Aug 25 23:25:07 2006 +0200 oleview: Added data freeing in EnumFuncs function. --- programs/oleview/typelib.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 5521175..0059f77 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -448,7 +448,11 @@ int EnumFuncs(ITypeInfo *pTypeInfo, int bstrParamNames = HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR*)*(pFuncDesc->cParams+1)); if(FAILED(ITypeInfo_GetNames(pTypeInfo, pFuncDesc->memid, bstrParamNames, - pFuncDesc->cParams+1, &namesNo))) continue; + pFuncDesc->cParams+1, &namesNo))) + { + HeapFree(GetProcessHeap(), 0, bstrParamNames); + continue; + } SysFreeString(bstrParamNames[0]); memset(wszText, 0, sizeof(wszText));

1 0

Alexandre Julliard : winex11.drv: Remove no longer used all: target.
by Alexandre Julliard 26 Aug '06

26 Aug '06

Module: wine Branch: master Commit: 07700192a9045db4439664f5de8564809f82d965 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07700192a9045db4439664f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 26 18:54:31 2006 +0200 winex11.drv: Remove no longer used all: target. --- dlls/winex11.drv/Makefile.in | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 4e5248e..a4c4689 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -45,6 +45,4 @@ C_SRCS = \ @MAKE_DLL_RULES@ -all: $(PROGRAMS) - ### Dependencies:

1 0

Mikołaj Zalewski : shell32: Fix a bug in SHELL_ConfirmW.
by Alexandre Julliard 26 Aug '06

26 Aug '06

Module: wine Branch: master Commit: c1ca35d051e59f21697a571a49b4faa5c9e98ab2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c1ca35d051e59f21697a571… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Aug 25 21:33:28 2006 +0200 shell32: Fix a bug in SHELL_ConfirmW. Fix a bug introduced while changing the OK/Cancel to Yes/No. --- dlls/shell32/shlfileop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 6ea52b0..bff1b63 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -152,7 +152,7 @@ BOOL SHELL_ConfirmDialogW(HWND hWnd, int params.lpszIcon = (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id); params.dwStyle = MB_YESNO | MB_USERICON; - return (IDOK == MessageBoxIndirectW(&params)); + return (IDYES == MessageBoxIndirectW(&params)); } static DWORD SHELL32_AnsiToUnicodeBuf(LPCSTR aPath, LPWSTR *wPath, DWORD minChars)

1 0

Hwang YunSong(황윤성) : shlwapi: Updated Korean resource.
by Alexandre Julliard 26 Aug '06

26 Aug '06

Module: wine Branch: master Commit: dd306b915874797599f57f08d1d143dd4f204752 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd306b915874797599f57f0… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Sat Aug 26 08:13:57 2006 +0900 shlwapi: Updated Korean resource. --- dlls/shlwapi/shlwapi_Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/shlwapi_Ko.rc b/dlls/shlwapi/shlwapi_Ko.rc index 62a8ddf..b73545c 100644 --- a/dlls/shlwapi/shlwapi_Ko.rc +++ b/dlls/shlwapi/shlwapi_Ko.rc @@ -38,7 +38,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld ��Ʈ" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" + IDS_TIME_INTERVAL_HOURS "��" + IDS_TIME_INTERVAL_MINUTES " ��" + IDS_TIME_INTERVAL_SECONDS " ��" }

1 0

Marcus Meissner : comctl32: Remove unneccessary default debug channels.
by Alexandre Julliard 26 Aug '06

26 Aug '06

Module: wine Branch: master Commit: a7ca25aa200c659b233196c0ca9816cb1e6c9524 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7ca25aa200c659b233196c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 25 20:01:50 2006 +0200 comctl32: Remove unneccessary default debug channels. --- dlls/comctl32/theme_dialog.c | 2 -- dlls/comctl32/theme_edit.c | 2 -- dlls/comctl32/theme_listbox.c | 2 -- 3 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c index cfcb56f..9285941 100644 --- a/dlls/comctl32/theme_dialog.c +++ b/dlls/comctl32/theme_dialog.c @@ -32,8 +32,6 @@ #include "tmschema.h" #include "comctl32.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(themingdialog); - /********************************************************************** * The dialog subclass window proc. */ diff --git a/dlls/comctl32/theme_edit.c b/dlls/comctl32/theme_edit.c index 3cbf760..b3b142a 100644 --- a/dlls/comctl32/theme_edit.c +++ b/dlls/comctl32/theme_edit.c @@ -32,8 +32,6 @@ #include "tmschema.h" #include "comctl32.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(themingedit); - /* Draw themed border */ static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) { diff --git a/dlls/comctl32/theme_listbox.c b/dlls/comctl32/theme_listbox.c index 93e9ac7..8147ba4 100644 --- a/dlls/comctl32/theme_listbox.c +++ b/dlls/comctl32/theme_listbox.c @@ -32,8 +32,6 @@ #include "tmschema.h" #include "comctl32.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(theminglistbox); - /* Draw themed border */ static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) {

1 0

Alex Villacís Lasso : quartz: Skip over INFO chunk in AVI file parsing.
by Alexandre Julliard 26 Aug '06

26 Aug '06

Module: wine Branch: master Commit: bc06d70770171d6120e240e6572b8526d55381dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc06d70770171d6120e240e… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Fri Aug 25 13:43:59 2006 -0500 quartz: Skip over INFO chunk in AVI file parsing. --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/fourcc.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 480a7d3..f1eff89 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -550,7 +550,7 @@ static HRESULT AVISplitter_InputPin_PreC pos += sizeof(RIFFCHUNK) + list.cb; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); - if (list.fcc == ckidJUNK) + while (list.fcc == ckidJUNK || (list.fcc == ckidLIST && list.fccListType == ckidINFO)) { pos += sizeof(RIFFCHUNK) + list.cb; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); diff --git a/dlls/quartz/fourcc.h b/dlls/quartz/fourcc.h index a21910c..317b432 100644 --- a/dlls/quartz/fourcc.h +++ b/dlls/quartz/fourcc.h @@ -34,6 +34,7 @@ #define ckidAVI aviFCC('A' #define ckidRIFF aviFCC('R','I','F','F') #define ckidLIST aviFCC('L','I','S','T') #define ckidJUNK aviFCC('J','U','N','K') +#define ckidINFO aviFCC('I','N','F','O') #define ckidHEADERLIST aviFCC('h','d','r','l') #define ckidAVIMOVIE aviFCC('m','o','v','i') #define ckidSTREAMNAME aviFCC('s','t','r','n')

1 0

docs/en winedev-coding.sgml
by Dimi Paun 26 Aug '06

26 Aug '06

ChangeSet ID: 11565997970401934530391408 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2006/08/26 06:43:17 Modified files: en : winedev-coding.sgml Log message: Mike McCormack <mike(a)codeweavers.com> Describe using Git to send patches. Old revision New revision Changes Path 1.5 1.6 +19 -36 docs/en/winedev-coding.sgml Index: docs/en/winedev-coding.sgml diff -u -p docs/en/winedev-coding.sgml:1.5 docs/en/winedev-coding.sgml:1.6 --- docs/en/winedev-coding.sgml 26 Aug 2006 13:43:17 -0000 +++ /dev/null 26 Aug 2006 13:43:17 -0000 @@ -35,7 +35,7 @@ </listitem> <listitem> <para> - The patch in <command>diff -u</command> format + The patch in <quote>Git</quote> format </para> </listitem> </itemizedlist> @@ -43,40 +43,23 @@ <para></para> <para> - <command>cvs diff -u</command> works great for the common case - where a file is edited. However, if you add or remove a file - <command>cvs diff</command> will not report that correctly so - make sure you explicitly take care of this rare case. + To generate a patch using Git, first commit it to your local tree. </para> <para> - For additions simply include them by appending the - <command>diff -u /dev/null /my/new/file</command> output of - them to any <command>cvs diff -u</command> output you may - have. Alternatively, use <command>diff -Nu olddir/ - newdir/</command> in case of multiple new files to add. + Each file that you change needs to be updated with + <command> git update </command>. If you are adding or removing + a file, use <command> git update --add </command> or + <command>git update --remove</command> respectively. + After updating the index, commit the change using + <command> git commit </command>. The commit message will be + sent with your patch, and recored in the ChangeLog. + </para> + <para> + After committing the patch, you can extract it using + <command>git format-patch</command> and send it to wine-patches + using <command>git imap-send</command> or simply attaching it + to you mail manually. </para> - <para> - When adding a new directory that contains a - <filename>Makefile.in</filename>, you must ensure that - <filename>configure.ac</filename> references it. - Naturally, your patch should include all the changes you - made to integrate the new directory into the tree. - </para> - <para> - For removals, clearly list the files in the description of the - patch. - </para> - <para> - Since wine is constantly changing due to development it is - strongly recommended that you use cvs for patches, if you - cannot use cvs for some reason, you can submit patches against - the latest tarball. To do this make a copy of the files that - you will be modifying and <command>diff -u</command> against - the old file. I.E. - </para> - <screen> -diff -u file.old file.c > file.txt - </screen> </sect1> <sect1 id="Style-notes"> @@ -222,11 +205,11 @@ code can build on it and it will not go stale?") </para> <para> - Make sure your patch applies to the current CVS head - revisions. If a bunch of patches are committed to CVS that may + Make sure your patch applies to the current Git HEAD + revisions. If a bunch of patches are committed that may affect whether your patch will apply cleanly then verify that - your patch does apply! <command>cvs update</command> is your - friend! + your patch does apply! <command>git fetch; git rebase origin</command> + is your friend! </para> <para> Save yourself some embarrassment and run your patched code

1 0