June 2007 - Wine-Commits - list.winehq.org

lostwages/ include/config.php templates/en/get ...
by Jeremy Newman June 26, 2007

June 26, 2007

ChangeSet ID: 31230 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/06/26 10:48:38 Modified files: include : config.php templates/en : getting_help.template Log message: Scott Ritchie <scott(a)open-vote.org> Link to the wiki FAQ instead of the outdated one in documentation Patch: http://cvs.winehq.org/patch.py?id=31230 Old revision New revision Changes Path 1.34 1.35 +1 -1 lostwages/include/config.php 1.3 1.4 +1 -1 lostwages/templates/en/getting_help.template Index: lostwages/include/config.php diff -u -p lostwages/include/config.php:1.34 lostwages/include/config.php:1.35 --- lostwages/include/config.php:1.34 26 Jun 2007 15:48:38 -0000 +++ lostwages/include/config.php 26 Jun 2007 15:48:38 -0000 @@ -47,7 +47,7 @@ class config 'Support' => array( 'Support' => '{$root}/site/support', 'Getting Help' => '{$root}/site/getting_help', - 'FAQ' => '{$root}/site/docs/wine-faq/index', + 'FAQ' => 'http://wiki.winehq.org/FAQ', 'Documentation' => '{$root}/site/documentation', 'HowTo' => '{$root}/site/howto', 'Live Support Chat' => '{$root}/site/irc', Index: lostwages/templates/en/getting_help.template diff -u -p lostwages/templates/en/getting_help.template:1.3 lostwages/templates/en/getting_help.template:1.4 --- lostwages/templates/en/getting_help.template:1.3 26 Jun 2007 15:48:38 -0000 +++ lostwages/templates/en/getting_help.template 26 Jun 2007 15:48:38 -0000 @@ -13,7 +13,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="{$root}/site/docs/wine-faq/index"><img src="{$root}/images/faq.png" /><br />FAQ</a> + <a href="http://wiki.winehq.org/FAQ"><img src="{$root}/images/faq.png" /><br />FAQ</a> </td> <td valign="top"> Most questions can be quickly answered by browsing our

1 0

