September 2006 - Wine-commits

appdb/ include/application.php unit_test/test_ ...
by WineHQ 29 Sep '06

29 Sep '06

ChangeSet ID: 28390 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/09/29 20:31:04 Modified files: include : application.php unit_test : test_application.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Application::countWithRating() and getWithRating() should avoid queued applications. Add unit test to ensure that we don't include queued applications Patch: http://cvs.winehq.org/patch.py?id=28390 Old revision New revision Changes Path 1.73 1.74 +3 -1 appdb/include/application.php 1.2 1.3 +45 -1 appdb/unit_test/test_application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.73 appdb/include/application.php:1.74 --- appdb/include/application.php:1.73 30 Sep 2006 1:31: 4 -0000 +++ appdb/include/application.php 30 Sep 2006 1:31: 4 -0000 @@ -371,7 +371,8 @@ class Application { { $sQuery = "SELECT DISTINCT count(appId) as total FROM appVersion - WHERE maintainer_rating = '?'"; + WHERE maintainer_rating = '?' + AND queued='false'"; if($hResult = query_parameters($sQuery, $sRating)) { @@ -386,6 +387,7 @@ class Application { $sQuery = "SELECT DISTINCT appId FROM appVersion WHERE maintainer_rating = '?' + AND queued = 'false' ORDER BY appId ASC LIMIT ?, ?"; if($hResult = query_parameters($sQuery, $sRating, $iOffset, $iItemsPerPage)) Index: appdb/unit_test/test_application.php diff -u -p appdb/unit_test/test_application.php:1.2 appdb/unit_test/test_application.php:1.3 --- appdb/unit_test/test_application.php:1.2 30 Sep 2006 1:31: 4 -0000 +++ appdb/unit_test/test_application.php 30 Sep 2006 1:31: 4 -0000 @@ -153,6 +153,50 @@ function test_application_getWithRating( delete_app_and_user($oApp, $oUser); + + //test to ensure getWithRating doesn't return applications that are queued + + if(!$oUser = create_and_login_user()) //create user without admin priveliges + return false; + + + $oApp = new Application(); + $oApp->sName = "Some application"; + $oApp->sDescription = "some description"; + $oApp->submitterId = $oUser->iUserId; + if(!$oApp->create()) + { + $oUser->delete(); /* clean up the user we created prior to exiting */ + echo "Failed to create application!\n"; + return false; + } + + $iAppId = $oApp->iAppId; /* use the iAppId of the application we just created */ + + $oVersion = new Version(); + $oVersion->versionName = "Some Version".$iVersionIdIndex; + $oVersion->description = "Some Version description".$iVersionIdIndex; + $oVersion->iAppId = $oApp->iAppId; + $oVersion->sTestedRating = "Bronze"; + $oVersion->sQueued = "True"; + + if(!$oVersion->create()) + { + delete_app_and_user($oApp, $oUser); + echo "Failed to create version!\n"; + return false; + } + + + $aApps=Application::getWithRating($sRating, $iOffset, $iItemsPerPage); + + if ( in_array($iAppId, $aApps )) //if the appId is in our test results fail queued test + { + delete_app_and_user($oApp, $oUser); + echo "getWithRating failed to return a unique result set\n"; + return false; + } + return true; } @@ -197,7 +241,7 @@ function create_and_login_user() echo "Got '".$retval."' instead of SUCCESS(".SUCCESS.")\n"; return false; } - + return $oUser; }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: 222c167969f8450c798026cca0b59e033e27eae8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=222c167969f8450c798026c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 28 21:03:22 2006 +0200 Assorted spelling fixes. --- dlls/comctl32/header.c | 2 +- dlls/comctl32/listview.c | 8 ++++---- dlls/comctl32/tests/listview.c | 4 ++-- dlls/crypt32/tests/sip.c | 4 ++-- dlls/oleaut32/ungif.c | 6 +++--- dlls/setupapi/tests/devinst.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/vertexbuffer.c | 2 +- dlls/winex11.drv/opengl.c | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 1d4f1fd..63f91d8 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1829,7 +1829,7 @@ HEADER_MouseMove (HWND hwnd, WPARAM wPar HEADER_DrawTrackLine (hwnd, hdc, infoPtr->xOldTrack); ReleaseDC (hwnd, hdc); iTrackWidth = infoPtr->xOldTrack - infoPtr->items[infoPtr->iMoveItem].rect.left; - /* FIXME: should stop tracking if HDN_TRACK returnes TRUE */ + /* FIXME: should stop tracking if HDN_TRACK returns TRUE */ HEADER_SendNotifyWithIntFieldT(hwnd, HDN_TRACKW, infoPtr->iMoveItem, HDI_WIDTH, iTrackWidth); } diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d99b1e2..108d055 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5146,7 +5146,7 @@ static HIMAGELIST LISTVIEW_GetImageList( * [I] hwnd : window handle * [IO] lpLVItem : item info * [I] isW : if TRUE, then lpLVItem is a LPLVITEMW, - * if FALSE, the lpLVItem is a LPLVITEMA. + * if FALSE, then lpLVItem is a LPLVITEMA. * * NOTE: * This is the internal 'GetItem' interface -- it tries to @@ -5203,7 +5203,7 @@ static BOOL LISTVIEW_GetItemT(LISTVIEW_I { dispInfo.item.state = 0; - /* apprently, we should not callback for lParam in LVS_OWNERDATA */ + /* apparently, we should not callback for lParam in LVS_OWNERDATA */ if ((lpLVItem->mask & ~(LVIF_STATE | LVIF_PARAM)) || infoPtr->uCallbackMask) { /* NOTE: copy only fields which we _know_ are initialized, some apps @@ -5399,7 +5399,7 @@ static BOOL LISTVIEW_GetItemT(LISTVIEW_I * [I] hwnd : window handle * [IO] lpLVItem : item info * [I] isW : if TRUE, then lpLVItem is a LPLVITEMW, - * if FALSE, the lpLVItem is a LPLVITEMA. + * if FALSE, then lpLVItem is a LPLVITEMA. * * NOTE: * This is the external 'GetItem' interface -- it properly copies @@ -6630,7 +6630,7 @@ fail: * [I] infoPtr : valid pointer to the listview structure * [I] nColumn : column index * [I] lpColumn : column attributes - * [I] isW: if TRUE, the lpColumn is a LPLVCOLUMNW, else it is a LPLVCOLUMNA + * [I] isW: if TRUE, then lpColumn is a LPLVCOLUMNW, else it is a LPLVCOLUMNA * * RETURN: * SUCCESS : TRUE diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index dd99df9..e96ad26 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -147,7 +147,7 @@ static void test_checkboxes(void) r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); ok(item.state == 0x1ccc, "state %x\n", item.state); - /* Now add an item without specifying a state and check that it's state goes to 0x1000 */ + /* Now add an item without specifying a state and check that its state goes to 0x1000 */ item.iItem = 2; item.mask = LVIF_TEXT; item.state = 0; @@ -161,7 +161,7 @@ static void test_checkboxes(void) r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); ok(item.state == 0x1000, "state %x\n", item.state); - /* Add a further item this time specifying a state and still it's state goes to 0x1000 */ + /* Add a further item this time specifying a state and still its state goes to 0x1000 */ item.iItem = 3; item.mask = LVIF_TEXT | LVIF_STATE; item.stateMask = 0xffff; diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 6fa6b99..8264251 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -149,9 +149,9 @@ static void test_SIPRetrieveSubjectGUID( ok (GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); - /* Test with a non-existent file (hopefully) */ + /* Test with a nonexistent file (hopefully) */ SetLastError(0xdeadbeef); - /* Set subject to something other than zero's */ + /* Set subject to something other than zeros */ memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(deadbeef, NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); diff --git a/dlls/oleaut32/ungif.c b/dlls/oleaut32/ungif.c index 97e8cf1..7ee6e83 100644 --- a/dlls/oleaut32/ungif.c +++ b/dlls/oleaut32/ungif.c @@ -713,9 +713,9 @@ DGifGetPrefixChar(GifPrefixType *Prefix, /****************************************************************************** * The LZ decompression input routine: - * This routine is responsable for the decompression of the bit stream from + * This routine is responsible for the decompression of the bit stream from * 8 bits (bytes) packets, into the real codes. - * Returns GIF_OK if read succesfully. + * Returns GIF_OK if read successfully. *****************************************************************************/ static int DGifDecompressInput(GifFileType * GifFile, @@ -767,7 +767,7 @@ DGifDecompressInput(GifFileType * GifFil * This routines read one gif data block at a time and buffers it internally * so that the decompression routine could access it. * The routine returns the next byte from its internal buffer (or read next - * block in if buffer empty) and returns GIF_OK if succesful. + * block in if buffer empty) and returns GIF_OK if successful. *****************************************************************************/ static int DGifBufferedInput(GifFileType * GifFile, diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 5f02991..41d32ec 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -90,7 +90,7 @@ static void test_SetupDiOpenClassRegKeyE static const CHAR guidString[] = "{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; HKEY hkey; - /* Check return value for non-existent key */ + /* Check return value for nonexistent key */ hkey = pSetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS, DIOCR_INSTALLER, NULL, NULL); ok(hkey == INVALID_HANDLE_VALUE, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3146475..7860396 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2864,7 +2864,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_BltFa DstRect.right = dstx + SrcRect.right - SrcRect.left; DstRect.bottom = dsty + SrcRect.bottom - SrcRect.top; - /* Convert BltFast flags into Btl ones because it is called from SurfaceImpl_Blt aswell */ + /* Convert BltFast flags into Btl ones because it is called from SurfaceImpl_Blt as well */ if(trans & DDBLTFAST_SRCCOLORKEY) Flags |= DDBLT_KEYSRC; if(trans & DDBLTFAST_DESTCOLORKEY) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 5046d42..71106a7 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -241,7 +241,7 @@ inline BOOL WINAPI IWineD3DVertexBufferI * If some stuff does not exist in the buffer, then lpData, dwStride and dwType are memsetted to 0. So if the semantic didn't exist before * and does not exist now all 3 values will be equal(=0). * - * Checking the lpData field alone is not enought, because data may appear at offset 0 in the buffer. This is the same location as nonexistant + * Checking the lpData field alone is not enough, because data may appear at offset 0 in the buffer. This is the same location as nonexistent * data uses, so we have to check the type and stride too. Colors can be at offset 0 too, because it is perfectly fine to render from 2 or more * buffers at the same time and get the position from one and the color from the other buffer. */ diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c6f5a18..ad2c938 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -403,7 +403,7 @@ #undef LOAD_FUNCPTR * 8762 drivers support 1.3 for the server and 1.4 for the client and they support lots of extensions. * Unfortunately it is much more complicated for Mesa/DRI-based drivers and ATI's drivers. * Both sets of drivers report a server version of 1.2 and the client version can be 1.3 or 1.4. - * Further in case of atleast ATI's drivers one crucial extension needed for our pixel format code + * Further, in case of at least ATI's drivers, one crucial extension needed for our pixel format code * is only available in the list of server extensions and not in the client list. * * The versioning checks below try to take into account the comments from above. @@ -2029,7 +2029,7 @@ GLboolean WINAPI X11DRV_wglChoosePixelFo int tmp_vis_id; int pfmt_it = 0; - int offscreen_index = 1; /* Start at one because we allways have a main visual at iPixelFormat=1 */ + int offscreen_index = 1; /* Start at one because we always have a main visual at iPixelFormat=1 */ TRACE("(%p, %p, %p, %d, %p, %p): hackish\n", hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats); if (NULL != pfAttribFList) { @@ -2103,7 +2103,7 @@ GLboolean WINAPI X11DRV_wglChoosePixelFo /* The format of Wine's main visual is stored at index 1 of our WGL format table. * At higher indices we store offscreen rendering formats (visualid=0). Below we calculate * the index of the offscreen format. We do this by counting the number of offscreen formats - * which we see upto reaching our target format. */ + * which we see until we reach our target format. */ if(tmp_vis_id == 0) offscreen_index++;

