October 2007 - Wine-Commits

Lionel Debroux : comctl32: Remove redundant NULL check before free ( found by Smatch).
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 29ddd491307c23f9841ab30dff24c373c4480ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ddd491307c23f9841ab30df… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Oct 20 09:31:32 2007 +0200 comctl32: Remove redundant NULL check before free (found by Smatch). --- dlls/comctl32/toolbar.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 8ca4e6b..921c0ff 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5430,8 +5430,7 @@ TOOLBAR_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) if (infoPtr->strings) { INT i; for (i = 0; i < infoPtr->nNumStrings; i++) - if (infoPtr->strings[i]) - Free (infoPtr->strings[i]); + Free (infoPtr->strings[i]); Free (infoPtr->strings); }

1 0

Lionel Debroux : comctl32: Remove redundant NULL check before free ( found by Smatch).
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 58b743161ba4f319f858ad29774c5e91884de996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b743161ba4f319f858ad297… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Oct 20 09:30:44 2007 +0200 comctl32: Remove redundant NULL check before free (found by Smatch). --- dlls/comctl32/tab.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index d3cf0fd..2db8cfe 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -3064,8 +3064,7 @@ TAB_Destroy (TAB_INFO *infoPtr) if (infoPtr->items) { for (iItem = 0; iItem < infoPtr->uNumItem; iItem++) { - if (TAB_GetItem(infoPtr, iItem)->pszText) - Free (TAB_GetItem(infoPtr, iItem)->pszText); + Free (TAB_GetItem(infoPtr, iItem)->pszText); } Free (infoPtr->items); }

1 0

Mikolaj Zalewski : msi: Use BS_GROUPBOX for group boxes.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 96e4320feb22b3a2c9564de100c09990622edb59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e4320feb22b3a2c9564de10… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Oct 19 18:15:27 2007 -0700 msi: Use BS_GROUPBOX for group boxes. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 964d334..ff22f28 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1705,7 +1705,7 @@ static UINT msi_dialog_radiogroup_control( msi_dialog *dialog, MSIRECORD *rec ) TRACE("%p %p %s\n", dialog, rec, debugstr_w( prop )); /* Create parent group box to hold radio buttons */ - control = msi_dialog_add_control( dialog, rec, szButton, BS_OWNERDRAW|WS_GROUP ); + control = msi_dialog_add_control( dialog, rec, szButton, BS_GROUPBOX|WS_GROUP ); if( !control ) return ERROR_FUNCTION_FAILED;

1 0

Rob Shearman : ole32: Add a test to show that operations on overwritten should no longer succeed .
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 842d1b698dfb649954e197d58c42606580462c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=842d1b698dfb649954e197d58… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 19 23:22:58 2007 +0100 ole32: Add a test to show that operations on overwritten should no longer succeed. --- dlls/ole32/tests/storage32.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 2349add..8e6502c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -329,8 +329,20 @@ static void test_storage_stream(void) /* wrap up */ r = IStream_Release(stm2); ok(r == 0, "wrong ref count\n"); + + /* create a stream and write to it */ + r = IStorage_CreateStream(stg, stmname, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm2 ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p); + todo_wine + ok(r==STG_E_REVERTED, "overwritten stream should return STG_E_REVERTED instead of 0x%08x\n", r); + + r = IStream_Release(stm2); + ok(r == 0, "wrong ref count\n"); r = IStream_Release(stm); ok(r == 0, "wrong ref count\n"); + r = IStorage_Release(stg); ok(r == 0, "wrong ref count\n"); r = DeleteFileW(filename);

1 0

Detlef Riekenberg : wineps: Remove unused resource file.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 6d9372a8d7b63a3a66e3d61308d727fe74e0cd0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d9372a8d7b63a3a66e3d6130… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 19 19:26:30 2007 +0200 wineps: Remove unused resource file. --- dlls/wineps.drv/rsrc.rc | 7 ------- dlls/wineps.drv/wps_xx.rc | 20 -------------------- 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/dlls/wineps.drv/rsrc.rc b/dlls/wineps.drv/rsrc.rc index 47238b4..54f888b 100644 --- a/dlls/wineps.drv/rsrc.rc +++ b/dlls/wineps.drv/rsrc.rc @@ -24,13 +24,6 @@ #include "winnls.h" #include "psdlg.h" -/* - * Everything that does not depend on language, - * like textless bitmaps etc, go into the - * neutral language. This will prevent them from - * being duplicated for each language. - */ -#include "wps_xx.rc" /* * Everything specific to any language goes diff --git a/dlls/wineps.drv/wps_xx.rc b/dlls/wineps.drv/wps_xx.rc deleted file mode 100644 index 5fa2c4e..0000000 --- a/dlls/wineps.drv/wps_xx.rc +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Language neutral resources for wineps - * - * Copyright 2000 Huw D M Davies - * - * 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 - */ -

