May 2007 - Wine-commits - list.winehq.org

James Hawkins : msi: Remove incorrect ERR as messages can be sent before the control is created .
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 12c33ab8aa0d314c21afbfc850f94201faa58cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c33ab8aa0d314c21afbfc85… Author: James Hawkins <truiken(a)gmail.com> Date: Sun May 6 20:31:42 2007 -0500 msi: Remove incorrect ERR as messages can be sent before the control is created. --- dlls/msi/dialog.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 3a256d8..614b4aa 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3185,8 +3185,7 @@ static LRESULT msi_dialog_oncommand( msi_dialog *dialog, WPARAM param, HWND hwnd msi_dialog_evaluate_control_conditions( dialog ); } } - else - ERR("button click from nowhere %p %d %p\n", dialog, param, hwnd); + return 0; }

1 0

James Hawkins : msi: Remove debugging printf statements.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: e962b0a7df3bc4405d1c94b0b0054f4e6cdb60e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e962b0a7df3bc4405d1c94b0b… Author: James Hawkins <truiken(a)gmail.com> Date: Sun May 6 20:43:37 2007 -0500 msi: Remove debugging printf statements. --- dlls/msi/package.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index e04e19c..655cf8f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -22,7 +22,6 @@ #define NONAMELESSSTRUCT #include <stdarg.h> -#include <stdio.h> #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -1105,12 +1104,10 @@ UINT MSI_SetPropertyW( MSIPACKAGE *package, LPCWSTR szName, LPCWSTR szValue) if (rc == ERROR_SUCCESS) { rc = MSI_ViewExecute(view, row); - if (rc != ERROR_SUCCESS) printf("MSI_ViewExecute failed: %d\n", rc); - MSI_ViewClose(view); msiobj_release(&view->hdr); } - else printf("MSI_DatabaseOpenView failed: %d\n", rc); + msiobj_release(&row->hdr); return rc;

1 0