1 0

Michael Stefaniuc : "One liners" printf format warning fixes for the migration of DWORD/LONG/ ULONG from long to int.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: 41dd56cb7f62a59f26a2c65d369a52b0fde6002f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=41dd56cb7f62a59f26a2c65… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 29 01:19:00 2006 +0200 "One liners" printf format warning fixes for the migration of DWORD/LONG/ULONG from long to int. --- dlls/avicap32/avicap32_main.c | 2 +- dlls/compstui/compstui_main.c | 2 +- dlls/crtdll/crtdll_main.c | 2 +- dlls/cryptdll/cryptdll.c | 2 +- dlls/cryptnet/cryptnet_main.c | 2 +- dlls/dpnhpast/main.c | 2 +- dlls/gphoto2.ds/gphoto2_main.c | 2 +- dlls/hlink/tests/hlink.c | 2 +- dlls/localspl/localspl_main.c | 2 +- dlls/mmdevldr.vxd/mmdevldr.c | 2 +- dlls/monodebg.vxd/monodebg.c | 2 +- dlls/mprapi/mprapi.c | 2 +- dlls/msisys.ocx/msisys.c | 2 +- dlls/msnet32/msnet_main.c | 2 +- dlls/msvcrtd/tests/debug.c | 2 +- dlls/ntdsapi/ntdsapi.c | 2 +- dlls/odbccp32/odbccp32.c | 2 +- dlls/oledlg/oledlg_main.c | 2 +- dlls/sane.ds/sane_main.c | 2 +- dlls/sensapi/sensapi.c | 2 +- dlls/snmpapi/main.c | 2 +- dlls/svrapi/svrapi_main.c | 2 +- dlls/twain_32/twain32_main.c | 2 +- dlls/userenv/userenv_main.c | 2 +- dlls/vdhcp.vxd/vdhcp.c | 2 +- dlls/vnbt.vxd/vnbt.c | 2 +- dlls/vnetbios.vxd/vnetbios.c | 2 +- dlls/vtdapi.vxd/vtdapi.c | 2 +- dlls/winmm/joystick/joystick.c | 2 +- programs/expand/expand.c | 2 +- programs/explorer/desktop.c | 2 +- programs/msiexec/msiexec.c | 2 +- programs/uninstaller/main.c | 2 +- tools/widl/hash.c | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=41dd56cb7f62a59f26a…

