August 2009 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/tab: Init TCITEM fields in TCM_GETITEM when invalid index passed.
by Alexandre Julliard Aug. 17, 2009

Aug. 17, 2009

Module: wine Branch: master Commit: f08747cbfc2677c06b12a470b0308c5306c105fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08747cbfc2677c06b12a470b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Aug 15 00:05:06 2009 +0400 comctl32/tab: Init TCITEM fields in TCM_GETITEM when invalid index passed. --- dlls/comctl32/tab.c | 6 +++++ dlls/comctl32/tests/tab.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 5c90883..94da29e 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2813,7 +2813,13 @@ TAB_GetItemT (TAB_INFO *infoPtr, INT iItem, LPTCITEMW tabItem, BOOL bUnicode) if (!tabItem) return FALSE; if (iItem < 0 || iItem >= infoPtr->uNumItem) + { + /* init requested fields */ + if (tabItem->mask & TCIF_IMAGE) tabItem->iImage = 0; + if (tabItem->mask & TCIF_PARAM) tabItem->lParam = 0; + if (tabItem->mask & TCIF_STATE) tabItem->dwState = 0; return FALSE; + } wineItem = TAB_GetItem(infoPtr, iItem); diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 9163f92..0361d32 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -842,12 +842,66 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) ret = SendMessage(hTab, TCM_GETITEM, 0, (LPARAM)NULL); expect(FALSE, ret); + /* passing invalid index should result in initialization to zero + for members mentioned in mask requested */ + + /* valid range here is [0,4] */ + memset(&tcItem, 0xcc, sizeof(tcItem)); + tcItem.mask = TCIF_PARAM; + ret = SendMessage(hTab, TCM_GETITEM, 5, (LPARAM)&tcItem); + expect(FALSE, ret); + ok(tcItem.lParam == 0, "Expected zero lParam, got %lu\n", tcItem.lParam); + + memset(&tcItem, 0xcc, sizeof(tcItem)); + tcItem.mask = TCIF_IMAGE; + ret = SendMessage(hTab, TCM_GETITEM, 5, (LPARAM)&tcItem); + expect(FALSE, ret); + expect(0, tcItem.iImage); + + memset(&tcItem, 0xcc, sizeof(tcItem)); + tcItem.mask = TCIF_TEXT; + tcItem.pszText = szText; + szText[0] = 'a'; + ret = SendMessage(hTab, TCM_GETITEM, 5, (LPARAM)&tcItem); + expect(FALSE, ret); + expect('a', szText[0]); + + memset(&tcItem, 0xcc, sizeof(tcItem)); + tcItem.mask = TCIF_STATE; + tcItem.dwStateMask = 0; + tcItem.dwState = TCIS_BUTTONPRESSED; + ret = SendMessage(hTab, TCM_GETITEM, 5, (LPARAM)&tcItem); + expect(FALSE, ret); + ok(tcItem.dwState == 0, "Expected zero dwState, got %u\n", tcItem.dwState); + + memset(&tcItem, 0xcc, sizeof(tcItem)); + tcItem.mask = TCIF_STATE; + tcItem.dwStateMask = TCIS_BUTTONPRESSED; + tcItem.dwState = TCIS_BUTTONPRESSED; + ret = SendMessage(hTab, TCM_GETITEM, 5, (LPARAM)&tcItem); + expect(FALSE, ret); + ok(tcItem.dwState == 0, "Expected zero dwState\n"); + + /* check with negative index to be sure */ + memset(&tcItem, 0xcc, sizeof(tcItem)); + tcItem.mask = TCIF_PARAM; + ret = SendMessage(hTab, TCM_GETITEM, -1, (LPARAM)&tcItem); + expect(FALSE, ret); + ok(tcItem.lParam == 0, "Expected zero lParam, got %lu\n", tcItem.lParam); + + memset(&tcItem, 0xcc, sizeof(tcItem)); + tcItem.mask = TCIF_PARAM; + ret = SendMessage(hTab, TCM_GETITEM, -2, (LPARAM)&tcItem); + expect(FALSE, ret); + ok(tcItem.lParam == 0, "Expected zero lParam, got %lu\n", tcItem.lParam); + flush_sequences(sequences, NUM_MSG_SEQUENCES); tcItem.mask = TCIF_TEXT; tcItem.pszText = &szText[0]; tcItem.cchTextMax = sizeof(szText); + strcpy(szText, "New Label"); ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n"); ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); expect_str("New Label", tcItem.pszText);