James Hawkins : msi: Set the text limit of the edit control if the limit is given.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 933fd8b8797b340558e06b5d19e51d94b068c5ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=933fd8b8797b340558e06b5d1… Author: James Hawkins <truiken(a)gmail.com> Date: Sun May 6 20:30:28 2007 -0500 msi: Set the text limit of the edit control if the limit is given. --- dlls/msi/dialog.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 72da99f..3a256d8 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1142,15 +1142,34 @@ static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) static UINT msi_dialog_edit_control( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; - LPCWSTR prop; - LPWSTR val; + LPCWSTR prop, text; + LPWSTR val, begin, end; + WCHAR num[10]; + DWORD limit; control = msi_dialog_add_control( dialog, rec, szEdit, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL ); control->handler = msi_dialog_edit_handler; + + text = MSI_RecordGetString( rec, 10 ); + if ( text ) + { + begin = strchrW( text, '{' ); + end = strchrW( text, '}' ); + + if ( begin && end && end > begin ) + { + lstrcpynW( num, begin + 1, end - begin ); + limit = atolW( num ); + + SendMessageW( control->hwnd, EM_SETLIMITTEXT, limit, 0 ); + } + } + prop = MSI_RecordGetString( rec, 9 ); if( prop ) control->property = strdupW( prop ); + val = msi_dup_property( dialog->package, control->property ); SetWindowTextW( control->hwnd, val ); msi_free( val );

1 0

Mikołaj Zalewski : comctl32: treeview: Make the focus test pass under Windows XP.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 61a86024ccab9318df97c5c03803e4dc4985e62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a86024ccab9318df97c5c03… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat May 5 20:20:04 2007 +0200 comctl32: treeview: Make the focus test pass under Windows XP. --- dlls/comctl32/tests/treeview.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 3c7e9f5..6f94fa7 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -90,8 +90,11 @@ static const struct message DoFocusTestSeq[] = { { WM_PARENTNOTIFY, sent|wparam|defwinproc, 0x00000001 }, { WM_KILLFOCUS, sent|defwinproc }, { WM_PAINT, sent|defwinproc }, + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, { WM_COMMAND, sent|wparam|defwinproc, 0x01000000}, { WM_ERASEBKGND, sent|defwinproc }, + { WM_CTLCOLOREDIT, sent|defwinproc|optional }, + { WM_CTLCOLOREDIT, sent|defwinproc|optional }, { 0 } };

1 0

Mikołaj Zalewski : comctl32: treeview: Treeviews shouldn't be sending NM_TOOLTIPSCREATED (with testcase).
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 81cf09c6da5d0406c37a7711fd378e062e42d984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cf09c6da5d0406c37a7711f… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat May 5 20:22:30 2007 +0200 comctl32: treeview: Treeviews shouldn't be sending NM_TOOLTIPSCREATED (with testcase). --- dlls/comctl32/tests/treeview.c | 10 +++++++++- dlls/comctl32/treeview.c | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 6f94fa7..3b33eab 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -169,6 +169,8 @@ static const struct message TestGetSetTextColorSeq[] = { }; static const struct message TestGetSetToolTipsSeq[] = { + { WM_COMMAND, sent|wparam, 0x02000000 }, + { WM_PARENTNOTIFY, sent|wparam|defwinproc, 0x00020002 }, { TVM_SETTOOLTIPS, sent|wparam|lparam, 0x00000000, 0x00000000 }, { TVM_GETTOOLTIPS, sent|wparam|lparam, 0x00000000, 0x00000000 }, { 0 } @@ -470,6 +472,11 @@ static void TestGetSetTextColor(void) static void TestGetSetToolTips(void) { HWND hwndLastToolTip = NULL; + HWND hPopupTreeView; + + /* show even WS_POPUP treeview don't send NM_TOOLTIPSCREATED */ + hPopupTreeView = CreateWindow(WC_TREEVIEW, NULL, WS_POPUP|WS_VISIBLE, 0, 0, 100, 100, hMainWnd, NULL, NULL, NULL); + DestroyWindow(hPopupTreeView); /* Testing setting a NULL ToolTip */ SendMessage( hTree, TVM_SETTOOLTIPS, 0, 0 ); @@ -552,7 +559,7 @@ static void TestGetSet(void) flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); TestGetSetToolTips(); ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, TestGetSetToolTipsSeq, - "TestGetSetToolTips", FALSE); + "TestGetSetToolTips", TRUE); /* TVM_GETUNICODEFORMAT and TVM_SETUNICODEFORMAT */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); @@ -614,6 +621,7 @@ static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa { NMHDR *pHdr = (NMHDR *)lParam; + ok(pHdr->code != NM_FIRST - 19, "Treeview should not send NM_TOOLTIPSCREATED\n"); if (pHdr->idFrom == 100) { NMTREEVIEWA *pTreeView = (LPNMTREEVIEWA) lParam; switch(pHdr->code) { diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8adf28b..40c053d 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4967,7 +4967,9 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) TREEVIEW_NotifyFormat(infoPtr, infoPtr->hwndNotify, NF_REQUERY); if (!(infoPtr->dwStyle & TVS_NOTOOLTIPS)) - infoPtr->hwndToolTip = COMCTL32_CreateToolTip(hwnd); + infoPtr->hwndToolTip = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, WS_POPUP, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + hwnd, 0, 0, 0); if (infoPtr->dwStyle & TVS_CHECKBOXES) initialize_checkboxes(infoPtr);

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 26553b6c1d2ec8c685d2fad3062c2efb1165d988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26553b6c1d2ec8c685d2fad30… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 5 23:43:21 2007 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 50 +++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 537cb29..888c740 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1028,7 +1028,7 @@ static void AttachmentTest(void) ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_BACKBUFFERCOUNT | DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - U2(ddsd).dwBackBufferCount = 2; + ddsd.dwBackBufferCount = 2; hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface1, NULL); ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); @@ -1137,7 +1137,7 @@ static void CubeMapTest(void) memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; ddsd.dwWidth = 128; ddsd.dwHeight = 128; @@ -1145,11 +1145,11 @@ static void CubeMapTest(void) ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; /* D3DFMT_R5G6B5 */ - ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; - ddsd.ddpfPixelFormat.dwRGBBitCount = 16; - ddsd.ddpfPixelFormat.dwRBitMask = 0xF800; - ddsd.ddpfPixelFormat.dwGBitMask = 0x07E0; - ddsd.ddpfPixelFormat.dwBBitMask = 0x001F; + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xF800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07E0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001F; hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &cubemap, NULL); ok(hr == DD_OK, "IDirectDraw7::CreateSurface returned %08x\n", hr); @@ -1171,7 +1171,7 @@ static void CubeMapTest(void) /* What happens if I do not specify any faces? */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; ddsd.dwWidth = 128; ddsd.dwHeight = 128; @@ -1179,11 +1179,11 @@ static void CubeMapTest(void) ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP; /* D3DFMT_R5G6B5 */ - ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; - ddsd.ddpfPixelFormat.dwRGBBitCount = 16; - ddsd.ddpfPixelFormat.dwRBitMask = 0xF800; - ddsd.ddpfPixelFormat.dwGBitMask = 0x07E0; - ddsd.ddpfPixelFormat.dwBBitMask = 0x001F; + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xF800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07E0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001F; hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &cubemap, NULL); ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7::CreateSurface asking for a cube map without faces returned %08x\n", hr); @@ -1191,7 +1191,7 @@ static void CubeMapTest(void) /* Cube map faces without a cube map? */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; ddsd.dwWidth = 128; ddsd.dwHeight = 128; @@ -1199,18 +1199,18 @@ static void CubeMapTest(void) ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP_ALLFACES; /* D3DFMT_R5G6B5 */ - ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; - ddsd.ddpfPixelFormat.dwRGBBitCount = 16; - ddsd.ddpfPixelFormat.dwRBitMask = 0xF800; - ddsd.ddpfPixelFormat.dwGBitMask = 0x07E0; - ddsd.ddpfPixelFormat.dwBBitMask = 0x001F; + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xF800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07E0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001F; hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &cubemap, NULL); ok(hr == DDERR_INVALIDCAPS, "IDirectDraw7::CreateSurface returned %08x\n", hr); memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; ddsd.dwWidth = 128; ddsd.dwHeight = 128; @@ -1218,11 +1218,11 @@ static void CubeMapTest(void) ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEX; /* D3DFMT_R5G6B5 */ - ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; - ddsd.ddpfPixelFormat.dwRGBBitCount = 16; - ddsd.ddpfPixelFormat.dwRBitMask = 0xF800; - ddsd.ddpfPixelFormat.dwGBitMask = 0x07E0; - ddsd.ddpfPixelFormat.dwBBitMask = 0x001F; + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xF800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07E0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001F; hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &cubemap, NULL); ok(hr == DDERR_INVALIDCAPS, "IDirectDraw7::CreateSurface returned %08x\n", hr);

