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

Vincent Povirk : ole32: Don' t treat the header as a big block in StorageImpl_SaveFileHeader.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: f3db25fc2589cec8cc9aa64ba1adc3410e7d2384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3db25fc2589cec8cc9aa64ba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 10 13:57:35 2010 -0600 ole32: Don't treat the header as a big block in StorageImpl_SaveFileHeader. --- dlls/ole32/storage32.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0d07aed..9f43264 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3399,29 +3399,35 @@ static HRESULT StorageImpl_LoadFileHeader( /****************************************************************************** * Storage32Impl_SaveFileHeader * - * This method will save to the file the header, i.e. big block -1. + * This method will save to the file the header */ static void StorageImpl_SaveFileHeader( StorageImpl* This) { - BYTE headerBigBlock[BIG_BLOCK_SIZE]; + BYTE headerBigBlock[HEADER_SIZE]; int index; - BOOL success; + HRESULT hr; + ULARGE_INTEGER offset; + DWORD bytes_read, bytes_written; /* * Get a pointer to the big block of data containing the header. */ - success = StorageImpl_ReadBigBlock(This, -1, headerBigBlock); + offset.u.HighPart = 0; + offset.u.LowPart = 0; + hr = StorageImpl_ReadAt(This, offset, headerBigBlock, HEADER_SIZE, &bytes_read); + if (SUCCEEDED(hr) && bytes_read != HEADER_SIZE) + hr = STG_E_FILENOTFOUND; /* * If the block read failed, the file is probably new. */ - if (!success) + if (FAILED(hr)) { /* * Initialize for all unknown fields. */ - memset(headerBigBlock, 0, BIG_BLOCK_SIZE); + memset(headerBigBlock, 0, HEADER_SIZE); /* * Initialize the magic number. @@ -3492,7 +3498,7 @@ static void StorageImpl_SaveFileHeader( /* * Write the big block back to the file. */ - StorageImpl_WriteBigBlock(This, -1, headerBigBlock); + StorageImpl_WriteAt(This, offset, headerBigBlock, HEADER_SIZE, &bytes_written); } /******************************************************************************

1 0

Vincent Povirk : ole32: Fix the big block offset calculation.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 4b7e7bd77f08f7b14911462dc89ecc014d74aed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7e7bd77f08f7b14911462dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 10 14:03:12 2010 -0600 ole32: Fix the big block offset calculation. Use the actual big block size from the open storage file. Also, remove a special case that was only used for reading/writing the header. --- dlls/ole32/storage32.c | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9f43264..3996a01 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -269,14 +269,9 @@ static void IEnumSTATSTGImpl_Destroy(IEnumSTATSTGImpl* This); ** Block Functions */ -static ULONG BLOCK_GetBigBlockOffset(ULONG index) +static ULONG StorageImpl_GetBigBlockOffset(StorageImpl* This, ULONG index) { - if (index == 0xffffffff) - index = 0; - else - index ++; - - return index * BIG_BLOCK_SIZE; + return (index+1) * This->bigBlockSize; } /************************************************************************ @@ -3740,7 +3735,7 @@ static BOOL StorageImpl_ReadBigBlock( DWORD read; ulOffset.u.HighPart = 0; - ulOffset.u.LowPart = BLOCK_GetBigBlockOffset(blockIndex); + ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex); StorageImpl_ReadAt(This, ulOffset, buffer, This->bigBlockSize, &read); return (read == This->bigBlockSize); @@ -3757,7 +3752,7 @@ static BOOL StorageImpl_ReadDWordFromBigBlock( DWORD tmp; ulOffset.u.HighPart = 0; - ulOffset.u.LowPart = BLOCK_GetBigBlockOffset(blockIndex); + ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex); ulOffset.u.LowPart += offset; StorageImpl_ReadAt(This, ulOffset, &tmp, sizeof(DWORD), &read); @@ -3774,7 +3769,7 @@ static BOOL StorageImpl_WriteBigBlock( DWORD wrote; ulOffset.u.HighPart = 0; - ulOffset.u.LowPart = BLOCK_GetBigBlockOffset(blockIndex); + ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex); StorageImpl_WriteAt(This, ulOffset, buffer, This->bigBlockSize, &wrote); return (wrote == This->bigBlockSize); @@ -3790,7 +3785,7 @@ static BOOL StorageImpl_WriteDWordToBigBlock( DWORD wrote; ulOffset.u.HighPart = 0; - ulOffset.u.LowPart = BLOCK_GetBigBlockOffset(blockIndex); + ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex); ulOffset.u.LowPart += offset; value = htole32(value); @@ -5180,7 +5175,7 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, TRACE("block %i\n",blockIndex); ulOffset.u.HighPart = 0; - ulOffset.u.LowPart = BLOCK_GetBigBlockOffset(blockIndex) + + ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This->parentStorage, blockIndex) + offsetInBlock; StorageImpl_ReadAt(This->parentStorage, @@ -5276,7 +5271,7 @@ HRESULT BlockChainStream_WriteAt(BlockChainStream* This, TRACE("block %i\n",blockIndex); ulOffset.u.HighPart = 0; - ulOffset.u.LowPart = BLOCK_GetBigBlockOffset(blockIndex) + + ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This->parentStorage, blockIndex) + offsetInBlock; StorageImpl_WriteAt(This->parentStorage,

1 0

Vincent Povirk : ole32: Remove the unused BlockBits structures from BigBlockFile objects.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: b90ab46a82e673a6a930ea1271c77d78bedecc77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90ab46a82e673a6a930ea127… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 10 16:36:54 2010 -0600 ole32: Remove the unused BlockBits structures from BigBlockFile objects. --- dlls/ole32/stg_bigblockfile.c | 51 ----------------------------------------- 1 files changed, 0 insertions(+), 51 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index 19151b9..4aa3026 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -63,19 +63,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); /* We map in PAGE_SIZE-sized chunks. Must be a multiple of 4096. */ #define PAGE_SIZE 131072 -#define BLOCKS_PER_PAGE (PAGE_SIZE / BIG_BLOCK_SIZE) - /* We keep a list of recently-discarded pages. This controls the * size of that list. */ #define MAX_VICTIM_PAGES 16 -/* This structure provides one bit for each block in a page. - * Use BIGBLOCKFILE_{Test,Set,Clear}Bit to manipulate it. */ -typedef struct -{ - unsigned int bits[BLOCKS_PER_PAGE / (CHAR_BIT * sizeof(unsigned int))]; -} BlockBits; - /*** * This structure identifies the paged that are mapped * from the file and their position in memory. It is @@ -96,9 +87,6 @@ struct MappedPage DWORD mapped_bytes; LPVOID lpBytes; LONG refcnt; - - BlockBits readable_blocks; - BlockBits writable_blocks; }; struct BigBlockFile @@ -123,39 +111,6 @@ struct BigBlockFile * pass expressions with side effects. */ #define ROUND_UP(a, b) ((((a) + (b) - 1)/(b))*(b)) -/*********************************************************** - * Blockbits functions. - */ -static inline BOOL BIGBLOCKFILE_TestBit(const BlockBits *bb, - unsigned int index) -{ - unsigned int array_index = index / (CHAR_BIT * sizeof(unsigned int)); - unsigned int bit_index = index % (CHAR_BIT * sizeof(unsigned int)); - - return bb->bits[array_index] & (1 << bit_index); -} - -static inline void BIGBLOCKFILE_SetBit(BlockBits *bb, unsigned int index) -{ - unsigned int array_index = index / (CHAR_BIT * sizeof(unsigned int)); - unsigned int bit_index = index % (CHAR_BIT * sizeof(unsigned int)); - - bb->bits[array_index] |= (1 << bit_index); -} - -static inline void BIGBLOCKFILE_ClearBit(BlockBits *bb, unsigned int index) -{ - unsigned int array_index = index / (CHAR_BIT * sizeof(unsigned int)); - unsigned int bit_index = index % (CHAR_BIT * sizeof(unsigned int)); - - bb->bits[array_index] &= ~(1 << bit_index); -} - -static inline void BIGBLOCKFILE_Zero(BlockBits *bb) -{ - memset(bb->bits, 0, sizeof(bb->bits)); -} - /****************************************************************************** * BIGBLOCKFILE_FileInit * @@ -302,9 +257,6 @@ static MappedPage *BIGBLOCKFILE_CreatePage(BigBlockFile *This, ULONG page_index) return NULL; } - BIGBLOCKFILE_Zero(&page->readable_blocks); - BIGBLOCKFILE_Zero(&page->writable_blocks); - return page; } @@ -328,9 +280,6 @@ static void * BIGBLOCKFILE_GetMappedView( if (page) { This->num_victim_pages--; - - BIGBLOCKFILE_Zero(&page->readable_blocks); - BIGBLOCKFILE_Zero(&page->writable_blocks); } }

1 0

Vincent Povirk : ole32: Allow storage files with a block size of 4096 to open.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 93c2256cfff643bdc2ca61dd1fdee9f4a45e859e URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c2256cfff643bdc2ca61dd1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 10 15:08:57 2010 -0600 ole32: Allow storage files with a block size of 4096 to open. --- dlls/ole32/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 6ee60a1..f1706da 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3381,7 +3381,7 @@ static HRESULT StorageImpl_LoadFileHeader( * Right now, the code is making some assumptions about the size of the * blocks, just make sure they are what we're expecting. */ - if (This->bigBlockSize != DEF_BIG_BLOCK_SIZE || + if ((This->bigBlockSize != MIN_BIG_BLOCK_SIZE && This->bigBlockSize != MAX_BIG_BLOCK_SIZE) || This->smallBlockSize != DEF_SMALL_BLOCK_SIZE) { WARN("Broken OLE storage file\n");

1 0

Huw Davies : wineps.drv: Retrieve the full printer name to avoid truncation when the name is 32 characters or longer .
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 547e97a461ade867dea1a1313c94243f9560d41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=547e97a461ade867dea1a1313… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 12 10:42:44 2010 +0000 wineps.drv: Retrieve the full printer name to avoid truncation when the name is 32 characters or longer. --- dlls/wineps.drv/init.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index ef5d9d8..685a56a 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -305,27 +305,22 @@ BOOL CDECL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWST { PSDRV_PDEVICE *physDev; PRINTERINFO *pi; - char *deviceA; /* If no device name was specified, retrieve the device name - * from the DEVMODE structure from the DC's physDev. + * from the PRINTERINFO structure from the DC's physDev. * (See CreateCompatibleDC) */ if ( !device && *pdev ) { - physDev = *pdev; - deviceA = HeapAlloc(GetProcessHeap(), 0, CCHDEVICENAME); - lstrcpynA(deviceA, (LPCSTR)physDev->Devmode->dmPublic.dmDeviceName, CCHDEVICENAME); + pi = PSDRV_FindPrinterInfo((*pdev)->pi->FriendlyName); } else { DWORD len = WideCharToMultiByte(CP_ACP, 0, device, -1, NULL, 0, NULL, NULL); - deviceA = HeapAlloc(GetProcessHeap(), 0, len); + char *deviceA = HeapAlloc(GetProcessHeap(), 0, len); WideCharToMultiByte(CP_ACP, 0, device, -1, deviceA, len, NULL, NULL); + pi = PSDRV_FindPrinterInfo(deviceA); + HeapFree(GetProcessHeap(), 0, deviceA); } - pi = PSDRV_FindPrinterInfo(deviceA); - - HeapFree(GetProcessHeap(), 0, deviceA); - deviceA = NULL; TRACE("(%s %s %s %p)\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), initData);

1 0

André Hentschel : documentation: Keep README. de in sync.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: a26c3bc0335ff3b0020c15ae8f3bf0d2dc183f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26c3bc0335ff3b0020c15ae8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 12 20:02:08 2010 +0100 documentation: Keep README.de in sync. --- documentation/README.de | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 310f6a5..ba265cd 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -159,20 +159,9 @@ Hinweis: Der Pfad zur Datei wird auch zum Pfad hinzugefügt, wenn ein vollständ Dateiname auf der Kommandozeile angegeben wird. Die Entwicklung von Wine ist noch nicht abgeschlossen, daher können einige -Programme abstürzen. Vorausgesetzt, dass Sie winedbg korrekt entsprechend -documentation/debugger.sgml einrichten, werden Sie dann in einem Debugger landen, -um das Problem untersuchen und beheben zu können. -Weitere Informationen zu diesem Thema entnehmen Sie bitte der Datei -documentation/debugging.sgml. - -Sie sollten Backups von allen wichtigen Dateien machen, auf die Sie Wine -Zugriff gewähren, oder spezielle Kopien für Wine anlegen, da Benutzer einige -Fälle gemeldet haben, in denen Dateien zerstört wurden. Führen Sie zum Beispiel -NICHT den Explorer aus, wenn Sie kein geeignetes Backup haben, da er manchmal -Verzeichnise verstümmelt / umbenennnt. Selbst andere MS-Applikationen wie z.B -der Messenger sind nicht sicher, da sie unter Umständen den Explorer aufrufen. -Diese spezielle Beschädigung (!$!$!$!$.pfr) kann zumindest teilweise durch -http://home.nexgo.de/andi.mohr/download/decorrupt_explorer behoben werden. +Programme abstürzen. In diesem Fall startet der Debugger, so dass Sie das Problem +untersuchen und beheben können. Weitere Informationen zu diesem Thema entnehmen Sie +bitte dem Kapitel Debugging aus dem Wine Developer's Guide. 7. WEITERFÜHRENDE INFORMATIONEN @@ -198,7 +187,7 @@ Git: Der aktuelle Wine-Entwicklungs-Zweig ist über Git verfügbar. Besuchen Sie http://www.winehq.org/site/git für weitere Informationen. Mailing-Listen: - Es gibt mehrere Mailing-Listen für die Wine-Entwickler; Schauen Sie + Es gibt mehrere Mailing-Listen für die Wine-User und -Entwickler; Schauen Sie sich bitte dazu http://www.winehq.org/forums an. Wiki: Das Wine-Wiki finden Sie unter http://wiki.winehq.org

1 0

Paul Vriens : shlwapi/tests: Fix a test failure on NT4.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 2448b8da9be9bebbecf8c500c5b5409b81c9055a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2448b8da9be9bebbecf8c500c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Mar 13 11:26:14 2010 +0100 shlwapi/tests: Fix a test failure on NT4. --- dlls/shlwapi/tests/ordinal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 83aec78..083934b 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1683,10 +1683,11 @@ if (0) flags = FDTF_SHORTDATE | FDTF_LTRDATE | FDTF_RTLDATE; SetLastError(0xdeadbeef); + buff[0] = 0; /* NT4 doesn't clear the buffer on failure */ ret = pSHFormatDateTimeW(&filetime, &flags, buff, sizeof(buff)/sizeof(WCHAR)); ok(ret == lstrlenW(buff)+1, "got %d\n", ret); ok(GetLastError() == 0xdeadbeef || - broken(GetLastError() == ERROR_INVALID_FLAGS), /* Win9x/WinMe */ + broken(GetLastError() == ERROR_INVALID_FLAGS), /* Win9x/WinMe/NT4 */ "expected 0xdeadbeef, got %d\n", GetLastError()); /* now check returned strings */

1 0

Juan Lang : iphlpapi: Check for ifr_hwaddr member of struct ifreq.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 984c3b2ccb83655209b969296e311b36fcf836be URL: http://source.winehq.org/git/wine.git/?a=commit;h=984c3b2ccb83655209b969296… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 12 10:38:46 2010 -0800 iphlpapi: Check for ifr_hwaddr member of struct ifreq. --- configure | 17 +++++++++++++++++ configure.ac | 9 +++++++++ dlls/iphlpapi/ifenum.c | 2 +- include/config.h.in | 3 +++ 4 files changed, 30 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 3807a70..f3eec77 100755 --- a/configure +++ b/configure @@ -13429,6 +13429,23 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_hwaddr" "ac_cv_member_struct_ifreq_ifr_hwaddr" "#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NET_IF_H +# include <net/if.h> +#endif +" +if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_IFREQ_IFR_HWADDR 1 +_ACEOF + + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone variable" >&5 $as_echo_n "checking for timezone variable... " >&6; } if test "${ac_cv_have_timezone+set}" = set; then : diff --git a/configure.ac b/configure.ac index 8eb37a2..e3787eb 100644 --- a/configure.ac +++ b/configure.ac @@ -2047,6 +2047,15 @@ AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],,, #include <netinet/icmp_var.h> #endif]) +dnl Check for struct ifreq.ifr_hwaddr +AC_CHECK_MEMBERS([struct ifreq.ifr_hwaddr],,, +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NET_IF_H +# include <net/if.h> +#endif]) + dnl Check for the external timezone variables timezone and daylight AC_CACHE_CHECK([for timezone variable], ac_cv_have_timezone, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[timezone = 1]])],[ac_cv_have_timezone="yes"],[ac_cv_have_timezone="no"])) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index d348229..02c6a9d 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -298,7 +298,7 @@ static DWORD getInterfaceMaskByName(const char *name) return ret; } -#if defined (SIOCGIFHWADDR) +#if defined (SIOCGIFHWADDR) && defined (HAVE_STRUCT_IFREQ_IFR_HWADDR) static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, PDWORD type) { diff --git a/include/config.h.in b/include/config.h.in index 7c34980..fb8a79b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -777,6 +777,9 @@ /* Define to 1 if `icps_outhist' is a member of `struct icmpstat'. */ #undef HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST +/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */ +#undef HAVE_STRUCT_IFREQ_IFR_HWADDR + /* Define to 1 if `msg_accrights' is a member of `struct msghdr'. */ #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS

1 0

Gerald Pfeifer : comdlg32: Removed unused parameters from PRINTDLG_WMInitDialogW and PRINTDLG_WMInitDialogA .
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 4b25c6e6adeb9ef565fc0f7205b11948fe21a8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b25c6e6adeb9ef565fc0f720… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Mar 6 14:42:25 2010 +0100 comdlg32: Removed unused parameters from PRINTDLG_WMInitDialogW and PRINTDLG_WMInitDialogA. --- dlls/comdlg32/printdlg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index f653251..74a06ff 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1504,7 +1504,7 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, * PRINTDLG_WMCommand [internal] */ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, - LPARAM lParam, PRINT_PTRA* PrintStructures) + PRINT_PTRA* PrintStructures) { LPPRINTDLGA lppd = PrintStructures->lpPrintDlg; UINT PrinterComboID = (lppd->Flags & PD_PRINTSETUP) ? cmb1 : cmb4; @@ -1658,7 +1658,7 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, } static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, - LPARAM lParam, PRINT_PTRW* PrintStructures) + PRINT_PTRW* PrintStructures) { LPPRINTDLGW lppd = PrintStructures->lpPrintDlg; UINT PrinterComboID = (lppd->Flags & PD_PRINTSETUP) ? cmb1 : cmb4; @@ -1846,7 +1846,7 @@ static INT_PTR CALLBACK PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, switch (uMsg) { case WM_COMMAND: - return PRINTDLG_WMCommandA(hDlg, wParam, lParam, PrintStructures); + return PRINTDLG_WMCommandA(hDlg, wParam, PrintStructures); case WM_DESTROY: DestroyIcon(PrintStructures->hCollateIcon); @@ -1892,7 +1892,7 @@ static INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, switch (uMsg) { case WM_COMMAND: - return PRINTDLG_WMCommandW(hDlg, wParam, lParam, PrintStructures); + return PRINTDLG_WMCommandW(hDlg, wParam, PrintStructures); case WM_DESTROY: DestroyIcon(PrintStructures->hCollateIcon);

1 0

Gerald Pfeifer : comdlg32: Removed unused parameters from FILEDLG95_OnWMSize, FILEDLG95_OnWMCommand, and FD32_WMMeasureItem.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 27b7f2596892db9966557ccbf010309be9dd15e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b7f2596892db9966557ccbf… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Mar 6 14:49:41 2010 +0100 comdlg32: Removed unused parameters from FILEDLG95_OnWMSize, FILEDLG95_OnWMCommand, and FD32_WMMeasureItem. --- dlls/comdlg32/filedlg.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 58b57cc..5f90fe1 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -176,7 +176,7 @@ static SIZE MemDialogSize = { 0, 0}; /* keep size of the (resizable) dialog */ /* Internal functions used by the dialog */ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam); static LRESULT FILEDLG95_FillControls(HWND hwnd, WPARAM wParam, LPARAM lParam); -static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam); +static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam); static LRESULT FILEDLG95_OnWMGetIShellBrowser(HWND hwnd); static BOOL FILEDLG95_OnOpen(HWND hwnd); static LRESULT FILEDLG95_InitControls(HWND hwnd); @@ -991,7 +991,7 @@ static LRESULT FILEDLG95_OnWMGetMMI( HWND hwnd, LPMINMAXINFO mmiptr) * vertically or horizontally to get out of the way. Only the "grip" * is moved in both directions to stay in the corner. */ -static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) +static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam) { RECT rc, rcview; int chgx, chgy; @@ -1223,11 +1223,11 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l return 0; } case WM_SIZE: - return FILEDLG95_OnWMSize(hwnd, wParam, lParam); + return FILEDLG95_OnWMSize(hwnd, wParam); case WM_GETMINMAXINFO: return FILEDLG95_OnWMGetMMI( hwnd, (LPMINMAXINFO)lParam); case WM_COMMAND: - return FILEDLG95_OnWMCommand(hwnd, wParam, lParam); + return FILEDLG95_OnWMCommand(hwnd, wParam); case WM_DRAWITEM: { switch(((LPDRAWITEMSTRUCT)lParam)->CtlID) @@ -1733,7 +1733,7 @@ void FILEDLG95_Clean(HWND hwnd) * * WM_COMMAND message handler */ -static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) +static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam) { WORD wNotifyCode = HIWORD(wParam); /* notification code */ WORD wID = LOWORD(wParam); /* item, control, or accelerator identifier */ @@ -3799,7 +3799,7 @@ BOOL FD32_GetTemplate(PFD31_DATA lfs) /*********************************************************************** * FD32_WMMeasureItem [internal] */ -static LONG FD32_WMMeasureItem(HWND hWnd, WPARAM wParam, LPARAM lParam) +static LONG FD32_WMMeasureItem(LPARAM lParam) { LPMEASUREITEMSTRUCT lpmeasure; @@ -3832,7 +3832,7 @@ static INT_PTR CALLBACK FD32_FileOpenDlgProc(HWND hWnd, UINT wMsg, return FD31_WMInitDialog(hWnd, wParam, lParam); case WM_MEASUREITEM: - return FD32_WMMeasureItem(hWnd, wParam, lParam); + return FD32_WMMeasureItem(lParam); case WM_DRAWITEM: return FD31_WMDrawItem(hWnd, wParam, lParam, !lfs->open, (DRAWITEMSTRUCT *)lParam);

1 0