wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Vincent Povirk : comdlg32/tests: Font sizes are influenced by the display dpi.
by Alexandre Julliard 19 Feb '10

19 Feb '10

Module: wine Branch: master Commit: 38c66289114d1ebbc03634843392aff4eaabd43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c66289114d1ebbc03634843… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 18 14:47:43 2010 -0600 comdlg32/tests: Font sizes are influenced by the display dpi. --- dlls/comdlg32/tests/fontdlg.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c index 885fb44..a277e08 100644 --- a/dlls/comdlg32/tests/fontdlg.c +++ b/dlls/comdlg32/tests/fontdlg.c @@ -32,6 +32,18 @@ #include "wine/test.h" +static int get_dpiy(void) +{ + HDC hdc; + int result; + + hdc = GetDC(0); + result = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + return result; +} + static UINT_PTR CALLBACK CFHookProcOK(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -49,6 +61,8 @@ static void test_ChooseFontA(void) LOGFONTA lfa; CHOOSEFONTA cfa; BOOL ret; + int dpiy = get_dpiy(); + int expected_pointsize, expected_lfheight; memset(&lfa, 0, sizeof(LOGFONTA)); lfa.lfHeight = -16; @@ -63,8 +77,12 @@ static void test_ChooseFontA(void) ret = ChooseFontA(&cfa); + expected_pointsize = MulDiv(16, 72, dpiy) * 10; + expected_lfheight = -MulDiv(expected_pointsize, dpiy, 720); + ok(ret == TRUE, "ChooseFontA returned FALSE\n"); - ok(lfa.lfHeight == -16, "Expected -16, got %i\n", lfa.lfHeight); + ok(cfa.iPointSize == expected_pointsize, "Expected %i, got %i\n", expected_pointsize, cfa.iPointSize); + ok(lfa.lfHeight == expected_lfheight, "Expected %i, got %i\n", expected_lfheight, lfa.lfHeight); ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); ok(strcmp(lfa.lfFaceName, "Symbol") == 0, "Expected Symbol, got %s\n", lfa.lfFaceName); }

1 0