1 0

Michael Stefaniuc : include: Make DWORD/LONG/ ULONG an int to use the same type in Win32 and Win64.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: f8b8f216ddcd860ac25f3c334853a3a7b0ebfe98 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8b8f216ddcd860ac25f3c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 29 01:18:35 2006 +0200 include: Make DWORD/LONG/ULONG an int to use the same type in Win32 and Win64. --- include/windef.h | 10 +++++----- include/winnt.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/windef.h b/include/windef.h index 850c026..c328fb4 100644 --- a/include/windef.h +++ b/include/windef.h @@ -196,14 +196,14 @@ typedef int INT, *PIN typedef unsigned int UINT, *PUINT; typedef float FLOAT, *PFLOAT; typedef char *PSZ; -#if defined(_WIN64) && !defined(_MSC_VER) -typedef int *LPLONG; -typedef unsigned int DWORD, *PDWORD, *LPDWORD; -typedef unsigned int ULONG, *PULONG; -#else +#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)) typedef long *LPLONG; typedef unsigned long DWORD, *PDWORD, *LPDWORD; typedef unsigned long ULONG, *PULONG; +#else +typedef int *LPLONG; +typedef unsigned int DWORD, *PDWORD, *LPDWORD; +typedef unsigned int ULONG, *PULONG; #endif /* Macros to map Winelib names to the correct implementation name */ diff --git a/include/winnt.h b/include/winnt.h index 119e0be..c067c5c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -318,10 +318,10 @@ typedef VOID *PVOID64; typedef BYTE BOOLEAN, *PBOOLEAN; typedef char CHAR, *PCHAR; typedef short SHORT, *PSHORT; -#if defined(_WIN64) && !defined(_MSC_VER) -typedef int LONG, *PLONG; -#else +#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)) typedef long LONG, *PLONG; +#else +typedef int LONG, *PLONG; #endif /* Some systems might have wchar_t, but we really need 16 bit characters */

