November 2015 - Wine-commits

Alex Henrie : user32: Remove redundant check for buf's existence.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 6771fa22e9e0558425047da00486cab9b9f80c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6771fa22e9e0558425047da00… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 5 21:00:41 2015 -0700 user32: Remove redundant check for buf's existence. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 4570073..488141b 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2577,7 +2577,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac LPWSTR p; HRGN hrgn = 0; LPWSTR buf = NULL; - UINT bufl = 0; + UINT bufl; TRACE("%s, can_undo %d, send_update %d\n", debugstr_w(lpsz_replace), can_undo, send_update); @@ -2726,8 +2726,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac EDIT_EM_EmptyUndoBuffer(es); } - if (bufl) - HeapFree(GetProcessHeap(), 0, buf); + HeapFree(GetProcessHeap(), 0, buf); s += strl;

1 0

Alex Henrie : user32: Avoid double initialization.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 5b53c0b88bda6b67691ae80ecfbaa858279ce99d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b53c0b88bda6b67691ae80ec… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 5 21:00:42 2015 -0700 user32: Avoid double initialization. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 2 +- dlls/user32/cursoricon.c | 4 ++-- dlls/user32/dde_client.c | 6 +++--- dlls/user32/dde_misc.c | 4 ++-- dlls/user32/dde_server.c | 14 +++++++------- dlls/user32/dialog.c | 4 ++-- dlls/user32/edit.c | 8 +++----- dlls/user32/hook.c | 2 +- dlls/user32/icontitle.c | 2 +- dlls/user32/listbox.c | 4 ++-- dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 2 +- dlls/user32/message.c | 2 +- dlls/user32/msgbox.c | 2 +- dlls/user32/painting.c | 2 +- dlls/user32/sysparams.c | 2 +- dlls/user32/text.c | 2 +- dlls/user32/win.c | 4 ++-- 18 files changed, 33 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b53c0b88bda6b67691ae…

1 0

Martin Storsjo : ucrtbase: Implement __std_type_info_compare.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 78ce165f1173529c55ca431e4fdf00b9bae02b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ce165f1173529c55ca431e4… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Nov 5 22:59:05 2015 +0200 ucrtbase: Implement __std_type_info_compare. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/cpp.c | 10 ++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 5174702..b77b73e 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -44,7 +44,7 @@ @ stub __report_gsfailure @ stub __std_exception_copy @ stub __std_exception_destroy -@ stub __std_type_info_compare +@ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ stub __std_type_info_destroy_list @ stub __std_type_info_hash @ stub __std_type_info_name diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 8f7fdf2..7cffa00 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -575,6 +575,16 @@ int __thiscall MSVCRT_type_info_before(type_info * _this, const type_info * rhs) } /****************************************************************** + * __std_type_info_compare (MSVCRT.@) + */ +int CDECL MSVCRT_type_info_compare(type_info * _this, const type_info * rhs) +{ + int ret = strcmp(_this->mangled + 1, rhs->mangled + 1); + TRACE("(%p %p) returning %d\n", _this, rhs, ret); + return ret; +} + +/****************************************************************** * ??1type_info@@UAE(a)XZ (MSVCRT.@) */ DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_dtor,4) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4e8b3bb..7d8d4d1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -142,7 +142,7 @@ @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ stub __std_exception_copy @ stub __std_exception_destroy -@ stub __std_type_info_compare +@ cdecl __std_type_info_compare(ptr ptr) MSVCRT_type_info_compare @ stub __std_type_info_destroy_list @ stub __std_type_info_hash @ stub __std_type_info_name diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 4631073..feb94ac 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -39,7 +39,7 @@ @ stub __std_exception_copy @ stub __std_exception_destroy @ stub __std_terminate -@ stub __std_type_info_compare +@ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ stub __std_type_info_destroy_list @ stub __std_type_info_hash @ stub __std_type_info_name

1 0