1 0

Nikolay Sivov : comctl32/tab: Check destination pointer for NULL in TCM_GETITEM handler.
by Alexandre Julliard Aug. 17, 2009

Aug. 17, 2009

Module: wine Branch: master Commit: 031c497a5a689a88d6aa9e6a92397291650955e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031c497a5a689a88d6aa9e6a9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Aug 14 22:50:05 2009 +0400 comctl32/tab: Check destination pointer for NULL in TCM_GETITEM handler. --- dlls/comctl32/tab.c | 2 ++ dlls/comctl32/tests/tab.c | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 4b439b2..5c90883 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2810,6 +2810,8 @@ TAB_GetItemT (TAB_INFO *infoPtr, INT iItem, LPTCITEMW tabItem, BOOL bUnicode) TRACE("(%p,%d,%p,%s)\n", infoPtr, iItem, tabItem, bUnicode ? "true" : "false"); + if (!tabItem) return FALSE; + if (iItem < 0 || iItem >= infoPtr->uNumItem) return FALSE; diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 5fc1577..9163f92 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -835,8 +835,13 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) /* Testing GetSet Item */ { TCITEM tcItem; + DWORD ret; char szText[32] = "New Label"; + /* TCM_GETITEM with null dest pointer */ + ret = SendMessage(hTab, TCM_GETITEM, 0, (LPARAM)NULL); + expect(FALSE, ret); + flush_sequences(sequences, NUM_MSG_SEQUENCES); tcItem.mask = TCIF_TEXT;

1 0

André Hentschel : winemaker: Update manual.
by Alexandre Julliard Aug. 17, 2009

Aug. 17, 2009

Module: wine Branch: master Commit: 4c9405a83cf9776432fd5e60647c6f97ea79f658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c9405a83cf9776432fd5e606… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 16 15:33:11 2009 +0200 winemaker: Update manual. --- tools/winemaker.man.in | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/winemaker.man.in b/tools/winemaker.man.in index 9ae2874..f0e8aed 100644 --- a/tools/winemaker.man.in +++ b/tools/winemaker.man.in @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINEMAKER 1 "May 2009" "@PACKAGE_STRING@" "Wine Developers Manual" +.TH WINEMAKER 1 "Aug 2009" "@PACKAGE_STRING@" "Wine Developers Manual" .SH NAME winemaker \- generate a build infrastructure for compiling Windows programs on Unix .SH SYNOPSIS @@ -214,13 +214,12 @@ $ make In some cases you will have to edit the Makefile or sourcefiles by yourself. .PP Assuming that the windows executable/library is available, we could -use a pedump-like tool to determine what kind of executable it is (graphical +use winedump to determine what kind of executable it is (graphical or console), which libraries it is linked with, and which functions it exports (for libraries). We could then restore all these settings for the -corresponding Winelib target. The problem is that we should have such a tool -available under the Wine license first. +corresponding Winelib target. .PP -Furthermore it is not very good at finding the library containing the +Furthermore winemaker is not very good at finding the library containing the executable: it must either be in the current directory or in the .IR LD_LIBRARY_PATH . .PP

1 0

Rein Klazes : advapi32: SetEntriesInAclW() should accept account name " CURRENT_USER".
by Alexandre Julliard Aug. 17, 2009

Aug. 17, 2009

Module: wine Branch: master Commit: b46e2ef9b1d1349d4caf7f7a31ea1b6c348875ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46e2ef9b1d1349d4caf7f7a3… Author: Rein Klazes <wijn(a)online.nl> Date: Sun Aug 16 12:36:56 2009 +0200 advapi32: SetEntriesInAclW() should accept account name "CURRENT_USER". --- dlls/advapi32/security.c | 4 +++- dlls/advapi32/tests/security.c | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 9d3fe51..9bb76d5 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -184,6 +184,7 @@ static const WCHAR CREATOR_GROUP[] = { 'C','R','E','A','T','O','R',' ','G','R',' static const WCHAR CREATOR_GROUP_SERVER[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',' ','S','E','R','V','E','R',0 }; static const WCHAR CREATOR_OWNER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',0 }; static const WCHAR CREATOR_OWNER_SERVER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',' ','S','E','R','V','E','R',0 }; +static const WCHAR CURRENT_USER[] = { 'C','U','R','R','E','N','T','_','U','S','E','R',0 }; static const WCHAR DIALUP[] = { 'D','I','A','L','U','P',0 }; static const WCHAR Digest_Authentication[] = { 'D','i','g','e','s','t',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; static const WCHAR DOMAIN[] = {'D','O','M','A','I','N',0}; @@ -3510,7 +3511,8 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, DWORD sid_size = FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]); DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1; SID_NAME_USE use; - if (!LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use)) + if ( strcmpW( pEntries[i].Trustee.ptstrName, CURRENT_USER ) && + !LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use)) { WARN("bad user name %s for trustee %d\n", debugstr_w(pEntries[i].Trustee.ptstrName), i); ret = ERROR_INVALID_PARAMETER; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4479ddf..4072168 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2482,6 +2482,7 @@ static void test_SetEntriesInAcl(void) SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; EXPLICIT_ACCESSW ExplicitAccess; static const WCHAR wszEveryone[] = {'E','v','e','r','y','o','n','e',0}; + static const WCHAR wszCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'}; if (!pSetEntriesInAclW) { @@ -2575,6 +2576,13 @@ static void test_SetEntriesInAcl(void) LocalFree(NewAcl); } + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszCurrentUser; + res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(NewAcl != NULL, "returned acl was NULL\n"); + LocalFree(NewAcl); + ExplicitAccess.grfAccessMode = REVOKE_ACCESS; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_SID; ExplicitAccess.Trustee.ptstrName = UsersSid;

1 0

Alexandre Julliard : configure: Downgrade libgsm warning to a notice.
by Alexandre Julliard Aug. 17, 2009

Aug. 17, 2009

Module: wine Branch: master Commit: 1ebbab8ddb7bcf336385985f67d83e6a3ad2ab33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebbab8ddb7bcf336385985f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 17 15:11:42 2009 +0200 configure: Downgrade libgsm warning to a notice. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 059070c..e5d3f48 100755 --- a/configure +++ b/configure @@ -10851,7 +10851,7 @@ fi fi if test "x$ac_cv_lib_soname_gsm" = "x"; then : case "x$with_libgsm" in - x) wine_warnings="$wine_warnings|libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported." ;; + x) wine_notices="$wine_notices|libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported." ;; xno) ;; *) as_fn_error "libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported. This is an error since --with-libgsm was requested." "$LINENO" 5 ;; diff --git a/configure.ac b/configure.ac index a91e3b6..519f91d 100644 --- a/configure.ac +++ b/configure.ac @@ -1370,7 +1370,7 @@ if test "$ac_cv_header_gsm_h" = "yes" -o "$ac_cv_header_gsm_gsm_h" = "yes" then WINE_CHECK_SONAME(gsm,gsm_create) fi -WINE_WARNING_WITH(libgsm,[test "x$ac_cv_lib_soname_gsm" = "x"], +WINE_NOTICE_WITH(libgsm,[test "x$ac_cv_lib_soname_gsm" = "x"], [libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.]) dnl **** Check for libjpeg ****

1 0

Alexandre Julliard : configure: Don't assume libXext is available.
by Alexandre Julliard Aug. 17, 2009

Aug. 17, 2009

Module: wine Branch: master Commit: fd03c5069352bb4fbd880e7b45a851fa4ccafbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd03c5069352bb4fbd880e7b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 17 15:11:08 2009 +0200 configure: Don't assume libXext is available. --- configure | 38 +++++++++++++++++++------------------- configure.ac | 36 ++++++++++++++++++------------------ 2 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd03c5069352bb4fbd880…

1 0

Dylan Smith : winedbg: Make limitations of set command clearer in man page.
by Alexandre Julliard Aug. 17, 2009

Aug. 17, 2009

Module: wine Branch: master Commit: a35652d6543e10237044c17ab632694ac2050b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35652d6543e10237044c17ab… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 17 01:15:02 2009 -0400 winedbg: Make limitations of set command clearer in man page. --- programs/winedbg/winedbg.man.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 34003d9..fb91d6b 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -369,8 +369,9 @@ Lists all w-threads in Wine session .IP \fBinfo\ exception\fR Lists the exception frames (starting from current stack frame) .PP -It is possible to turn on and off Wine's debug messages as you are -debugging using the \fBset\fR command. +Debug messages can be turned on and off as you are debugging using +the \fBset\fR command, but only for channels initialized with the +\fIWINEDEBUG\fR environment variable. .IP \fBset\ warn\ +\ win\fR Turns on warn on \fB'win'\fR channel .IP \fBset\ +\ win\fR

1 0

Dylan Smith : winedbg: Properly end non-formatted text in man page.
by Alexandre Julliard Aug. 17, 2009

Aug. 17, 2009

Module: wine Branch: master Commit: 82f810dc73dc0fb4eab7121c7518fe041d4a9d00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f810dc73dc0fb4eab7121c7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 17 01:14:57 2009 -0400 winedbg: Properly end non-formatted text in man page. The .nf macro stops formatting of the text in the man page, and the macro .fi should be used to end. This wasn't done before, which is noticable for where the text is wrapped when opening the man page with a larger/smaller terminal width. --- programs/winedbg/winedbg.man.in | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 1986ad2..34003d9 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -33,11 +33,11 @@ winedbg \- Wine's debugger .B winedbg is a debugger for Wine. It allows: .RS 4 -+ debugging native Win32 applications .nf ++ debugging native Win32 applications + debugging Winelib applications. -.nf + being a drop-in replacement for Dr Watson +.fi .RE .PP @@ -243,12 +243,10 @@ Lists 10 source lines from address \fBN\fR .PP You can specify the end target (to change the 10 lines value) using the ',' separator. For example: -.nf .IP \fBlist\ 123,\ 234\fR lists source lines from line 123 up to line 234 in current file -.nf .IP \fBlist\ foo.c:1,56\fR -lists source lines from line 1 up to 56 in file foo.c +lists source lines from line 1 up to 56 in file foo.c .PP \fIDisplaying\fR .PP

1 0

Dylan Smith : winedbg: Fixed syntax of set command in man pages.
by Alexandre Julliard Aug. 17, 2009

Aug. 17, 2009

Module: wine Branch: master Commit: 26c427d50aba750f08323bbef78bf07c0b931540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c427d50aba750f08323bbef… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 17 01:14:53 2009 -0400 winedbg: Fixed syntax of set command in man pages. --- programs/winedbg/winedbg.man.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 3fcc8ab..1986ad2 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -373,13 +373,13 @@ Lists the exception frames (starting from current stack frame) .PP It is possible to turn on and off Wine's debug messages as you are debugging using the \fBset\fR command. -.IP \fBset\ +\ warn\ win\fR +.IP \fBset\ warn\ +\ win\fR Turns on warn on \fB'win'\fR channel .IP \fBset\ +\ win\fR Turns on warn/fixme/err/trace on \fB'win'\fR channel .IP \fBset\ -\ win\fR Turns off warn/fixme/err/trace on \fB'win'\fR channel -.IP \fBset\ -\ fixme\fR +.IP \fBset\ fixme\ -\ all\fR Turns off the 'fixme' class on all channels .PP .SS Gdb mode:

1 0

Dylan Smith : winedbg: Correct header for virtual memory mapping for end address.
by Alexandre Julliard Aug. 17, 2009

Aug. 17, 2009

Module: wine Branch: master Commit: 81c9b3a1055ac3f94b08bf8e83ed974881b6acca URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c9b3a1055ac3f94b08bf8e8… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 17 01:15:15 2009 -0400 winedbg: Correct header for virtual memory mapping for end address. The virtual memory mapping info retrieved by the command "info maps" has the end address in the second column, even though the title for the column says "Size". --- programs/winedbg/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index a4c919a..a6156b1 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -639,7 +639,7 @@ void info_win32_virtual(DWORD pid) } } - dbg_printf("Address Size State Type RWX\n"); + dbg_printf("Address End State Type RWX\n"); while (VirtualQueryEx(hProc, addr, &mbi, sizeof(mbi)) >= sizeof(mbi)) {

1 0