1 0

Detlef Riekenberg : shell32: Remove unused resource file.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: cc7c2b7d233e868263f01faeed6bb2be6ec49da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7c2b7d233e868263f01faee… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 19 19:25:01 2007 +0200 shell32: Remove unused resource file. --- dlls/shell32/shell32_xx.rc | 20 -------------------- dlls/shell32/shres.rc | 9 --------- 2 files changed, 0 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/shell32_xx.rc b/dlls/shell32/shell32_xx.rc deleted file mode 100644 index 457dce9..0000000 --- a/dlls/shell32/shell32_xx.rc +++ /dev/null @@ -1,20 +0,0 @@ -/* Language neutral resources. - * Icons and bitmaps should go in here. - * - * Copyright 1998 Juergen Schmied - * - * 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 - */ -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index 8256d10..840aefe 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -115,15 +115,6 @@ IDR_AVI_FILENUKE AVI searching.avi /* @makedep: searching.avi */ IDR_AVI_FILEDELETE AVI searching.avi -/*--------------------- END FIXME ------------------------*/ - -/* - * Everything that does not depend on language, - * like textless bitmaps etc, go into the - * neutral language. This will prevent them from - * being duplicated for each language. - */ -#include "shell32_xx.rc" /* * Everything specific to any language goes

1 0

Rob Shearman : ole32: Reset the parent storage on overwritten streams so that operations on them now fail .
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 5ce2d25b32e4ee031d7551856fb0128ffb79ad86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce2d25b32e4ee031d7551856… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 19 23:23:17 2007 +0100 ole32: Reset the parent storage on overwritten streams so that operations on them now fail. --- dlls/ole32/storage32.c | 11 +++++++++++ dlls/ole32/tests/storage32.c | 1 - 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c627a43..4bea165 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1015,6 +1015,17 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( */ if (STGM_CREATE_MODE(grfMode) == STGM_CREATE) { + StgStreamImpl *strm; + + LIST_FOR_EACH_ENTRY(strm, &This->strmHead, StgStreamImpl, StrmListEntry) + { + if (strm->ownerProperty == foundPropertyIndex) + { + TRACE("Stream deleted %p\n", strm); + strm->parentStorage = NULL; + list_remove(&strm->StrmListEntry); + } + } IStorage_DestroyElement(iface, pwcsName); } else diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 8e6502c..7dc633c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -335,7 +335,6 @@ static void test_storage_stream(void) ok(r==S_OK, "IStorage->CreateStream failed\n"); r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p); - todo_wine ok(r==STG_E_REVERTED, "overwritten stream should return STG_E_REVERTED instead of 0x%08x\n", r); r = IStream_Release(stm2);

1 0