Jacek Caban : urlmon.idl: Added some missing declarations.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: cce35e2e7afaf324d2ac3b9786d50ae56d33a5cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce35e2e7afaf324d2ac3b978… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 18 17:16:03 2010 +0100 urlmon.idl: Added some missing declarations. --- include/urlmon.idl | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 828cbd2..d16a3b5 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1646,6 +1646,62 @@ interface IUri : IUnknown [out] BOOL *pfEqual); } +cpp_quote("HRESULT WINAPI CreateUri(LPCWSTR,DWORD,DWORD_PTR,IUri**);") +cpp_quote("HRESULT WINAPI CreateUriWithFragment(LPCWSTR,LPCWSTR,DWORD,DWORD_PTR,IUri**);") +cpp_quote("HRESULT WINAPI CreateUriFromMultiByteString(LPCSTR,DWORD,DWORD,DWORD,DWORD_PTR,IUri**);") + +cpp_quote("#define Uri_HAS_ABSOLUTE_URI (1 << Uri_PROPERTY_ABSOLUTE_URI)") +cpp_quote("#define Uri_HAS_AUTHORITY (1 << Uri_PROPERTY_AUTHORITY)") +cpp_quote("#define Uri_HAS_DISPLAY_URI (1 << Uri_PROPERTY_DISPLAY_URI)") +cpp_quote("#define Uri_HAS_DOMAIN (1 << Uri_PROPERTY_DOMAIN)") +cpp_quote("#define Uri_HAS_EXTENSION (1 << Uri_PROPERTY_EXTENSION)") +cpp_quote("#define Uri_HAS_FRAGMENT (1 << Uri_PROPERTY_FRAGMENT)") +cpp_quote("#define Uri_HAS_HOST (1 << Uri_PROPERTY_HOST)") +cpp_quote("#define Uri_HAS_PASSWORD (1 << Uri_PROPERTY_PASSWORD)") +cpp_quote("#define Uri_HAS_PATH (1 << Uri_PROPERTY_PATH)") +cpp_quote("#define Uri_HAS_QUERY (1 << Uri_PROPERTY_QUERY)") +cpp_quote("#define Uri_HAS_RAW_URI (1 << Uri_PROPERTY_RAW_URI)") +cpp_quote("#define Uri_HAS_SCHEME_NAME (1 << Uri_PROPERTY_SCHEME_NAME)") +cpp_quote("#define Uri_HAS_USER_NAME (1 << Uri_PROPERTY_USER_NAME)") +cpp_quote("#define Uri_HAS_PATH_AND_QUERY (1 << Uri_PROPERTY_PATH_AND_QUERY)") +cpp_quote("#define Uri_HAS_USER_INFO (1 << Uri_PROPERTY_USER_INFO)") +cpp_quote("#define Uri_HAS_HOST_TYPE (1 << Uri_PROPERTY_HOST_TYPE)") +cpp_quote("#define Uri_HAS_PORT (1 << Uri_PROPERTY_PORT)") +cpp_quote("#define Uri_HAS_SCHEME (1 << Uri_PROPERTY_SCHEME)") +cpp_quote("#define Uri_HAS_ZONE (1 << Uri_PROPERTY_ZONE)") + +cpp_quote("#define Uri_CREATE_ALLOW_RELATIVE 0x0001") +cpp_quote("#define Uri_CREATE_ALLOW_IMPLICIT_WILDCARD_SCHEME 0x0002") +cpp_quote("#define Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME 0x0004") +cpp_quote("#define Uri_CREATE_NOFRAG 0x0008") +cpp_quote("#define Uri_CREATE_NO_CANONICALIZE 0x0010") +cpp_quote("#define Uri_CREATE_CANONICALIZE 0x0100") +cpp_quote("#define Uri_CREATE_FILE_USE_DOS_PATH 0x0020") +cpp_quote("#define Uri_CREATE_DECODE_EXTRA_INFO 0x0040") +cpp_quote("#define Uri_CREATE_NO_DECODE_EXTRA_INFO 0x0080") +cpp_quote("#define Uri_CREATE_CRACK_UNKNOWN_SCHEMES 0x0200") +cpp_quote("#define Uri_CREATE_NO_CRACK_UNKNOWN_SCHEMES 0x0400") +cpp_quote("#define Uri_CREATE_PRE_PROCESS_HTML_URI 0x0800") +cpp_quote("#define Uri_CREATE_NO_PRE_PROCESS_HTML_URI 0x1000") +cpp_quote("#define Uri_CREATE_IE_SETTINGS 0x2000") +cpp_quote("#define Uri_CREATE_NO_IE_SETTINGS 0x4000") +cpp_quote("#define Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS 0x8000") + +cpp_quote("#define Uri_DISPLAY_NO_FRAGMENT 0x00000001") +cpp_quote("#define Uri_PUNYCODE_IDN_HOST 0x00000002") +cpp_quote("#define Uri_DISPLAY_IDN_HOST 0x00000004") + +cpp_quote("#define Uri_ENCODING_USER_INFO_AND_PATH_IS_PERCENT_ENCODED_UTF8 0x00000001") +cpp_quote("#define Uri_ENCODING_USER_INFO_AND_PATH_IS_CP 0x00000002") +cpp_quote("#define Uri_ENCODING_HOST_IS_IDN 0x00000004") +cpp_quote("#define Uri_ENCODING_HOST_IS_PERCENT_ENCODED_UTF8 0x00000008") +cpp_quote("#define Uri_ENCODING_HOST_IS_PERCENT_ENCODED_CP 0x00000010") +cpp_quote("#define Uri_ENCODING_QUERY_AND_FRAGMENT_IS_PERCENT_ENCODED_UTF8 0x00000020") +cpp_quote("#define Uri_ENCODING_QUERY_AND_FRAGMENT_IS_CP 0x00000040") +cpp_quote("#define Uri_ENCODING_RFC (Uri_ENCODING_USER_INFO_AND_PATH_IS_PERCENT_ENCODED_UTF8|Uri_ENCODING_HOST_IS_PERCENT_ENCODED_UTF8|Uri_ENCODING_QUERY_AND_FRAGMENT_IS_PERCENT_ENCODED_UTF8)") + +cpp_quote("#define UriBuilder_USE_ORIGINAL_FLAGS 0x00000001") + /***************************************************************************** * IUriContainer interface */ @@ -1740,6 +1796,8 @@ cpp_quote("#define INET_E_DEFAULT_ACTION INET_E_USE_DEFAULT_PROTOCOLH cpp_quote("HRESULT WINAPI CoGetClassObjectFromURL(REFCLSID, LPCWSTR, DWORD, DWORD, LPCWSTR, LPBINDCTX, DWORD, LPVOID, REFIID, LPVOID*);") cpp_quote("HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk);") +cpp_quote("HRESULT WINAPI CreateURLMonikerEx(IMoniker*,LPCWSTR,IMoniker**,DWORD);") +cpp_quote("HRESULT WINAPI CreateURLMonikerEx2(IMoniker*,IUri*,IMoniker**,DWORD);") cpp_quote("HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pbsc, IBindStatusCallback **ppbsc, DWORD dwReserved);") cpp_quote("HRESULT WINAPI CompareSecurityIds(BYTE*,DWORD,BYTE*,DWORD,DWORD);") cpp_quote("HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN,LPCSTR,LPCSTR,DWORD,LPBINDSTATUSCALLBACK);")