Alexandre Julliard : wineps.drv: List source files explicitly in the makefile to make it easier to parse.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: cfc927ba9330c6e759fdfd4fd0b846df45c297c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfc927ba9330c6e759fdfd4fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 26 13:55:38 2007 +0200 wineps.drv: List source files explicitly in the makefile to make it easier to parse. --- dlls/wineps.drv/Makefile.in | 80 ++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 43 deletions(-) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index 998c47e..ed8282b 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -8,47 +8,6 @@ EXTRAINCL = @FREETYPEINCL@ SPEC_SRCS16 = wineps16.drv.spec -FONTMETRICS = \ - AvantGarde_Book \ - AvantGarde_BookOblique \ - AvantGarde_Demi \ - AvantGarde_DemiOblique \ - Bookman_Demi \ - Bookman_DemiItalic \ - Bookman_Light \ - Bookman_LightItalic \ - Courier \ - Courier_Bold \ - Courier_BoldOblique \ - Courier_Oblique \ - Helvetica \ - Helvetica_Bold \ - Helvetica_BoldOblique \ - Helvetica_Narrow \ - Helvetica_Narrow_Bold \ - Helvetica_Narrow_BoldOblique \ - Helvetica_Narrow_Oblique \ - Helvetica_Oblique \ - NewCenturySchlbk_Bold \ - NewCenturySchlbk_BoldItalic \ - NewCenturySchlbk_Italic \ - NewCenturySchlbk_Roman \ - Palatino_Bold \ - Palatino_BoldItalic \ - Palatino_Italic \ - Palatino_Roman \ - Symbol \ - Times_Bold \ - Times_BoldItalic \ - Times_Italic \ - Times_Roman \ - ZapfChancery_MediumItalic \ - ZapfDingbats \ - -DATA_C_SRCS = \ - data/agl.c \ - $(FONTMETRICS:%=data/%.c) - C_SRCS = \ afm.c \ bitblt.c \ @@ -57,6 +16,42 @@ C_SRCS = \ builtin.c \ clipping.c \ color.c \ + data/AvantGarde_Book.c \ + data/AvantGarde_BookOblique.c \ + data/AvantGarde_Demi.c \ + data/AvantGarde_DemiOblique.c \ + data/Bookman_Demi.c \ + data/Bookman_DemiItalic.c \ + data/Bookman_Light.c \ + data/Bookman_LightItalic.c \ + data/Courier.c \ + data/Courier_Bold.c \ + data/Courier_BoldOblique.c \ + data/Courier_Oblique.c \ + data/Helvetica.c \ + data/Helvetica_Bold.c \ + data/Helvetica_BoldOblique.c \ + data/Helvetica_Narrow.c \ + data/Helvetica_Narrow_Bold.c \ + data/Helvetica_Narrow_BoldOblique.c \ + data/Helvetica_Narrow_Oblique.c \ + data/Helvetica_Oblique.c \ + data/NewCenturySchlbk_Bold.c \ + data/NewCenturySchlbk_BoldItalic.c \ + data/NewCenturySchlbk_Italic.c \ + data/NewCenturySchlbk_Roman.c \ + data/Palatino_Bold.c \ + data/Palatino_BoldItalic.c \ + data/Palatino_Italic.c \ + data/Palatino_Roman.c \ + data/Symbol.c \ + data/Times_Bold.c \ + data/Times_BoldItalic.c \ + data/Times_Italic.c \ + data/Times_Roman.c \ + data/ZapfChancery_MediumItalic.c \ + data/ZapfDingbats.c \ + data/agl.c \ download.c \ driver.c \ encode.c \ @@ -73,8 +68,7 @@ C_SRCS = \ truetype.c \ type1.c \ type1afm.c \ - type42.c \ - $(DATA_C_SRCS) + type42.c RC_SRCS= rsrc.rc

1 0