Detlef Riekenberg : spoolss/test: Add a test for BuildOtherNamesFromMachineName.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: a1323b6b7f246830122b62a70dabf3937896cdb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1323b6b7f246830122b62a70… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 19 23:11:20 2007 +0200 spoolss/test: Add a test for BuildOtherNamesFromMachineName. --- dlls/spoolss/tests/spoolss.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/spoolss/tests/spoolss.c b/dlls/spoolss/tests/spoolss.c index 3797785..602b925 100644 --- a/dlls/spoolss/tests/spoolss.c +++ b/dlls/spoolss/tests/spoolss.c @@ -33,6 +33,7 @@ static HMODULE hwinspool; static HMODULE hspl; +static BOOL (WINAPI * pBuildOtherNamesFromMachineName)(LPWSTR **, LPDWORD); static DWORD (WINAPI * pSplInitializeWinSpoolDrv)(LPVOID *); #define WINSPOOL_TABLESIZE 16 @@ -51,6 +52,10 @@ static LPCSTR load_functions(void) hspl = LoadLibraryA(ptr); if (!hspl) return ptr; + ptr = "BuildOtherNamesFromMachineName"; + pBuildOtherNamesFromMachineName = (void *) GetProcAddress(hspl, ptr); + if (!pBuildOtherNamesFromMachineName) return ptr; + ptr = "SplInitializeWinSpoolDrv"; pSplInitializeWinSpoolDrv = (void *) GetProcAddress(hspl, ptr); if (!pSplInitializeWinSpoolDrv) return ptr; @@ -90,6 +95,33 @@ static LPCSTR load_functions(void) /* ########################### */ +static void test_BuildOtherNamesFromMachineName(void) +{ + LPWSTR *buffers; + DWORD numentries; + DWORD res; + + buffers = NULL; + numentries = 0; + + SetLastError(0xdeadbeef); + res = pBuildOtherNamesFromMachineName(&buffers, &numentries); + + /* An array with 3 stringpointer is returned: + entry_#0: "" (empty String) + entry_#1: <hostname> (this is the same as the computernam) + entry_#2: <ip-address> (string with the ip-address of <hostname>) + */ + todo_wine + ok( res && (buffers != NULL) && (numentries == 3) && (buffers[0] != NULL) && (buffers[0][0] == '\0'), + "got %u with %u and %p,%u (%p:%d)\n", res, GetLastError(), buffers, numentries, + ((numentries > 0) && buffers) ? buffers[0] : NULL, + ((numentries > 0) && buffers && buffers[0]) ? lstrlenW(buffers[0]) : -1); + +} + +/* ########################### */ + static void test_SplInitializeWinSpoolDrv(VOID) { DWORD res; @@ -124,6 +156,7 @@ START_TEST(spoolss) return; } + test_BuildOtherNamesFromMachineName(); test_SplInitializeWinSpoolDrv(); }

1 0

Ken Thomases : configure: Fixed a typo: code snippet outside AC_CHECK_HEADERS macro.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: a609fee43a2332a7f745d7c329f2b14722406e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a609fee43a2332a7f745d7c32… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Oct 19 16:18:17 2007 -0500 configure: Fixed a typo: code snippet outside AC_CHECK_HEADERS macro. --- configure | 6 +++--- configure.ac | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 4a32d48..efcf3ad 100755 --- a/configure +++ b/configure @@ -7166,6 +7166,9 @@ cat >>conftest.$ac_ext <<_ACEOF #if HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif + #if HAVE_SYS_SOCKETVAR_H + # include <sys/socketvar.h> + #endif #include <$ac_header> _ACEOF @@ -7208,9 +7211,6 @@ fi done - #if HAVE_SYS_SOCKETVAR_H - # include <sys/socketvar.h> - #endif for ac_header in netinet/tcp_var.h diff --git a/configure.ac b/configure.ac index 92c763e..199e2bb 100644 --- a/configure.ac +++ b/configure.ac @@ -281,10 +281,10 @@ AC_CHECK_HEADERS([netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if [#include <sys/types.h> #if HAVE_SYS_SOCKET_H # include <sys/socket.h> - #endif]) + #endif #if HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> - #endif + #endif]) AC_CHECK_HEADERS([netinet/tcp_var.h],,, [#include <sys/types.h>

1 0

Ken Thomases : configure: netinet/in_pcb.h and netinet/ip_var. h require netinet/in.h on Mac OS X.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: ffd78b153bbed44e9c5d82b1e58e22b041535ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd78b153bbed44e9c5d82b1e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Oct 19 16:18:27 2007 -0500 configure: netinet/in_pcb.h and netinet/ip_var.h require netinet/in.h on Mac OS X. --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/configure b/configure index efcf3ad..86adc79 100755 --- a/configure +++ b/configure @@ -7169,6 +7169,9 @@ cat >>conftest.$ac_ext <<_ACEOF #if HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif + #if HAVE_NETINET_IN_H + # include <netinet/in.h> + #endif #include <$ac_header> _ACEOF diff --git a/configure.ac b/configure.ac index 199e2bb..55c6562 100644 --- a/configure.ac +++ b/configure.ac @@ -284,6 +284,9 @@ AC_CHECK_HEADERS([netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if #endif #if HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> + #endif + #if HAVE_NETINET_IN_H + # include <netinet/in.h> #endif]) AC_CHECK_HEADERS([netinet/tcp_var.h],,,

1 0