1 0

Paul Vriens : cmd: Remove some unneeded extension checking.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: f468055408aac43a17524beff430183ba769ce2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f468055408aac43a17524beff… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Feb 18 17:09:04 2010 +0100 cmd: Remove some unneeded extension checking. --- programs/cmd/batch.c | 30 +++++------------------------- 1 files changed, 5 insertions(+), 25 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 28744d4..585ea5e 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -47,35 +47,15 @@ extern DWORD errorlevel; void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HANDLE pgmHandle) { -#define WCMD_BATCH_EXT_SIZE 5 - HANDLE h = INVALID_HANDLE_VALUE; - WCHAR string[MAXSTRING]; - static const WCHAR extension_batch[][WCMD_BATCH_EXT_SIZE] = {{'.','b','a','t','\0'}, - {'.','c','m','d','\0'}}; - static const WCHAR extension_exe[WCMD_BATCH_EXT_SIZE] = {'.','e','x','e','\0'}; - unsigned int i; BATCH_CONTEXT *prev_context; if (startLabel == NULL) { - for(i=0; (i<sizeof(extension_batch)/(WCMD_BATCH_EXT_SIZE * sizeof(WCHAR))) && - (h == INVALID_HANDLE_VALUE); i++) { - strcpyW (string, file); - CharLowerW (string); - if (strstrW (string, extension_batch[i]) == NULL) strcatW (string, extension_batch[i]); - h = CreateFileW (string, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - } + h = CreateFileW (file, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { - strcpyW (string, file); - CharLowerW (string); - if (strstrW (string, extension_exe) == NULL) strcatW (string, extension_exe); - if (GetFileAttributesW (string) != INVALID_FILE_ATTRIBUTES) { - WCMD_run_program (command, 0); - } else { - SetLastError (ERROR_FILE_NOT_FOUND); - WCMD_print_error (); - } + SetLastError (ERROR_FILE_NOT_FOUND); + WCMD_print_error (); return; } } else { @@ -91,7 +71,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN prev_context = context; context = LocalAlloc (LMEM_FIXED, sizeof (BATCH_CONTEXT)); context -> h = h; - context->batchfileW = WCMD_strdupW(string); + context->batchfileW = WCMD_strdupW(file); context -> command = command; memset(context -> shift_count, 0x00, sizeof(context -> shift_count)); context -> prev_context = prev_context;

1 0

Vitaly Perov : mshtml: Silence IExternalConnection in htmldoc_qi FIXME.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: cffd28f74d97b7832e2ab20117c200ea3e5ccd20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cffd28f74d97b7832e2ab2011… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Thu Feb 18 18:31:01 2010 +0300 mshtml: Silence IExternalConnection in htmldoc_qi FIXME. --- dlls/mshtml/htmldoc.c | 3 +++ dlls/mshtml/tests/htmldoc.c | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 935ec00..93aea06 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1773,6 +1773,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IMarshal, riid)) { TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppv); *ppv = NULL; + }else if(IsEqualGUID(&IID_IExternalConnection, riid)) { + TRACE("(%p)->(IID_IExternalConnection %p) returning NULL\n", This, ppv); + *ppv = NULL; }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { TRACE("(%p)->(IID_IObjectWithSite %p)\n", This, ppv); *ppv = OBJSITE(This); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d49a6ff..adc318a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4309,6 +4309,11 @@ static void test_QueryInterface(IHTMLDocument2 *doc) hres = IUnknown_QueryInterface(doc, &IID_IMarshal, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); + + qi = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(doc, &IID_IExternalConnection, (void**)&qi); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); } static void init_test(enum load_state_t ls) {

1 0

Huw Davies : fonts: Tidy up some of the extended Latin glyphs in the 9 ppem strike of Tahoma.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 35c704177971570090acc56e2df57f8b223988d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c704177971570090acc56e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 18 14:31:52 2010 +0000 fonts: Tidy up some of the extended Latin glyphs in the 9 ppem strike of Tahoma. --- fonts/tahoma.sfd | 382 +++++++++++++++++++++++++++--------------------------- fonts/tahoma.ttf | Bin 89124 -> 89148 bytes 2 files changed, 191 insertions(+), 191 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35c704177971570090acc…

1 0

Dmitry Timoshkov : comctl32: Listview should accept both unicode and ansi notifications.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: c1fd55d6c9b81ca2a3e1ae00b8078d83088ac56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fd55d6c9b81ca2a3e1ae00b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 18 20:46:27 2010 +0800 comctl32: Listview should accept both unicode and ansi notifications. Listview receives notifications not only from built-in header control, but also from custom or subclassed application controls, there is no need to assert(0) on application input, printing a FIXME is the maximum we can do on an unknown input. --- dlls/comctl32/listview.c | 18 +++++++++++++++--- dlls/comctl32/tests/listview.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cf06e09..2d39675 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -753,25 +753,37 @@ static int get_ansi_notification(UINT unicodeNotificationCode) { switch (unicodeNotificationCode) { + case LVN_BEGINLABELEDITA: case LVN_BEGINLABELEDITW: return LVN_BEGINLABELEDITA; + case LVN_ENDLABELEDITA: case LVN_ENDLABELEDITW: return LVN_ENDLABELEDITA; + case LVN_GETDISPINFOA: case LVN_GETDISPINFOW: return LVN_GETDISPINFOA; + case LVN_SETDISPINFOA: case LVN_SETDISPINFOW: return LVN_SETDISPINFOA; + case LVN_ODFINDITEMA: case LVN_ODFINDITEMW: return LVN_ODFINDITEMA; + case LVN_GETINFOTIPA: case LVN_GETINFOTIPW: return LVN_GETINFOTIPA; /* header forwards */ + case HDN_TRACKA: case HDN_TRACKW: return HDN_TRACKA; + case HDN_ENDTRACKA: case HDN_ENDTRACKW: return HDN_ENDTRACKA; case HDN_BEGINDRAG: return HDN_BEGINDRAG; case HDN_ENDDRAG: return HDN_ENDDRAG; + case HDN_ITEMCHANGINGA: case HDN_ITEMCHANGINGW: return HDN_ITEMCHANGINGA; + case HDN_ITEMCHANGEDA: case HDN_ITEMCHANGEDW: return HDN_ITEMCHANGEDA; + case HDN_ITEMCLICKA: case HDN_ITEMCLICKW: return HDN_ITEMCLICKA; + case HDN_DIVIDERDBLCLICKA: case HDN_DIVIDERDBLCLICKW: return HDN_DIVIDERDBLCLICKA; + default: break; } - ERR("unknown notification %x\n", unicodeNotificationCode); - assert(FALSE); - return 0; + FIXME("unknown notification %x\n", unicodeNotificationCode); + return unicodeNotificationCode; } /* forwards header notifications to listview parent */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9014f72..0a147b6 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4290,6 +4290,45 @@ static void test_destroynotify(void) ok_sequence(sequences, COMBINED_SEQ_INDEX, listview_destroy, "check destroy order", FALSE); } +static void test_header_notification(void) +{ + HWND list, header; + HDITEMA item; + NMHEADER nmh; + LVCOLUMNA col; + LRESULT ret; + + list = create_listview_control(LVS_REPORT); + ok(list != 0, "failed to create listview window\n"); + + memset(&col, 0, sizeof(col)); + col.mask = LVCF_WIDTH; + col.cx = 100; + ret = SendMessage(list, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); + ok(!ret, "expected 0, got %ld\n", ret); + + header = subclass_header(list); + + ret = SendMessage(header, HDM_GETITEMCOUNT, 0, 0); + ok(ret == 1, "expected header item count 1, got %ld\n", ret); + + ret = SendMessage(header, HDM_GETITEMA, 0, (LPARAM)&item); + ok(ret, "HDM_GETITEM failed\n"); + + nmh.hdr.hwndFrom = header; + nmh.hdr.idFrom = GetWindowLongPtr(header, GWLP_ID); + nmh.hdr.code = HDN_ITEMCHANGEDA; + nmh.iItem = 0; + nmh.iButton = 0; + item.mask = HDI_WIDTH; + item.cxy = 50; + nmh.pitem = &item; + ret = SendMessage(list, WM_NOTIFY, 0, (LPARAM)&nmh); + ok(!ret, "WM_NOTIFY/HDN_ITEMCHANGED failed\n"); + + DestroyWindow(list); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4318,6 +4357,7 @@ START_TEST(listview) g_is_below_5 = is_below_comctl_5(); + test_header_notification(); test_images(); test_checkboxes(); test_items();

1 0

Huw Davies : fonts: Add a 9 ppem bitmap strike to Tahoma Bold.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: b10f8f254e7c424d80e503d00294de5ff880851f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b10f8f254e7c424d80e503d00… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 18 12:36:36 2010 +0000 fonts: Add a 9 ppem bitmap strike to Tahoma Bold. --- fonts/tahomabd.sfd | 1009 ++++++++++++++++++++++++++++++++++++++++++++++++---- fonts/tahomabd.ttf | Bin 80408 -> 86440 bytes 2 files changed, 937 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b10f8f254e7c424d80e50…

1 0

Hans Leidekker : msi: Implement MSIRUNMODE_MAINTENANCE and MSIRUNMODE_REBOOTATEND for MsiGetMode .
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 65c68efc8dc2d211454857aba38271c0f956c209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c68efc8dc2d211454857aba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 18 12:47:21 2010 +0100 msi: Implement MSIRUNMODE_MAINTENANCE and MSIRUNMODE_REBOOTATEND for MsiGetMode. --- dlls/msi/install.c | 12 +++++++++++- dlls/msi/tests/automation.c | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 7a71867..6e19863 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -661,6 +661,8 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) MSIPACKAGE *package; BOOL r = FALSE; + TRACE("%d %d\n", hInstall, iRunMode); + package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); if (!package) { @@ -706,8 +708,16 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) r = package->commit_action_running; break; + case MSIRUNMODE_MAINTENANCE: + r = msi_get_property_int( package, szInstalled, 0 ) != 0; + break; + + case MSIRUNMODE_REBOOTATEND: + r = package->need_reboot; + break; + default: - FIXME("%d %d\n", hInstall, iRunMode); + FIXME("unimplemented run mode\n"); r = TRUE; } diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index cab6cb7..edc6cbe 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1863,11 +1863,11 @@ static void test_Session(IDispatch *pSession) /* Session::Mode, get */ hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); - todo_wine ok(!bool, "Reboot at end session mode is %d\n", bool); + ok(!bool, "Reboot at end session mode is %d\n", bool); hr = Session_ModeGet(pSession, MSIRUNMODE_MAINTENANCE, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); - todo_wine ok(!bool, "Maintenance mode is %d\n", bool); + ok(!bool, "Maintenance mode is %d\n", bool); /* Session::Mode, put */ hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, TRUE);