Andrew Talbot : ntdll: Constify some variables.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: 61cb830b9ba3ec39f652922a08bd9bc3b0488b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61cb830b9ba3ec39f652922a0… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jun 25 21:11:38 2007 +0100 ntdll: Constify some variables. --- dlls/ntdll/serial.c | 2 +- dlls/ntdll/tape.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 750b750..4e8a445 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -1097,7 +1097,7 @@ out_now: return status; } -static NTSTATUS xmit_immediate(HANDLE hDevice, int fd, char* ptr) +static NTSTATUS xmit_immediate(HANDLE hDevice, int fd, const char* ptr) { /* FIXME: not perfect as it should bypass the in-queue */ WARN("(%p,'%c') not perfect!\n", hDevice, *ptr); diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index 43817fe..1a32efb 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -97,7 +97,7 @@ static NTSTATUS TAPE_GetStatus( int error ) /****************************************************************** * TAPE_CreatePartition */ -static NTSTATUS TAPE_CreatePartition( int fd, TAPE_CREATE_PARTITION *data ) +static NTSTATUS TAPE_CreatePartition( int fd, const TAPE_CREATE_PARTITION *data ) { #ifdef HAVE_SYS_MTIO_H struct mtop cmd; @@ -139,7 +139,7 @@ static NTSTATUS TAPE_CreatePartition( int fd, TAPE_CREATE_PARTITION *data ) /****************************************************************** * TAPE_Erase */ -static NTSTATUS TAPE_Erase( int fd, TAPE_ERASE *data ) +static NTSTATUS TAPE_Erase( int fd, const TAPE_ERASE *data ) { #ifdef HAVE_SYS_MTIO_H struct mtop cmd; @@ -300,7 +300,7 @@ static NTSTATUS TAPE_GetPosition( int fd, ULONG type, TAPE_GET_POSITION *data ) /****************************************************************** * TAPE_Prepare */ -static NTSTATUS TAPE_Prepare( int fd, TAPE_PREPARE *data ) +static NTSTATUS TAPE_Prepare( int fd, const TAPE_PREPARE *data ) { #ifdef HAVE_SYS_MTIO_H struct mtop cmd; @@ -353,7 +353,7 @@ static NTSTATUS TAPE_Prepare( int fd, TAPE_PREPARE *data ) /****************************************************************** * TAPE_SetDriveParams */ -static NTSTATUS TAPE_SetDriveParams( int fd, TAPE_SET_DRIVE_PARAMETERS *data ) +static NTSTATUS TAPE_SetDriveParams( int fd, const TAPE_SET_DRIVE_PARAMETERS *data ) { #if defined(HAVE_SYS_MTIO_H) && defined(MTCOMPRESSION) struct mtop cmd; @@ -379,7 +379,7 @@ static NTSTATUS TAPE_SetDriveParams( int fd, TAPE_SET_DRIVE_PARAMETERS *data ) /****************************************************************** * TAPE_SetMediaParams */ -static NTSTATUS TAPE_SetMediaParams( int fd, TAPE_SET_MEDIA_PARAMETERS *data ) +static NTSTATUS TAPE_SetMediaParams( int fd, const TAPE_SET_MEDIA_PARAMETERS *data ) { #ifdef HAVE_SYS_MTIO_H struct mtop cmd; @@ -399,7 +399,7 @@ static NTSTATUS TAPE_SetMediaParams( int fd, TAPE_SET_MEDIA_PARAMETERS *data ) /****************************************************************** * TAPE_SetPosition */ -static NTSTATUS TAPE_SetPosition( int fd, TAPE_SET_POSITION *data ) +static NTSTATUS TAPE_SetPosition( int fd, const TAPE_SET_POSITION *data ) { #ifdef HAVE_SYS_MTIO_H struct mtop cmd; @@ -470,7 +470,7 @@ static NTSTATUS TAPE_SetPosition( int fd, TAPE_SET_POSITION *data ) /****************************************************************** * TAPE_WriteMarks */ -static NTSTATUS TAPE_WriteMarks( int fd, TAPE_WRITE_MARKS *data ) +static NTSTATUS TAPE_WriteMarks( int fd, const TAPE_WRITE_MARKS *data ) { #ifdef HAVE_SYS_MTIO_H struct mtop cmd;

1 0

Andrew Talbot : ntdll: Constify some variables.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: 87791cfe7193f271b1d6fd54a4e2cff95e2aeee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87791cfe7193f271b1d6fd54a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jun 23 18:34:32 2007 +0100 ntdll: Constify some variables. --- dlls/ntdll/file.c | 4 ++-- dlls/ntdll/relay.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index de779f2..2f23862 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -465,7 +465,7 @@ static NTSTATUS get_io_timeouts( HANDLE handle, enum server_fd_type type, ULONG /* retrieve the timeout for the next wait, in milliseconds */ -static inline int get_next_io_timeout( struct io_timeouts *timeouts, ULONG already ) +static inline int get_next_io_timeout( const struct io_timeouts *timeouts, ULONG already ) { int ret = -1; @@ -973,7 +973,7 @@ static void WINAPI ioctl_apc( void *arg, IO_STATUS_BLOCK *io, ULONG reserved ) static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, IO_STATUS_BLOCK *io, ULONG code, - PVOID in_buffer, ULONG in_size, + const void *in_buffer, ULONG in_size, PVOID out_buffer, ULONG out_size ) { struct async_ioctl *async; diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index cde1181..0b592ce 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -242,7 +242,7 @@ static void init_debug_lists(void) * * Check if a given module and function is in the list. */ -static BOOL check_list( const char *module, int ordinal, const char *func, const WCHAR **list ) +static BOOL check_list( const char *module, int ordinal, const char *func, const WCHAR *const *list ) { char ord_str[10]; @@ -320,14 +320,14 @@ static BOOL check_from_module( const WCHAR **includelist, const WCHAR **excludel /*********************************************************************** * RELAY_PrintArgs */ -static inline void RELAY_PrintArgs( int *args, int nb_args, unsigned int typemask ) +static inline void RELAY_PrintArgs( const int *args, int nb_args, unsigned int typemask ) { while (nb_args--) { if ((typemask & 3) && HIWORD(*args)) { if (typemask & 2) - DPRINTF( "%08x %s", *args, debugstr_w((LPWSTR)*args) ); + DPRINTF( "%08x %s", *args, debugstr_w((LPCWSTR)*args) ); else DPRINTF( "%08x %s", *args, debugstr_a((LPCSTR)*args) ); } @@ -367,7 +367,7 @@ __ASM_GLOBAL_FUNC( call_entry_point, * * stack points to the return address, i.e. the first argument is stack[1]. */ -static LONGLONG WINAPI relay_call_from_32( struct relay_descr *descr, unsigned int idx, int *stack ) +static LONGLONG WINAPI relay_call_from_32( struct relay_descr *descr, unsigned int idx, const int *stack ) { LONGLONG ret; WORD ordinal = LOWORD(idx);

1 0

Andrew Talbot : ntdll: Constify some variables.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: 33c0db06f9be941a106444d34b5111cbd078427b URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c0db06f9be941a106444d34… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jun 22 19:48:12 2007 +0100 ntdll: Constify some variables. --- dlls/ntdll/env.c | 6 +++--- include/winternl.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 193237d..fd6f185 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -263,7 +263,7 @@ done: * RtlExpandEnvironmentStrings_U (NTDLL.@) * */ -NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PWSTR renv, const UNICODE_STRING* us_src, +NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PCWSTR renv, const UNICODE_STRING* us_src, PUNICODE_STRING us_dst, PULONG plen) { DWORD src_len, len, count, total_size = 1; /* 1 for terminating '\0' */ @@ -367,9 +367,9 @@ PRTL_USER_PROCESS_PARAMETERS WINAPI RtlNormalizeProcessParams( RTL_USER_PROCESS_ } -static inline void denormalize( void *base, WCHAR **ptr ) +static inline void denormalize( const void *base, WCHAR **ptr ) { - if (*ptr) *ptr = (WCHAR *)(UINT_PTR)((char *)*ptr - (char *)base); + if (*ptr) *ptr = (WCHAR *)(UINT_PTR)((char *)*ptr - (const char *)base); } /****************************************************************************** diff --git a/include/winternl.h b/include/winternl.h index afbf47b..9226d14 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2057,7 +2057,7 @@ BOOL WINAPI RtlEqualSid(PSID,PSID); BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); void DECLSPEC_NORETURN WINAPI RtlExitUserThread(ULONG); -NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); +NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PCWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT); LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT); LONGLONG WINAPI RtlExtendedLargeIntegerDivide(LONGLONG,INT,INT *);

1 0

Andrew Talbot : ntdll: Constify some variables.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: bd15feab4a36b9f143289b8d8fd2d995b3f0e262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd15feab4a36b9f143289b8d8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jun 22 19:49:30 2007 +0100 ntdll: Constify some variables. --- dlls/ntdll/cdrom.c | 12 ++++++------ dlls/ntdll/debugbuffer.c | 8 ++++---- dlls/ntdll/directory.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index f288bfe..e245aad 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1738,7 +1738,7 @@ static NTSTATUS CDROM_GetAddress(int fd, SCSI_ADDRESS* address) * * */ -static NTSTATUS DVD_StartSession(int fd, PDVD_SESSION_ID sid_in, PDVD_SESSION_ID sid_out) +static NTSTATUS DVD_StartSession(int fd, const DVD_SESSION_ID *sid_in, PDVD_SESSION_ID sid_out) { #if defined(linux) NTSTATUS ret = STATUS_NOT_SUPPORTED; @@ -1746,7 +1746,7 @@ static NTSTATUS DVD_StartSession(int fd, PDVD_SESSION_ID sid_in, PDVD_SESSION_ID memset( &auth_info, 0, sizeof( auth_info ) ); auth_info.type = DVD_LU_SEND_AGID; - if (sid_in) auth_info.lsa.agid = *(int*)sid_in; /* ?*/ + if (sid_in) auth_info.lsa.agid = *(const int*)sid_in; /* ?*/ TRACE("fd 0x%08x\n",fd); ret =CDROM_GetStatusCode(ioctl(fd, DVD_AUTH, &auth_info)); @@ -1764,14 +1764,14 @@ static NTSTATUS DVD_StartSession(int fd, PDVD_SESSION_ID sid_in, PDVD_SESSION_ID * * */ -static NTSTATUS DVD_EndSession(int fd, PDVD_SESSION_ID sid) +static NTSTATUS DVD_EndSession(int fd, const DVD_SESSION_ID *sid) { #if defined(linux) dvd_authinfo auth_info; memset( &auth_info, 0, sizeof( auth_info ) ); auth_info.type = DVD_INVALIDATE_AGID; - auth_info.lsa.agid = *(int*)sid; + auth_info.lsa.agid = *(const int*)sid; TRACE("\n"); return CDROM_GetStatusCode(ioctl(fd, DVD_AUTH, &auth_info)); @@ -1787,7 +1787,7 @@ static NTSTATUS DVD_EndSession(int fd, PDVD_SESSION_ID sid) * * */ -static NTSTATUS DVD_SendKey(int fd, PDVD_COPY_PROTECT_KEY key) +static NTSTATUS DVD_SendKey(int fd, const DVD_COPY_PROTECT_KEY *key) { #if defined(linux) NTSTATUS ret = STATUS_NOT_SUPPORTED; @@ -1931,7 +1931,7 @@ static NTSTATUS DVD_GetRegion(int dev, PDVD_REGION region) * * */ -static NTSTATUS DVD_ReadStructure(int dev, PDVD_READ_STRUCTURE structure, PDVD_LAYER_DESCRIPTOR layer) +static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, PDVD_LAYER_DESCRIPTOR layer) { #ifdef DVD_READ_STRUCT dvd_struct s; diff --git a/dlls/ntdll/debugbuffer.c b/dlls/ntdll/debugbuffer.c index e962597..be1ddff 100644 --- a/dlls/ntdll/debugbuffer.c +++ b/dlls/ntdll/debugbuffer.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(debug_buffer); -static void dump_DEBUG_MODULE_INFORMATION(PDEBUG_MODULE_INFORMATION iBuf) +static void dump_DEBUG_MODULE_INFORMATION(const DEBUG_MODULE_INFORMATION *iBuf) { TRACE( "MODULE_INFORMATION:%p\n", iBuf ); if (NULL == iBuf) return ; @@ -44,7 +44,7 @@ static void dump_DEBUG_MODULE_INFORMATION(PDEBUG_MODULE_INFORMATION iBuf) TRACE( "Flags:%d\n", iBuf->Flags ); } -static void dump_DEBUG_HEAP_INFORMATION(PDEBUG_HEAP_INFORMATION iBuf) +static void dump_DEBUG_HEAP_INFORMATION(const DEBUG_HEAP_INFORMATION *iBuf) { TRACE( "HEAP_INFORMATION:%p\n", iBuf ); if (NULL == iBuf) return ; @@ -52,7 +52,7 @@ static void dump_DEBUG_HEAP_INFORMATION(PDEBUG_HEAP_INFORMATION iBuf) TRACE( "Flags:%d\n", iBuf->Flags ); } -static void dump_DEBUG_LOCK_INFORMATION(PDEBUG_LOCK_INFORMATION iBuf) +static void dump_DEBUG_LOCK_INFORMATION(const DEBUG_LOCK_INFORMATION *iBuf) { TRACE( "LOCK_INFORMATION:%p\n", iBuf ); @@ -70,7 +70,7 @@ static void dump_DEBUG_LOCK_INFORMATION(PDEBUG_LOCK_INFORMATION iBuf) TRACE( "NumberOfExclusiveWaiters:%d\n", iBuf->NumberOfExclusiveWaiters ); } -static void dump_DEBUG_BUFFER(PDEBUG_BUFFER iBuf) +static void dump_DEBUG_BUFFER(const DEBUG_BUFFER *iBuf) { if (NULL == iBuf) return ; TRACE( "SectionHandle:%p\n", iBuf->SectionHandle); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 5eac7f3..9975455 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -161,7 +161,7 @@ static inline BOOL is_invalid_dos_char( WCHAR ch ) } /* check if the device can be a mounted volume */ -static inline int is_valid_mounted_device( struct stat *st ) +static inline int is_valid_mounted_device( const struct stat *st ) { #if defined(linux) || defined(__sun__) return S_ISBLK( st->st_mode );

1 0

Lei Zhang : comctl32: Determine if PSH_PROPSHEETPAGE is set once.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: e3b80a0d882239a7bebb03ac49ee4698c1e9be43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b80a0d882239a7bebb03ac4… Author: Lei Zhang <thestig(a)google.com> Date: Tue Jun 26 00:22:19 2007 -0700 comctl32: Determine if PSH_PROPSHEETPAGE is set once. --- dlls/comctl32/propsheet.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index b8e156c..d5142a8 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -120,6 +120,7 @@ typedef struct tagPropSheetInfo BOOL hasHelp; BOOL hasApply; BOOL hasFinish; + BOOL usePropPage; BOOL useCallback; BOOL activeValid; PropPageInfo* proppage; @@ -298,6 +299,7 @@ static void PROPSHEET_CollectSheetInfoCommon(PropSheetInfo * psInfo, DWORD dwFla psInfo->hasApply = !(dwFlags & PSH_NOAPPLYNOW); psInfo->hasFinish = dwFlags & PSH_WIZARDHASFINISH; psInfo->isModeless = dwFlags & PSH_MODELESS; + psInfo->usePropPage = dwFlags & PSH_PROPSHEETPAGE; if (psInfo->active_page < 0 || psInfo->active_page >= psInfo->nPages) psInfo->active_page = 0; @@ -2829,7 +2831,7 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) for (n = i = 0; i < lppsh->nPages; i++, n++) { - if (!(lppsh->dwFlags & PSH_PROPSHEETPAGE)) + if (!psInfo->usePropPage) psInfo->proppage[n].hpage = psInfo->ppshheader.u3.phpage[i]; else { @@ -2840,7 +2842,7 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage, psInfo, n)) { - if (lppsh->dwFlags & PSH_PROPSHEETPAGE) + if (psInfo->usePropPage) DestroyPropertySheetPage(psInfo->proppage[n].hpage); n--; psInfo->nPages--; @@ -2872,7 +2874,7 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) for (n = i = 0; i < lppsh->nPages; i++, n++) { - if (!(lppsh->dwFlags & PSH_PROPSHEETPAGE)) + if (!psInfo->usePropPage) psInfo->proppage[n].hpage = psInfo->ppshheader.u3.phpage[i]; else { @@ -2883,7 +2885,7 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage, psInfo, n)) { - if (lppsh->dwFlags & PSH_PROPSHEETPAGE) + if (psInfo->usePropPage) DestroyPropertySheetPage(psInfo->proppage[n].hpage); n--; psInfo->nPages--;

1 0

Lei Zhang : comctl32: Reduce duplicate code between PROPSHEET_CollectSheetInfoA/W.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: f4dd14abc6ddf7b1b1f50bf75df8b857af85f6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4dd14abc6ddf7b1b1f50bf75… Author: Lei Zhang <thestig(a)google.com> Date: Tue Jun 26 00:14:03 2007 -0700 comctl32: Reduce duplicate code between PROPSHEET_CollectSheetInfoA/W. --- dlls/comctl32/propsheet.c | 55 ++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 6a60e19..b8e156c 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -286,29 +286,44 @@ static void PROPSHEET_AtoW(LPCWSTR *tostr, LPCSTR frstr) } /****************************************************************************** + * PROPSHEET_CollectSheetInfoCommon + * + * Common code for PROPSHEET_CollectSheetInfoA/W + */ +static void PROPSHEET_CollectSheetInfoCommon(PropSheetInfo * psInfo, DWORD dwFlags) +{ + PROPSHEET_UnImplementedFlags(dwFlags); + + psInfo->hasHelp = dwFlags & PSH_HASHELP; + psInfo->hasApply = !(dwFlags & PSH_NOAPPLYNOW); + psInfo->hasFinish = dwFlags & PSH_WIZARDHASFINISH; + psInfo->isModeless = dwFlags & PSH_MODELESS; + if (psInfo->active_page < 0 || psInfo->active_page >= psInfo->nPages) + psInfo->active_page = 0; + + psInfo->result = 0; + psInfo->hImageList = 0; + psInfo->activeValid = FALSE; +} + +/****************************************************************************** * PROPSHEET_CollectSheetInfoA * * Collect relevant data. */ -static BOOL PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh, +static void PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh, PropSheetInfo * psInfo) { DWORD dwSize = min(lppsh->dwSize,sizeof(PROPSHEETHEADERA)); DWORD dwFlags = lppsh->dwFlags; - psInfo->hasHelp = dwFlags & PSH_HASHELP; - psInfo->hasApply = !(dwFlags & PSH_NOAPPLYNOW); - psInfo->hasFinish = dwFlags & PSH_WIZARDHASFINISH; psInfo->useCallback = (dwFlags & PSH_USECALLBACK )&& (lppsh->pfnCallback); - psInfo->isModeless = dwFlags & PSH_MODELESS; memcpy(&psInfo->ppshheader,lppsh,dwSize); TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%d\ndwFlags\t\t%08x\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n", lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_a(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback); - PROPSHEET_UnImplementedFlags(lppsh->dwFlags); - if (lppsh->dwFlags & INTRNL_ANY_WIZARD) psInfo->ppshheader.pszCaption = NULL; else @@ -332,14 +347,7 @@ static BOOL PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh, else psInfo->active_page = lppsh->u2.nStartPage; - if (psInfo->active_page < 0 || psInfo->active_page >= psInfo->nPages) - psInfo->active_page = 0; - - psInfo->result = 0; - psInfo->hImageList = 0; - psInfo->activeValid = FALSE; - - return TRUE; + PROPSHEET_CollectSheetInfoCommon(psInfo, dwFlags); } /****************************************************************************** @@ -347,24 +355,18 @@ static BOOL PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh, * * Collect relevant data. */ -static BOOL PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh, +static void PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh, PropSheetInfo * psInfo) { DWORD dwSize = min(lppsh->dwSize,sizeof(PROPSHEETHEADERW)); DWORD dwFlags = lppsh->dwFlags; - psInfo->hasHelp = dwFlags & PSH_HASHELP; - psInfo->hasApply = !(dwFlags & PSH_NOAPPLYNOW); - psInfo->hasFinish = dwFlags & PSH_WIZARDHASFINISH; psInfo->useCallback = (dwFlags & PSH_USECALLBACK) && (lppsh->pfnCallback); - psInfo->isModeless = dwFlags & PSH_MODELESS; memcpy(&psInfo->ppshheader,lppsh,dwSize); TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%d\ndwFlags\t\t%08x\nhwndParent\t%p\nhInstance\t%p\npszCaption\t%s\nnPages\t\t%d\npfnCallback\t%p\n", lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_w(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback); - PROPSHEET_UnImplementedFlags(lppsh->dwFlags); - if (lppsh->dwFlags & INTRNL_ANY_WIZARD) psInfo->ppshheader.pszCaption = NULL; else @@ -387,14 +389,7 @@ static BOOL PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh, else psInfo->active_page = lppsh->u2.nStartPage; - if (psInfo->active_page < 0 || psInfo->active_page >= psInfo->nPages) - psInfo->active_page = 0; - - psInfo->result = 0; - psInfo->hImageList = 0; - psInfo->activeValid = FALSE; - - return TRUE; + PROPSHEET_CollectSheetInfoCommon(psInfo, dwFlags); } /******************************************************************************

1 0

Lei Zhang : comctl32: Reduce duplicate code between PropertySheetA/W.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: 0cbee494b34354b533346eece60e03f6cdaf9cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbee494b34354b533346eece… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jun 25 23:56:24 2007 -0700 comctl32: Reduce duplicate code between PropertySheetA/W. --- dlls/comctl32/propsheet.c | 56 +++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 04929c5..6a60e19 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2780,6 +2780,31 @@ static INT do_loop(const PropSheetInfo *psInfo) } /****************************************************************************** + * PROPSHEET_PropertySheet + * + * Common code between PropertySheetA/W + */ +static INT_PTR PROPSHEET_PropertySheet(PropSheetInfo* psInfo, BOOL unicode) +{ + INT_PTR bRet = 0; + if (psInfo->active_page >= psInfo->nPages) psInfo->active_page = 0; + TRACE("startpage: %d of %d pages\n", psInfo->active_page, psInfo->nPages); + + psInfo->unicode = unicode; + psInfo->ended = FALSE; + + bRet = PROPSHEET_CreateDialog(psInfo); + if(!psInfo->isModeless) + { + HWND parent = GetParent(psInfo->hwnd); + if (parent) EnableWindow(parent, FALSE); + bRet = do_loop(psInfo); + if (parent) EnableWindow(parent, TRUE); + } + return bRet; +} + +/****************************************************************************** * PropertySheet (COMCTL32.@) * PropertySheetA (COMCTL32.@) * @@ -2794,7 +2819,6 @@ static INT do_loop(const PropSheetInfo *psInfo) */ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) { - INT_PTR bRet = 0; PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR, sizeof(PropSheetInfo)); UINT i, n; @@ -2828,22 +2852,7 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) } } - if (psInfo->active_page >= psInfo->nPages) psInfo->active_page = 0; - TRACE("startpage: %d of %d pages\n", psInfo->active_page, psInfo->nPages); - - psInfo->unicode = FALSE; - psInfo->ended = FALSE; - - bRet = PROPSHEET_CreateDialog(psInfo); - if(!psInfo->isModeless) - { - HWND parent = GetParent(psInfo->hwnd); - if (parent) EnableWindow(parent, FALSE); - bRet = do_loop(psInfo); - if (parent) EnableWindow(parent, TRUE); - } - - return bRet; + return PROPSHEET_PropertySheet(psInfo, FALSE); } /****************************************************************************** @@ -2853,7 +2862,6 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) */ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) { - INT_PTR bRet = 0; PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR, sizeof(PropSheetInfo)); UINT i, n; @@ -2887,17 +2895,7 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) } } - if (psInfo->active_page >= psInfo->nPages) psInfo->active_page = 0; - TRACE("startpage: %d of %d pages\n", psInfo->active_page, psInfo->nPages); - - psInfo->unicode = TRUE; - psInfo->ended = FALSE; - - bRet = PROPSHEET_CreateDialog(psInfo); - if(!psInfo->isModeless) - bRet = do_loop(psInfo); - - return bRet; + return PROPSHEET_PropertySheet(psInfo, TRUE); } static LPWSTR load_string( HINSTANCE instance, LPCWSTR str )

1 0

Francois Gouget : dsound: Add missing '\n' to Wine trace.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: 2f0ca64dac33888e37b9d4f11915550099dc9cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0ca64dac33888e37b9d4f11… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 26 10:38:04 2007 +0200 dsound: Add missing '\n' to Wine trace. --- dlls/dsound/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 1346dca..98dfe52 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -927,7 +927,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* buffers are full. start stopping if applicable */ if(device->state == STATE_STOPPED){ - TRACE("restarting primary buffer"); + TRACE("restarting primary buffer\n"); if(DSOUND_PrimaryPlay(device) != DS_OK){ WARN("DSOUND_PrimaryPlay failed\n"); }

1 0