1 0

Jacek Caban : mshtml: Remove auto detection of Mozilla and Mozilla ActiveX control.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 4ccee1ae499d9d6e2aac65e2484e1f796933401a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccee1ae499d9d6e2aac65e24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 6 15:02:51 2007 +0200 mshtml: Remove auto detection of Mozilla and Mozilla ActiveX control. --- dlls/mshtml/nsembed.c | 76 ------------------------------------------------- 1 files changed, 0 insertions(+), 76 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 17d22a0..452be8b 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -165,80 +165,6 @@ static BOOL load_xpcom(PRUnichar *gre_path) return TRUE; } -static BOOL load_mozilla(PRUnichar *gre_path) -{ - DWORD res, type, i, size = MAX_PATH; - HKEY mozilla_key, hkey; - WCHAR key_name[100]; - BOOL ret = FALSE; - - static const WCHAR wszGreKey[] = - {'S','o','f','t','w','a','r','e','\\', - 'm','o','z','i','l','l','a','.','o','r','g','\\', - 'G','R','E',0}; - - static const WCHAR wszGreHome[] = {'G','r','e','H','o','m','e',0}; - - res = RegOpenKeyW(HKEY_LOCAL_MACHINE, wszGreKey, &mozilla_key); - if(res != ERROR_SUCCESS) { - TRACE("Could not open key %s\n", debugstr_w(wszGreKey)); - return FALSE; - } - - for(i=0; !ret && RegEnumKeyW(mozilla_key, i, key_name, sizeof(key_name)/sizeof(WCHAR)) == ERROR_SUCCESS; i++) { - RegOpenKeyW(mozilla_key, key_name, &hkey); - res = RegQueryValueExW(hkey, wszGreHome, NULL, &type, (LPBYTE)gre_path, &size); - if(res == ERROR_SUCCESS) - ret = TRUE; - RegCloseKey(hkey); - } - - RegCloseKey(mozilla_key); - return ret ? load_xpcom(gre_path) : FALSE; -} - -static BOOL load_mozctl(PRUnichar *gre_path) -{ - HKEY hkey; - DWORD res, type, size = MAX_PATH; - - static const WCHAR wszMozCtlKey[] = - {'S','o','f','t','w','a','r','e','\\','M','o','z','i','l','l','a',0}; - static const WCHAR wszBinDirectoryPath[] = - {'B','i','n','D','i','r','e','c','t','o','r','y','P','a','t','h',0}; - static const WCHAR wszMozCtlClsidKey[] = - {'C','L','S','I','D','\\', - '{','1','3','3','9','B','5','4','C','-','3','4','5','3','-','1','1','D','2', - '-','9','3','B','9','-','0','0','0','0','0','0','0','0','0','0','0','0','}','\\', - 'I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; - - res = RegOpenKeyW(HKEY_LOCAL_MACHINE, wszMozCtlKey, &hkey); - if(res == ERROR_SUCCESS) { - res = RegQueryValueExW(hkey, wszBinDirectoryPath, NULL, &type, (LPBYTE)gre_path, &size); - if(res == ERROR_SUCCESS) - return load_xpcom(gre_path); - else - ERR("Could not get value %s\n", debugstr_w(wszBinDirectoryPath)); - } - - res = RegOpenKeyW(HKEY_CLASSES_ROOT, wszMozCtlClsidKey, &hkey); - if(res == ERROR_SUCCESS) { - res = RegQueryValueExW(hkey, NULL, NULL, &type, (LPBYTE)gre_path, &size); - if(res == ERROR_SUCCESS) { - WCHAR *ptr; - if((ptr = strrchrW(gre_path, '\\'))) - ptr[1] = 0; - return load_xpcom(gre_path); - }else { - ERR("Could not get value of %s\n", debugstr_w(wszMozCtlClsidKey)); - } - } - - TRACE("Could not find Mozilla ActiveX Control\n"); - - return FALSE; -} - static void check_version(LPCWSTR gre_path) { WCHAR file_name[MAX_PATH]; @@ -419,8 +345,6 @@ static BOOL load_gecko(void) loading_thread = GetCurrentThreadId(); if(load_wine_gecko(gre_path) - || load_mozctl(gre_path) - || load_mozilla(gre_path) || (install_wine_gecko() && load_wine_gecko(gre_path))) ret = init_xpcom(gre_path); else

1 0

James Hawkins : msi: Only allow valid styles in msi_dialog_get_style.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 7f4a4e161f561a8e7416e918c4e57affee688193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f4a4e161f561a8e7416e918c… Author: James Hawkins <truiken(a)gmail.com> Date: Sun May 6 20:28:13 2007 -0500 msi: Only allow valid styles in msi_dialog_get_style. --- dlls/msi/dialog.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 35a192c..5440e67 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -265,11 +265,11 @@ static LPWSTR msi_dialog_get_style( LPCWSTR p, LPCWSTR *rest ) while ((first = strchrW( p, '{' )) && (q = strchrW( first + 1, '}' ))) { p = first + 1; - if( *p == '\\' || *p == '&' ) - p++; + if( *p != '\\' && *p != '&' ) + return NULL; /* little bit of sanity checking to stop us getting confused with RTF */ - for( i=p; i<q; i++ ) + for( i=++p; i<q; i++ ) if( *i == '}' || *i == '\\' ) return NULL; }

1 0

James Hawkins : msi: Add the ES_AUTOHSCROLL style to the edit control.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 7fe3ba934cb0f4908d20a9136b36f206c1b78fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe3ba934cb0f4908d20a9136… Author: James Hawkins <truiken(a)gmail.com> Date: Sun May 6 20:29:30 2007 -0500 msi: Add the ES_AUTOHSCROLL style to the edit control. --- 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 5440e67..72da99f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1146,7 +1146,7 @@ static UINT msi_dialog_edit_control( msi_dialog *dialog, MSIRECORD *rec ) LPWSTR val; control = msi_dialog_add_control( dialog, rec, szEdit, - WS_BORDER | WS_TABSTOP ); + WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL ); control->handler = msi_dialog_edit_handler; prop = MSI_RecordGetString( rec, 9 ); if( prop )

1 0

Detlef Riekenberg : localui: Prefer builtin version.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 3f15d23e6dfd3645ffc534a96ef40e064e574b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f15d23e6dfd3645ffc534a96… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat May 5 00:20:13 2007 +0200 localui: Prefer builtin version. --- dlls/localui/localui.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 55b035a..2acfc7e 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -689,9 +689,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); LOCALUI_hInstance = hinstDLL;

1 0