1 0

Hans Leidekker : msi: Implement MsiSetMode.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: a11882fc0f379c68f14f37d4d0fcc852623e1fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11882fc0f379c68f14f37d4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 18 12:46:58 2010 +0100 msi: Implement MsiSetMode. --- dlls/msi/install.c | 48 +++++++++++++++++++++++++++++++++++++++++- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 8 +++++++ dlls/msi/tests/automation.c | 15 +++++++++++++ 4 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index b1d741a..7a71867 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -719,8 +719,52 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) */ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) { - FIXME("%d %d %d\n", hInstall, iRunMode, fState); - return ERROR_SUCCESS; + MSIPACKAGE *package; + UINT r; + + TRACE("%d %d %d\n", hInstall, iRunMode, fState); + + package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); + if (!package) + { + HRESULT hr; + IWineMsiRemotePackage *remote_package; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ); + if (!remote_package) + return FALSE; + + hr = IWineMsiRemotePackage_SetMode( remote_package, iRunMode, fState ); + IWineMsiRemotePackage_Release( remote_package ); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + } + + switch (iRunMode) + { + case MSIRUNMODE_REBOOTATEND: + package->need_reboot = 1; + r = ERROR_SUCCESS; + break; + + case MSIRUNMODE_REBOOTNOW: + FIXME("unimplemented run mode\n"); + r = ERROR_FUNCTION_FAILED; + break; + + default: + r = ERROR_ACCESS_DENIED; + } + + return r; } /*********************************************************************** diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 8e49368..25210fe 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -63,6 +63,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetTargetPath( [in] BSTR folder, [in] BSTR value ); HRESULT GetSourcePath( [in] BSTR folder, [out] BSTR *value, [out] DWORD *size ); HRESULT GetMode( [in] MSIRUNMODE mode, [out] BOOL *ret ); + HRESULT SetMode( [in] MSIRUNMODE mode, [in] BOOL state ); HRESULT GetFeatureState( [in] BSTR feature, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); HRESULT SetFeatureState( [in] BSTR feature, [in] INSTALLSTATE state ); HRESULT GetComponentState( [in] BSTR component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 53804e2..ad6d4c6 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2104,6 +2104,13 @@ static HRESULT WINAPI mrp_GetMode( IWineMsiRemotePackage *iface, MSIRUNMODE mode return S_OK; } +static HRESULT WINAPI mrp_SetMode( IWineMsiRemotePackage *iface, MSIRUNMODE mode, BOOL state ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiSetMode(This->package, mode, state); + return HRESULT_FROM_WIN32(r); +} + static HRESULT WINAPI mrp_GetFeatureState( IWineMsiRemotePackage *iface, BSTR feature, INSTALLSTATE *installed, INSTALLSTATE *action ) { @@ -2196,6 +2203,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_SetTargetPath, mrp_GetSourcePath, mrp_GetMode, + mrp_SetMode, mrp_GetFeatureState, mrp_SetFeatureState, mrp_GetComponentState, diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 8a0eede..cab6cb7 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1865,6 +1865,10 @@ static void test_Session(IDispatch *pSession) ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); todo_wine ok(!bool, "Reboot at end session mode is %d\n", bool); + hr = Session_ModeGet(pSession, MSIRUNMODE_MAINTENANCE, &bool); + ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); + todo_wine ok(!bool, "Maintenance mode is %d\n", bool); + /* Session::Mode, put */ hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); @@ -1874,6 +1878,17 @@ static void test_Session(IDispatch *pSession) hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, TRUE); + todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTNOW, &bool); + ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); + ok(bool, "Reboot now mode is %d, expected 1\n", bool); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, FALSE); /* set it again so we don't reboot */ + todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + + hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, TRUE); + ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult 0x%08x\n", hr); + /* Session::Database, get */ hr = Session_Database(pSession, &pDatabase); ok(hr == S_OK, "Session_Database failed, hresult 0x%08x\n", hr);

1 0

Gabriele Moabiti : comdlg32: Open should try to browse directory first.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: c65a3e81f76bc1c124a262d7a9db96db35c3913f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65a3e81f76bc1c124a262d7a… Author: Gabriele Moabiti <gabmoa(a)yahoo.it> Date: Mon Feb 15 14:48:11 2010 +0100 comdlg32: Open should try to browse directory first. --- dlls/comdlg32/filedlg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 5e8f75e..58b57cc 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1989,15 +1989,15 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) TRACE("hwnd=%p\n", hwnd); + /* try to browse the selected item */ + if(BrowseSelectedFolder(hwnd)) + return FALSE; + /* get the files from the edit control */ nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed); - /* try if the user selected a folder in the shellview */ if(nFileCount == 0) - { - BrowseSelectedFolder(hwnd); return FALSE; - } if(nFileCount > 1) {

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010