1 0

Michael Stefaniuc : debug.h, test.h: Temporary add ifdefs around some printfs to avoid format.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: 705b5a00c528b576fdead8047e3e956306879b26 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=705b5a00c528b576fdead80… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 29 01:18:51 2006 +0200 debug.h, test.h: Temporary add ifdefs around some printfs to avoid format. --- include/wine/debug.h | 13 +++++++++++++ include/wine/test.h | 4 ++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 18de451..152956d 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -196,19 +196,32 @@ static inline const char *wine_dbgstr_gu static inline const char *wine_dbgstr_point( const POINT *pt ) { if (!pt) return "(null)"; +#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64) return wine_dbg_sprintf( "(%ld,%ld)", pt->x, pt->y ); +#else + return wine_dbg_sprintf( "(%d,%d)", pt->x, pt->y ); +#endif } static inline const char *wine_dbgstr_size( const SIZE *size ) { if (!size) return "(null)"; +#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64) return wine_dbg_sprintf( "(%ld,%ld)", size->cx, size->cy ); +#else + return wine_dbg_sprintf( "(%d,%d)", size->cx, size->cy ); +#endif } static inline const char *wine_dbgstr_rect( const RECT *rect ) { if (!rect) return "(null)"; +#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64) return wine_dbg_sprintf( "(%ld,%ld)-(%ld,%ld)", rect->left, rect->top, rect->right, rect->bottom ); +#else + return wine_dbg_sprintf( "(%d,%d)-(%d,%d)", rect->left, rect->top, + rect->right, rect->bottom ); +#endif } static inline const char *wine_dbgstr_longlong( ULONGLONG ll ) diff --git a/include/wine/test.h b/include/wine/test.h index 8e2bc62..8ef8a31 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -371,7 +371,11 @@ static int run_test( const char *name ) if (winetest_debug) { +#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64) fprintf( stdout, "%s: %ld tests executed, %ld marked as todo, %ld %s.\n", +#else + fprintf( stdout, "%s: %d tests executed, %d marked as todo, %d %s.\n", +#endif name, successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure" );

1 0

Michael Stefaniuc : Add a WINE_NO_LONG_INT define to many makefiles to ease the transition of DWORD /LONG/ULONG from long to int.
by Alexandre Julliard 29 Sep '06

29 Sep '06

1 0

James Hawkins : msi: Return to the parent dialog when the argument to the EndDialog event is Return .
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: 3d812659e87c472a81a152f2ddfe27bd18801deb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d812659e87c472a81a152f… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Sep 28 16:20:40 2006 -0700 msi: Return to the parent dialog when the argument to the EndDialog event is Return. --- dlls/msi/dialog.c | 17 +++++++++++++++-- dlls/msi/events.c | 15 ++++++++++----- dlls/msi/msipriv.h | 4 +++- dlls/msi/preview.c | 2 +- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 958d63a..74eefe5 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -82,6 +82,7 @@ typedef struct msi_font_tag struct msi_dialog_tag { MSIPACKAGE *package; + msi_dialog *parent; msi_dialog_event_handler event_handler; BOOL finished; INT scale; @@ -222,6 +223,16 @@ static LPWSTR msi_dialog_dup_property( m return strdupW( property ); } +msi_dialog *msi_dialog_get_parent( msi_dialog *dialog ) +{ + return dialog->parent; +} + +LPWSTR msi_dialog_get_name( msi_dialog *dialog ) +{ + return dialog->name; +} + /* * msi_dialog_get_style * @@ -3060,8 +3071,9 @@ static LRESULT WINAPI MSIHiddenWindowPro /* functions that interface to other modules within MSI */ -msi_dialog *msi_dialog_create( MSIPACKAGE* package, LPCWSTR szDialogName, - msi_dialog_event_handler event_handler ) +msi_dialog *msi_dialog_create( MSIPACKAGE* package, + LPCWSTR szDialogName, msi_dialog *parent, + msi_dialog_event_handler event_handler ) { MSIRECORD *rec = NULL; msi_dialog *dialog; @@ -3073,6 +3085,7 @@ msi_dialog *msi_dialog_create( MSIPACKAG if( !dialog ) return NULL; strcpyW( dialog->name, szDialogName ); + dialog->parent = parent; msiobj_addref( &package->hdr ); dialog->package = package; dialog->event_handler = event_handler; diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 72e5217..e9b7d55 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -58,13 +58,13 @@ UINT ControlEvent_HandleControlEvent(MSI /* * Create a dialog box and run it if it's modal */ -static UINT event_do_dialog( MSIPACKAGE *package, LPCWSTR name, BOOL destroy_modeless ) +static UINT event_do_dialog( MSIPACKAGE *package, LPCWSTR name, msi_dialog *parent, BOOL destroy_modeless ) { msi_dialog *dialog; UINT r; /* create a new dialog */ - dialog = msi_dialog_create( package, name, + dialog = msi_dialog_create( package, name, parent, ControlEvent_HandleControlEvent ); if( dialog ) { @@ -111,7 +111,12 @@ static UINT ControlEvent_EndDialog(MSIPA else if (lstrcmpW(argument, szIgnore) == 0) package->CurrentInstallState = -1; else if (lstrcmpW(argument, szReturn) == 0) + { + msi_dialog *parent = msi_dialog_get_parent(dialog); + msi_free(package->next_dialog); + package->next_dialog = (parent) ? strdupW(msi_dialog_get_name(parent)) : NULL; package->CurrentInstallState = ERROR_SUCCESS; + } else { ERR("Unknown argument string %s\n",debugstr_w(argument)); @@ -143,7 +148,7 @@ static UINT ControlEvent_SpawnDialog(MSI msi_dialog *dialog) { /* don't destroy a modeless dialogs that might be our parent */ - event_do_dialog( package, argument, FALSE ); + event_do_dialog( package, argument, dialog, FALSE ); if( package->CurrentInstallState != ERROR_SUCCESS ) msi_dialog_end_dialog( dialog ); return ERROR_SUCCESS; @@ -353,13 +358,13 @@ UINT ACTION_DialogBox( MSIPACKAGE* packa * dialog, as it returns ERROR_IO_PENDING when we try to run * its message loop. */ - r = event_do_dialog( package, szDialogName, TRUE ); + r = event_do_dialog( package, szDialogName, NULL, TRUE ); while( r == ERROR_SUCCESS && package->next_dialog ) { LPWSTR name = package->next_dialog; package->next_dialog = NULL; - r = event_do_dialog( package, name, TRUE ); + r = event_do_dialog( package, name, NULL, TRUE ); msi_free( name ); } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 0d27ec8..cc3b88b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -451,7 +451,7 @@ extern LONG msi_reg_set_subkey_val( HKEY /* msi dialog interface */ typedef UINT (*msi_dialog_event_handler)( MSIPACKAGE*, LPCWSTR, LPCWSTR, msi_dialog* ); -extern msi_dialog *msi_dialog_create( MSIPACKAGE*, LPCWSTR, msi_dialog_event_handler ); +extern msi_dialog *msi_dialog_create( MSIPACKAGE*, LPCWSTR, msi_dialog*, msi_dialog_event_handler ); extern UINT msi_dialog_run_message_loop( msi_dialog* ); extern void msi_dialog_end_dialog( msi_dialog* ); extern void msi_dialog_check_messages( HANDLE ); @@ -462,6 +462,8 @@ extern void msi_dialog_unregister_class( extern void msi_dialog_handle_event( msi_dialog*, LPCWSTR, LPCWSTR, MSIRECORD * ); extern UINT msi_dialog_reset( msi_dialog *dialog ); extern UINT msi_dialog_directorylist_up( msi_dialog *dialog ); +extern msi_dialog *msi_dialog_get_parent( msi_dialog *dialog ); +extern LPWSTR msi_dialog_get_name( msi_dialog *dialog ); /* preview */ extern MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE * ); diff --git a/dlls/msi/preview.c b/dlls/msi/preview.c index 161bcc7..4f4cc5c 100644 --- a/dlls/msi/preview.c +++ b/dlls/msi/preview.c @@ -103,7 +103,7 @@ UINT MSI_PreviewDialogW( MSIPREVIEW *pre /* an empty name means we should just destroy the current preview dialog */ if( szDialogName ) { - dialog = msi_dialog_create( preview->package, szDialogName, + dialog = msi_dialog_create( preview->package, szDialogName, NULL, preview_event_handler ); if( dialog ) msi_dialog_do_preview( dialog );

1 0

Andrew Talbot : shell32: Cast-qual warnings fix.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: 29ce6b37b5a6d38e81d53ba4d2d8a4abee89563c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29ce6b37b5a6d38e81d53ba… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 28 23:16:09 2006 +0100 shell32: Cast-qual warnings fix. --- dlls/shell32/shelllink.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 550f3a0..ac0e8f8 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2455,7 +2455,7 @@ ShellLink_QueryContextMenu( IContextMenu UINT idCmdFirst, UINT idCmdLast, UINT uFlags ) { IShellLinkImpl *This = impl_from_IContextMenu(iface); - static const WCHAR szOpen[] = { 'O','p','e','n',0 }; + static WCHAR szOpen[] = { 'O','p','e','n',0 }; MENUITEMINFOW mii; int id = 1; @@ -2468,7 +2468,7 @@ ShellLink_QueryContextMenu( IContextMenu memset( &mii, 0, sizeof mii ); mii.cbSize = sizeof mii; mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE; - mii.dwTypeData = (LPWSTR)szOpen; + mii.dwTypeData = szOpen; mii.cch = strlenW( mii.dwTypeData ); mii.wID = idCmdFirst + id++; mii.fState = MFS_DEFAULT | MFS_ENABLED;

1 0

Andrew Talbot : shell32: Cast-qual warnings fix.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: dcd5e173f815cc933e28d588d718824b2a80191c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dcd5e173f815cc933e28d58… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 28 23:14:30 2006 +0100 shell32: Cast-qual warnings fix. --- dlls/shell32/pidl.c | 2 +- dlls/shell32/regsvr.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index e7d591f..10d87bb 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1971,7 +1971,7 @@ FileStructW* _ILGetFileStructW(LPCITEMID if (!(_ILIsValue(pidl) || _ILIsFolder(pidl))) return NULL; - cbOffset = *(WORD*)((LPBYTE)pidl + pidl->mkid.cb - sizeof(WORD)); + cbOffset = *(const WORD *)((const BYTE *)pidl + pidl->mkid.cb - sizeof(WORD)); pFileStructW = (FileStructW*)((LPBYTE)pidl + cbOffset); /* Currently I don't see a fool prove way to figure out if a pidl is for sure of WinXP diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index 1ce7096..27cb5f3 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -344,13 +344,13 @@ static HRESULT register_coclasses(struct &shellfolder_key, NULL); if (res != ERROR_SUCCESS) goto error_close_clsid_key; if (list->flags & SHELLFOLDER_WANTSFORPARSING) - res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (LPBYTE)"", 1); + res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (const BYTE *)"", 1); if (list->flags & SHELLFOLDER_ATTRIBUTES) res = RegSetValueExA(shellfolder_key, attributes_valuename, 0, REG_DWORD, - (LPBYTE)&list->dwAttributes, sizeof(DWORD)); + (const BYTE *)&list->dwAttributes, sizeof(DWORD)); if (list->flags & SHELLFOLDER_CALLFORATTRIBUTES) res = RegSetValueExA(shellfolder_key, cfattributes_valuename, 0, REG_DWORD, - (LPBYTE)&list->dwCallForAttributes, sizeof(DWORD)); + (const BYTE *)&list->dwCallForAttributes, sizeof(DWORD)); RegCloseKey(shellfolder_key); if (res != ERROR_SUCCESS) goto error_close_clsid_key; } @@ -460,7 +460,7 @@ static HRESULT register_namespace_extens if (pwszKey && ERROR_SUCCESS == RegCreateKeyExW(HKEY_LOCAL_MACHINE, pwszKey, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL)) { - RegSetValueExW(hKey, NULL, 0, REG_SZ, (LPBYTE)list->value, sizeof(WCHAR)*(lstrlenW(list->value)+1)); + RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE *)list->value, sizeof(WCHAR)*(lstrlenW(list->value)+1)); RegCloseKey(hKey); }

1 0

Andrew Talbot : shell32: Cast-qual warnings fix.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: 27a06a5d751162f956e0430f97e8b88727e50495 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27a06a5d751162f956e0430… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 28 23:15:24 2006 +0100 shell32: Cast-qual warnings fix. --- dlls/shell32/shell32_main.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 4db2a1b..5c6dc61 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -634,29 +634,31 @@ DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR p UINT flags ) { INT len; - LPWSTR temppath; + LPWSTR temppath = NULL; + LPCWSTR pathW; DWORD ret; SHFILEINFOW temppsfi; if (flags & SHGFI_PIDL) { /* path contains a pidl */ - temppath = (LPWSTR) path; + pathW = (LPCWSTR)path; } else { len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); temppath = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, path, -1, temppath, len); + pathW = temppath; } if (psfi && (flags & SHGFI_ATTR_SPECIFIED)) temppsfi.dwAttributes=psfi->dwAttributes; if (psfi == NULL) - ret = SHGetFileInfoW(temppath, dwFileAttributes, NULL, sizeof(temppsfi), flags); + ret = SHGetFileInfoW(pathW, dwFileAttributes, NULL, sizeof(temppsfi), flags); else - ret = SHGetFileInfoW(temppath, dwFileAttributes, &temppsfi, sizeof(temppsfi), flags); + ret = SHGetFileInfoW(pathW, dwFileAttributes, &temppsfi, sizeof(temppsfi), flags); if (psfi) { @@ -678,8 +680,7 @@ DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR p } } - if (!(flags & SHGFI_PIDL)) - HeapFree(GetProcessHeap(), 0, temppath); + HeapFree(GetProcessHeap(), 0, temppath); return ret; }

1 0