Martin Storsjo : ucrtbase: Add a test for snprintf to a NULL buffer.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 5e2f6fa9a38d2719e9d6980514a2b83dd397e7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e2f6fa9a38d2719e9d698051… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Nov 6 12:20:44 2015 +0200 ucrtbase: Add a test for snprintf to a NULL buffer. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 6c719ea..d3ed0a2 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -156,6 +156,9 @@ static void test_snprintf (void) ok (buffer[valid] == '\0', "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); } + + ok (vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, "abcd") == 4, + "Failure to snprintf to NULL\n"); } static int __cdecl vswprintf_wrapper(unsigned __int64 options, wchar_t *str,

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 190388ed1f449b21b7db1c6786f36fb466a779ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=190388ed1f449b21b7db1c678… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 6 12:47:15 2015 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index 7314307..08b1141 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-09-13 17:46+0200\n" -"Last-Translator: Florian Pelz\n" +"PO-Revision-Date: 2015-11-06 12:55+0100\n" +"Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -7461,16 +7461,12 @@ msgid "&Convert..." msgstr "&Konvertieren..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Objekt" +msgstr "%2-&Objekt %1" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "&Objekt" +msgstr "&Objekt %1" #: oledlg.rc:33 oleview.rc:40 msgid "&Object"

1 0

Ken Thomases : winemac: Use CVDisplayLink to limit window redrawing to the display refresh rate.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 3beec95a092a261f3c265fd30a10e0c0ead524bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3beec95a092a261f3c265fd30… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 6 06:57:53 2015 -0600 winemac: Use CVDisplayLink to limit window redrawing to the display refresh rate. Some Windows apps cause user32 to flush the window surface much faster than the display refresh rate. The Mac driver only marks its window as needing to be redrawn and lets Cocoa decide how often to actually redraw. Unfortunately, Cocoa redraws each time through the run loop and, since the Mac driver uses a run loop source to convey messages from background threads to the main thread, it redraws after every batch of messages. On some versions of OS X, this excessive drawing provokes synchronization with the window server's buffer swaps, preventing the main thread from being responsive. Even when that doesn't happen, it's wasteful. So, we set our windows' autodisplay property to false so that Cocoa never displays windows itself. Then, we arrange to call -displayIfNeeded once per display refresh cycle using a CVDisplayLink. We maintain one CVDisplayLink per display (on demand), move windows among them as the windows change screens, start them when they acquire their first window, and stop them when they have none left. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 167 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3beec95a092a261f3c265…

1 0

Ken Thomases : winemac: Remove the live-resize display timer.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: bb44de787d4880b4f5cd8c7b49181dcb3e115228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb44de787d4880b4f5cd8c7b4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 6 06:57:54 2015 -0600 winemac: Remove the live-resize display timer. It's redundant with the new CVDisplayLink-driven display mechanism. This reverts commits d55d2ec85 and 94dc91a45. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.h | 1 - dlls/winemac.drv/cocoa_window.m | 40 ---------------------------------------- 2 files changed, 41 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index f245701..5d581b2 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -56,7 +56,6 @@ NSUInteger lastModifierFlags; - NSTimer* liveResizeDisplayTimer; NSRect frameAtResizeStart; BOOL resizingFromLeft, resizingFromTop; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index cd1a26b..666a953 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -293,8 +293,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @property (assign, nonatomic) void* imeData; @property (nonatomic) BOOL commandDone; -(a)property (retain, nonatomic) NSTimer* liveResizeDisplayTimer; - @property (readonly, copy, nonatomic) NSArray* childWineWindows; - (void) updateColorSpace; @@ -654,7 +652,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @synthesize usePerPixelAlpha; @synthesize imeData, commandDone; - @synthesize liveResizeDisplayTimer; + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame @@ -744,8 +741,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; - [liveResizeDisplayTimer invalidate]; - [liveResizeDisplayTimer release]; [queue release]; [latentChildWindows release]; [latentParentWindow release]; @@ -1556,16 +1551,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self checkTransparency]; } - - (void) setLiveResizeDisplayTimer:(NSTimer*)newTimer - { - if (newTimer != liveResizeDisplayTimer) - { - [liveResizeDisplayTimer invalidate]; - [liveResizeDisplayTimer release]; - liveResizeDisplayTimer = [newTimer retain]; - } - } - - (void) makeFocused:(BOOL)activate { if (activate) @@ -2248,8 +2233,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [queue postEvent:event]; macdrv_release_event(event); } - - self.liveResizeDisplayTimer = nil; } - (void) windowDidEnterFullScreen:(NSNotification*)notification @@ -2465,29 +2448,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi frameAtResizeStart = [self frame]; resizingFromLeft = resizingFromTop = FALSE; - - // There's a strange restriction in window redrawing during Cocoa- - // managed window resizing. Only calls to -[NSView setNeedsDisplay...] - // that happen synchronously when Cocoa tells us that our window size - // has changed or asynchronously in a short interval thereafter provoke - // the window to redraw. Calls to those methods that happen asynchronously - // a half second or more after the last change of the window size aren't - // heeded until the next resize-related user event (e.g. mouse movement). - // - // Wine often has a significant delay between when it's been told that - // the window has changed size and when it can flush completed drawing. - // So, our windows would get stuck with incomplete drawing for as long - // as the user holds the mouse button down and doesn't move it. - // - // We address this by "manually" asking our windows to check if they need - // redrawing every so often (during live resize only). - self.liveResizeDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:1.0/30.0 - target:self - selector:@selector(displayIfNeeded) - userInfo:nil - repeats:YES]; - [[NSRunLoop currentRunLoop] addTimer:liveResizeDisplayTimer - forMode:NSRunLoopCommonModes]; } - (NSRect) windowWillUseStandardFrame:(NSWindow*)window defaultFrame:(NSRect)proposedFrame

1 0

Jacek Caban : ntdll: Fixed argument order in NtNotifyChangeKey.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: a0d0d0dd0a5b4a500ab8d37cc6e687a202997d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d0d0dd0a5b4a500ab8d37cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 6 13:58:44 2015 +0100 ntdll: Fixed argument order in NtNotifyChangeKey. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 4 ++-- dlls/ntdll/reg.c | 4 ++-- dlls/ntdll/tests/reg.c | 25 +++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 8d97af9..67120cd 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2674,8 +2674,8 @@ LSTATUS WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL fWatchSubTree, hEvent, fAsync); status = NtNotifyChangeKey( hkey, hEvent, NULL, NULL, &iosb, - fdwNotifyFilter, fAsync, NULL, 0, - fWatchSubTree); + fdwNotifyFilter, fWatchSubTree, NULL, 0, + fAsync); if (status && status != STATUS_TIMEOUT) return RtlNtStatusToDosError( status ); diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index c0fc641..4dff186 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -643,10 +643,10 @@ NTSTATUS WINAPI NtNotifyChangeKey( IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, IN ULONG CompletionFilter, - IN BOOLEAN Asynchronous, + IN BOOLEAN WatchSubtree, OUT PVOID ChangeBuffer, IN ULONG Length, - IN BOOLEAN WatchSubtree) + IN BOOLEAN Asynchronous) { NTSTATUS ret; diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index ecfe1b2..1fe9ef3 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -146,6 +146,7 @@ static NTSTATUS (WINAPI * pRtlFreeHeap)(PVOID, ULONG, PVOID); static LPVOID (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); static NTSTATUS (WINAPI * pRtlZeroMemory)(PVOID, ULONG); static NTSTATUS (WINAPI * pRtlpNtQueryValueKey)(HANDLE,ULONG*,PBYTE,DWORD*,void *); +static NTSTATUS (WINAPI * pNtNotifyChangeKey)(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); static HMODULE hntdll = 0; static int CurrentTest = 0; @@ -183,6 +184,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtQueryInformationProcess) NTDLL_GET_PROC(NtSetValueKey) NTDLL_GET_PROC(NtOpenKey) + NTDLL_GET_PROC(NtNotifyChangeKey) NTDLL_GET_PROC(RtlFormatCurrentUserKeyPath) NTDLL_GET_PROC(RtlCompareUnicodeString) NTDLL_GET_PROC(RtlReAllocateHeap) @@ -1502,6 +1504,28 @@ static void test_NtQueryKey(void) pNtClose(key); } +static void test_notify(void) +{ + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + HANDLE key, event; + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + + status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEvent failed: %u\n", GetLastError()); + + status = pNtNotifyChangeKey(key, event, NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); + todo_wine ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + + pNtClose(key); + pNtClose(event); +} + START_TEST(reg) { static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t',0}; @@ -1526,6 +1550,7 @@ START_TEST(reg) test_NtQueryLicenseKey(); test_NtQueryValueKey(); test_long_value_name(); + test_notify(); test_NtDeleteKey(); test_symlinks(); test_redirection();

1 0

Vincent Povirk : makedep: Fix install rule for .idl files.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: d37f41218997befd1f5bf99accfa5b784ed972d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37f41218997befd1f5bf99ac… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 4 13:05:17 2015 -0600 makedep: Fix install rule for .idl files. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7ce6a0a..c96bf46 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2104,7 +2104,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t if (source->file->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); if (source->file->flags & FLAG_INSTALL) { - strarray_add( &make->install_dev_rules, xstrdup( source->filename )); + strarray_add( &make->install_dev_rules, xstrdup( source->name )); strarray_add( &make->install_dev_rules, strmake( "D$(includedir)/%s.idl", get_include_install_path( obj ) )); if (source->file->flags & FLAG_IDL_HEADER)

1 0

Vincent Povirk : comdlg32: Initially focus filename text box.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: d0fac61c6dae28ef1608c1d39c979002e1c5994b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0fac61c6dae28ef1608c1d39… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 5 14:23:26 2015 -0600 comdlg32: Initially focus filename text box. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index d66655a..f9a7707 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2065,7 +2065,10 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) if(This->filterspec_count) events_OnTypeChange(This); - return TRUE; + if ((hitem = GetDlgItem(This->dlg_hwnd, IDC_FILENAME))) + SetFocus(hitem); + + return FALSE; } static LRESULT on_wm_size(FileDialogImpl *This)

1 0