September 2015 - Wine-commits

Ken Thomases : winemac: Add a new registry setting, OpenGLSurfaceMode, to control how GL surfaces relate to the window.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: 47708c2635dee471a591a3077178b2ec775fcc62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47708c2635dee471a591a3077… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Sep 14 20:35:25 2015 -0500 winemac: Add a new registry setting, OpenGLSurfaceMode, to control how GL surfaces relate to the window. The default behavior is that GL surfaces are on top of all non-GL content in the window. This maximizes the performance for the common case of games, but clipping by parents, siblings, and child windows isn't respected. Setting OpenGLSurfaceMode to "behind" pushes the GL surface to be behind the Mac window. The window has transparent holes punched through it so that the GL surface shows through. USER32 and the wineserver take care of making sure the holes are only where the GL windows would be unclipped and unoccluded. Because the OS X window server has to composite the GL surface with the window, this limits the framerate. Since the Mac driver has no server-side rendering path, GDI rendering to a window which has a GL surface doesn't work. As a partial workaround, mostly for cases where a GL surface is created but never used, setting OpenGLSurfaceMode to "transparent" allows the GDI rendering to show through the transparent parts of the GL surface. The GDI rendering is drawn to the top-level window's surface as normal. (The behavior of user32 to exclude the portion covered by a GL window from GDI rendering is disabled.) The GL surface is in front of the window but potentially wholly or partially transparent. It is composited with the window behind it. The GL surface is initially cleared to be completely transparent. So, if no GL rendering is done, the window will appear as though the GL surface didn't exist. --- dlls/winemac.drv/cocoa_opengl.m | 2 +- dlls/winemac.drv/cocoa_window.m | 31 ++++++++++++++++++++----------- dlls/winemac.drv/macdrv_cocoa.h | 7 +++++++ dlls/winemac.drv/macdrv_main.c | 11 +++++++++++ dlls/winemac.drv/opengl.c | 17 ++++++++++++++++- 5 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 2f46b87..ec2b191 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -109,7 +109,7 @@ glDrawBuffer(GL_FRONT_AND_BACK); glDisable(GL_SCISSOR_TEST); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - glClearColor(0, 0, 0, 1); + glClearColor(0, 0, 0, gl_surface_mode == GL_SURFACE_IN_FRONT_TRANSPARENT ? 0 : 1); glClear(GL_COLOR_BUFFER_BIT); diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index f68a1c5..4ac03a7 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -198,6 +198,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif @property (readonly, copy, nonatomic) NSArray* childWineWindows; - (void) updateColorSpace; + - (void) updateForGLSubviews; - (BOOL) becameEligibleParentOrChild; - (void) becameIneligibleChild; @@ -334,14 +335,14 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self setNeedsDisplay:YES]; } - [(WineWindow*)[self window] updateColorSpace]; + [(WineWindow*)[self window] updateForGLSubviews]; } - (void) removeGLContext:(WineOpenGLContext*)context { [glContexts removeObjectIdenticalTo:context]; [pendingGlContexts removeObjectIdenticalTo:context]; - [(WineWindow*)[self window] updateColorSpace]; + [(WineWindow*)[self window] updateForGLSubviews]; } - (void) updateGLContexts @@ -1402,7 +1403,8 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (BOOL) needsTransparency { - return self.shape || self.colorKeyed || self.usePerPixelAlpha; + return self.shape || self.colorKeyed || self.usePerPixelAlpha || + (gl_surface_mode == GL_SURFACE_BEHIND && [[self.contentView valueForKeyPath:@"subviews.(a)max.hasGLContext"] boolValue]); } - (void) checkTransparency @@ -1775,6 +1777,13 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self setColorSpace:[NSColorSpace genericRGBColorSpace]]; } + - (void) updateForGLSubviews + { + [self updateColorSpace]; + if (gl_surface_mode == GL_SURFACE_BEHIND) + [self checkTransparency]; + } + /* * ---------- NSResponder method overrides ---------- @@ -2683,7 +2692,7 @@ macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) name:NSApplicationDidChangeScreenParametersNotification object:NSApp]; [[window contentView] addSubview:view]; - [window updateColorSpace]; + [window updateForGLSubviews]; }); [pool release]; @@ -2712,7 +2721,7 @@ void macdrv_dispose_view(macdrv_view v) object:NSApp]; [view removeFromSuperview]; [view release]; - [window updateColorSpace]; + [window updateForGLSubviews]; }); [pool release]; @@ -2737,15 +2746,15 @@ void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rec BOOL changedWindow = (window && window != [view window]); NSRect newFrame = NSRectFromCGRect(rect); NSRect oldFrame = [view frame]; - BOOL needUpdateWindowColorSpace = FALSE; + BOOL needUpdateWindowForGLSubviews = FALSE; if (changedWindow) { WineWindow* oldWindow = (WineWindow*)[view window]; [view removeFromSuperview]; - [oldWindow updateColorSpace]; + [oldWindow updateForGLSubviews]; [[window contentView] addSubview:view]; - needUpdateWindowColorSpace = TRUE; + needUpdateWindowForGLSubviews = TRUE; } if (!NSEqualRects(oldFrame, newFrame)) @@ -2759,11 +2768,11 @@ void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rec else [view setFrame:newFrame]; [view setNeedsDisplay:YES]; - needUpdateWindowColorSpace = TRUE; + needUpdateWindowForGLSubviews = TRUE; } - if (needUpdateWindowColorSpace) - [(WineWindow*)[view window] updateColorSpace]; + if (needUpdateWindowForGLSubviews) + [(WineWindow*)[view window] updateForGLSubviews]; }); [pool release]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 4b68adc..d5e3f46 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -118,6 +118,12 @@ enum { }; enum { + GL_SURFACE_IN_FRONT_OPAQUE, + GL_SURFACE_IN_FRONT_TRANSPARENT, + GL_SURFACE_BEHIND, +}; + +enum { MACDRV_HOTKEY_SUCCESS, MACDRV_HOTKEY_ALREADY_REGISTERED, MACDRV_HOTKEY_FAILURE, @@ -149,6 +155,7 @@ extern int right_option_is_alt DECLSPEC_HIDDEN; extern int allow_immovable_windows DECLSPEC_HIDDEN; extern int cursor_clipping_locks_windows DECLSPEC_HIDDEN; extern int use_precise_scrolling DECLSPEC_HIDDEN; +extern int gl_surface_mode DECLSPEC_HIDDEN; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 38352a8..62c70df 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -57,6 +57,7 @@ BOOL disable_window_decorations = FALSE; int allow_immovable_windows = TRUE; int cursor_clipping_locks_windows = TRUE; int use_precise_scrolling = TRUE; +int gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE; HMODULE macdrv_module = 0; @@ -183,6 +184,16 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "UsePreciseScrolling", buffer, sizeof(buffer))) use_precise_scrolling = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "OpenGLSurfaceMode", buffer, sizeof(buffer))) + { + if (!strcmp(buffer, "transparent")) + gl_surface_mode = GL_SURFACE_IN_FRONT_TRANSPARENT; + else if (!strcmp(buffer, "behind")) + gl_surface_mode = GL_SURFACE_BEHIND; + else + gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE; + } + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 220efa3..a6f1440 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1480,6 +1480,21 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns return FALSE; } + if (gl_surface_mode == GL_SURFACE_IN_FRONT_TRANSPARENT) + { + GLint opacity = 0; + err = CGLSetParameter(context->cglcontext, kCGLCPSurfaceOpacity, &opacity); + if (err != kCGLNoError) + WARN("CGLSetParameter(kCGLCPSurfaceOpacity) failed with error %d %s; leaving opaque\n", err, CGLErrorString(err)); + } + else if (gl_surface_mode == GL_SURFACE_BEHIND) + { + GLint order = -1; + err = CGLSetParameter(context->cglcontext, kCGLCPSurfaceOrder, &order); + if (err != kCGLNoError) + WARN("CGLSetParameter(kCGLCPSurfaceOrder) failed with error %d %s; leaving in front\n", err, CGLErrorString(err)); + } + context->context = macdrv_create_opengl_context(context->cglcontext); CGLReleaseContext(context->cglcontext); if (!context->context) @@ -1638,7 +1653,7 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) done: release_win_data(data); - if (ret) __wine_set_pixel_format(hwnd, fmt); + if (ret && gl_surface_mode == GL_SURFACE_BEHIND) __wine_set_pixel_format(hwnd, fmt); return ret; }

1 0

Dmitry Timoshkov : oleaut32: Use correct interface pointer.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: 6c83dd2d99af05606d625aa40374484d0b376f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c83dd2d99af05606d625aa40… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 15 11:35:57 2015 +0800 oleaut32: Use correct interface pointer. --- dlls/oleaut32/typelib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 650fa21..0891098 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7885,19 +7885,19 @@ static HRESULT WINAPI ITypeInfo_fnGetContainingTypeLib( ITypeInfo2 *iface, ITypeLib * *ppTLib, UINT *pIndex) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - + /* If a pointer is null, we simply ignore it, the ATL in particular passes pIndex as 0 */ if (pIndex) { *pIndex=This->index; TRACE("returning pIndex=%d\n", *pIndex); } - + if (ppTLib) { - *ppTLib=(LPTYPELIB )(This->pTypeLib); + *ppTLib = (ITypeLib *)&This->pTypeLib->ITypeLib2_iface; ITypeLib_AddRef(*ppTLib); TRACE("returning ppTLib=%p\n", *ppTLib); } - + return S_OK; }

1 0

Lauri Kenttä : ntdll/tests: Fix error message.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: b3d51fb78b5561c6fb605931a86f11d789525c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d51fb78b5561c6fb605931a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Sep 14 19:32:13 2015 +0300 ntdll/tests: Fix error message. --- dlls/ntdll/tests/rtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 4903790..9a4ec48 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -877,10 +877,10 @@ static void test_RtlRandom(void) } /* if */ result = pRtlRandom(&seed); ok(result == result_expected, - "test: 0x%x%08x RtlUniform(&seed (seed == %x)) returns %x, expected %x\n", + "test: 0x%x%08x RtlRandom(&seed (seed == %x)) returns %x, expected %x\n", (DWORD)(num >> 32), (DWORD)num, seed_bak, result, result_expected); ok(seed == seed_expected, - "test: 0x%x%08x RtlUniform(&seed (seed == %x)) sets seed to %x, expected %x\n", + "test: 0x%x%08x RtlRandom(&seed (seed == %x)) sets seed to %x, expected %x\n", (DWORD)(num >> 32), (DWORD)num, seed_bak, result, seed_expected); } /* for */ }

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: b5e3edbd3af7eafdb4ee2c9eca1dc392ea889b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e3edbd3af7eafdb4ee2c9ec… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Sep 14 19:31:04 2015 +0300 po: Update Finnish translation. --- po/fi.po | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/po/fi.po b/po/fi.po index 4b1e2f6..e4a2bf2 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7445,16 +7445,12 @@ msgid "&Convert..." msgstr "&Muunna..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Objekti" +msgstr "%1 %2 &Objekti" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "&Objekti" +msgstr "%1 &Objekti" #: oledlg.rc:33 oleview.rc:40 msgid "&Object"

1 0

Piotr Caban : msvcr120: Add missing win64 exports.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: 05d2a083065a4bff429322eff43352b352b8b4e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d2a083065a4bff429322eff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 14 17:48:35 2015 +0200 msvcr120: Add missing win64 exports. --- dlls/msvcr120/msvcr120.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0eb7ade..184c9b5 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -291,6 +291,7 @@ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ @ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ +@ stub -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_TaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_TaskCollection(a)details@Concurrency@@QEAA(a)XZ @@ -398,7 +399,8 @@ @ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z @ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z @ stub ?Block(a)Context@Concurrency@@SAXXZ -@ stub ?CaptureCallstack(a)platform@details(a)Concurrency@@YAIPAPAXII(a)Z +@ stub -arch=win32 ?CaptureCallstack(a)platform@details(a)Concurrency@@YAIPAPAXII(a)Z +@ stub -arch=win64 ?CaptureCallstack(a)platform@details(a)Concurrency@@YA_KPEAPEAX_K1(a)Z @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z @ stub -arch=win64 ?Create(a)CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy(a)2@@Z @ stub -arch=win32 ?Create(a)Scheduler@Concurrency@@SAPAV12(a)ABVSchedulerPolicy@2@@Z @@ -1637,6 +1639,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable +@ stub -arch=win64 _set_FMA3_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long)

1 0

Piotr Caban : msvcrt: Add _wctime32_s implementation.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: ecac39c19b8938066978f4c6b4a6e617d9ccf2ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecac39c19b8938066978f4c6b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 14 17:48:44 2015 +0200 msvcrt: Add _wctime32_s implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/time.c | 47 ++++++++++++++++++++++++++++++++++++- 8 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f9eae91..edff2c9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1525,9 +1525,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 51eddfb..9dda90a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1884,9 +1884,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 184c9b5..6e13eef 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1908,9 +1908,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index ec97ad7..bc4d63b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1601,9 +1601,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) msvcr120._wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) msvcr120._wcsxfrm_l @ cdecl _wctime32(ptr) msvcr120._wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) msvcr120._wctime32_s @ cdecl _wctime64(ptr) msvcr120._wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) msvcr120._wctime64_s @ cdecl _wctomb_l(ptr long ptr) msvcr120._wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) msvcr120._wctomb_s_l # extern _wctype diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fac2446..cc10014 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1205,9 +1205,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 479b88b..e5415c4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1180,9 +1180,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 37b94e3..3bd47d2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1137,9 +1137,9 @@ @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime32(ptr) MSVCRT__wctime32 -# stub _wctime32_s(ptr long ptr) +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -# stub _wctime64_s(ptr long ptr) +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index e52e1d8..7fed3b3 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1358,7 +1358,7 @@ int CDECL MSVCRT__wasctime_s(MSVCRT_wchar_t* time, MSVCRT_size_t size, const str if (!MSVCRT_CHECK_PMT(mstm != NULL)) return MSVCRT_EINVAL; ret = MSVCRT_asctime_s(buffer, sizeof(buffer), mstm); - if(!ret) + if(ret) return ret; MultiByteToWideChar(CP_ACP, 0, buffer, -1, time, size); return 0; @@ -1469,6 +1469,51 @@ MSVCRT_wchar_t * CDECL MSVCRT__wctime(const MSVCRT___time32_t *time) #endif /********************************************************************* + * _wctime64_s (MSVCRT.@) + */ +int CDECL MSVCRT__wctime64_s(MSVCRT_wchar_t *buf, + MSVCRT_size_t size, const MSVCRT___time64_t *time) +{ + struct MSVCRT_tm tm; + int ret; + + if(!MSVCRT_CHECK_PMT(buf != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(size != 0)) return MSVCRT_EINVAL; + buf[0] = 0; + if(!MSVCRT_CHECK_PMT(time != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(*time >= 0)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(*time <= _MAX__TIME64_T)) return MSVCRT_EINVAL; + + ret = _localtime64_s(&tm, time); + if(ret != 0) + return ret; + + return MSVCRT__wasctime_s(buf, size, &tm); +} + +/********************************************************************* + * _wctime32_s (MSVCRT.@) + */ +int CDECL MSVCRT__wctime32_s(MSVCRT_wchar_t *buf, MSVCRT_size_t size, + const MSVCRT___time32_t *time) +{ + struct MSVCRT_tm tm; + int ret; + + if(!MSVCRT_CHECK_PMT(buf != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(size != 0)) return MSVCRT_EINVAL; + buf[0] = 0; + if(!MSVCRT_CHECK_PMT(time != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(*time >= 0)) return MSVCRT_EINVAL; + + ret = _localtime32_s(&tm, time); + if(ret != 0) + return ret; + + return MSVCRT__wasctime_s(buf, size, &tm); +} + +/********************************************************************* * _get_timezone (MSVCR100.@) */ int CDECL _get_timezone(LONG *timezone)

1 0

Erich E. Hoover : wineps.drv: Add support for PostScript Format 1 glyph names.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: ce0fbe4f1e3054db6284dd5397c52b7dd6d182f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0fbe4f1e3054db6284dd539… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Sep 2 17:21:15 2015 -0600 wineps.drv: Add support for PostScript Format 1 glyph names. In order to generate a searchable PDF from a PostScript document the glyph names must follow Adobe's convention. --- dlls/wineps.drv/download.c | 321 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 318 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index e5b57f7..0c4c5a7 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -30,6 +30,8 @@ #include "winnls.h" #include "psdrv.h" +#include "data/agl.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); @@ -359,11 +361,324 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical) return TRUE; } +static void get_standard_glyph_name(WORD index, char *name) +{ + static const GLYPHNAME nonbreakingspace = { -1, "nonbreakingspace" }; + static const GLYPHNAME nonmarkingreturn = { -1, "nonmarkingreturn" }; + static const GLYPHNAME notdef = { -1, ".notdef" }; + static const GLYPHNAME null = { -1, ".null" }; + /* These PostScript Format 1 glyph names are stored by glyph index, do not reorder them. */ + static const GLYPHNAME *glyph_table[] = { + &notdef, + &null, + &nonmarkingreturn, + GN_space, + GN_exclam, + GN_quotedbl, + GN_numbersign, + GN_dollar, + GN_percent, + GN_ampersand, + GN_quotesingle, + GN_parenleft, + GN_parenright, + GN_asterisk, + GN_plus, + GN_comma, + GN_hyphen, + GN_period, + GN_slash, + GN_zero, + GN_one, + GN_two, + GN_three, + GN_four, + GN_five, + GN_six, + GN_seven, + GN_eight, + GN_nine, + GN_colon, + GN_semicolon, + GN_less, + GN_equal, + GN_greater, + GN_question, + GN_at, + GN_A, + GN_B, + GN_C, + GN_D, + GN_E, + GN_F, + GN_G, + GN_H, + GN_I, + GN_J, + GN_K, + GN_L, + GN_M, + GN_N, + GN_O, + GN_P, + GN_Q, + GN_R, + GN_S, + GN_T, + GN_U, + GN_V, + GN_W, + GN_X, + GN_Y, + GN_Z, + GN_bracketleft, + GN_backslash, + GN_bracketright, + GN_asciicircum, + GN_underscore, + GN_grave, + GN_a, + GN_b, + GN_c, + GN_d, + GN_e, + GN_f, + GN_g, + GN_h, + GN_i, + GN_j, + GN_k, + GN_l, + GN_m, + GN_n, + GN_o, + GN_p, + GN_q, + GN_r, + GN_s, + GN_t, + GN_u, + GN_v, + GN_w, + GN_x, + GN_y, + GN_z, + GN_braceleft, + GN_bar, + GN_braceright, + GN_asciitilde, + GN_Adieresis, + GN_Aring, + GN_Ccedilla, + GN_Eacute, + GN_Ntilde, + GN_Odieresis, + GN_Udieresis, + GN_aacute, + GN_agrave, + GN_acircumflex, + GN_adieresis, + GN_atilde, + GN_aring, + GN_ccedilla, + GN_eacute, + GN_egrave, + GN_ecircumflex, + GN_edieresis, + GN_iacute, + GN_igrave, + GN_icircumflex, + GN_idieresis, + GN_ntilde, + GN_oacute, + GN_ograve, + GN_ocircumflex, + GN_odieresis, + GN_otilde, + GN_uacute, + GN_ugrave, + GN_ucircumflex, + GN_udieresis, + GN_dagger, + GN_degree, + GN_cent, + GN_sterling, + GN_section, + GN_bullet, + GN_paragraph, + GN_germandbls, + GN_registered, + GN_copyright, + GN_trademark, + GN_acute, + GN_dieresis, + GN_notequal, + GN_AE, + GN_Oslash, + GN_infinity, + GN_plusminus, + GN_lessequal, + GN_greaterequal, + GN_yen, + GN_mu, + GN_partialdiff, + GN_summation, + GN_product, + GN_pi, + GN_integral, + GN_ordfeminine, + GN_ordmasculine, + GN_Omega, + GN_ae, + GN_oslash, + GN_questiondown, + GN_exclamdown, + GN_logicalnot, + GN_radical, + GN_florin, + GN_approxequal, + GN_Delta, + GN_guillemotleft, + GN_guillemotright, + GN_ellipsis, + &nonbreakingspace, + GN_Agrave, + GN_Atilde, + GN_Otilde, + GN_OE, + GN_oe, + GN_endash, + GN_emdash, + GN_quotedblleft, + GN_quotedblright, + GN_quoteleft, + GN_quoteright, + GN_divide, + GN_lozenge, + GN_ydieresis, + GN_Ydieresis, + GN_fraction, + GN_currency, + GN_guilsinglleft, + GN_guilsinglright, + GN_fi, + GN_fl, + GN_daggerdbl, + GN_periodcentered, + GN_quotesinglbase, + GN_quotedblbase, + GN_perthousand, + GN_Acircumflex, + GN_Ecircumflex, + GN_Aacute, + GN_Edieresis, + GN_Egrave, + GN_Iacute, + GN_Icircumflex, + GN_Idieresis, + GN_Igrave, + GN_Oacute, + GN_Ocircumflex, + GN_apple, + GN_Ograve, + GN_Uacute, + GN_Ucircumflex, + GN_Ugrave, + GN_dotlessi, + GN_circumflex, + GN_tilde, + GN_macron, + GN_breve, + GN_dotaccent, + GN_ring, + GN_cedilla, + GN_hungarumlaut, + GN_ogonek, + GN_caron, + GN_Lslash, + GN_lslash, + GN_Scaron, + GN_scaron, + GN_Zcaron, + GN_zcaron, + GN_brokenbar, + GN_Eth, + GN_eth, + GN_Yacute, + GN_yacute, + GN_Thorn, + GN_thorn, + GN_minus, + GN_multiply, + GN_onesuperior, + GN_twosuperior, + GN_threesuperior, + GN_onehalf, + GN_onequarter, + GN_threequarters, + GN_franc, + GN_Gbreve, + GN_gbreve, + GN_Idotaccent, + GN_Scedilla, + GN_scedilla, + GN_Cacute, + GN_cacute, + GN_Ccaron, + GN_ccaron, + GN_dcroat + }; + snprintf(name, MAX_G_NAME + 1, "%s", glyph_table[index]->sz); +} + void get_glyph_name(HDC hdc, WORD index, char *name) { - /* FIXME */ - sprintf(name, "g%04x", index); - return; + struct + { + DWORD format; + DWORD italicAngle; + SHORT underlinePosition; + SHORT underlineThickness; + DWORD isFixedPitch; + DWORD minMemType42; + DWORD maxMemType42; + DWORD minMemType1; + DWORD maxMemType1; + } *post_header; + BYTE *post = NULL; + DWORD size; + + /* set a fallback name that is just 'g<index>' */ + snprintf(name, MAX_G_NAME + 1, "g%04x", index); + + /* attempt to obtain the glyph name from the 'post' table */ + size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, NULL, 0); + if(size < sizeof(*post_header) || size == GDI_ERROR) + return; + post = HeapAlloc(GetProcessHeap(), 0, size); + if(!post) + return; + size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, post, size); + if(size < sizeof(*post_header) || size == GDI_ERROR) + goto cleanup; + post_header = (typeof(post_header))(post); + /* note: only interested in the format for obtaining glyph names */ + post_header->format = GET_BE_DWORD(&post_header->format); + + /* now that we know the format of the 'post' table we can get the glyph name */ + if(post_header->format == MAKELONG(0, 1)) + { + if(index < 258) + get_standard_glyph_name(index, name); + else + WARN("Font uses PostScript Format 1, but non-standard glyph (%d) requested.\n", index); + } + else + FIXME("PostScript Format %d.%d glyph names are currently unsupported.\n", + HIWORD(post_header->format), LOWORD(post_header->format)); + +cleanup: + HeapFree(GetProcessHeap(), 0, post); } /****************************************************************************

1 0

Erich E. Hoover : wineps.drv: Add support for PostScript Format 2 standard glyph names.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: b66fcd68f7d54eae955cca8b8778a864866b5731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66fcd68f7d54eae955cca8b8… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Thu Sep 3 16:16:31 2015 -0600 wineps.drv: Add support for PostScript Format 2 standard glyph names. --- dlls/wineps.drv/download.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 0c4c5a7..7b99b33 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -631,6 +631,19 @@ static void get_standard_glyph_name(WORD index, char *name) snprintf(name, MAX_G_NAME + 1, "%s", glyph_table[index]->sz); } +static int get_post2_name_index(BYTE *post2header, DWORD size, WORD index) +{ + USHORT numberOfGlyphs = GET_BE_WORD(post2header); + DWORD offset = (1 + index) * sizeof(USHORT); + + if(offset + sizeof(USHORT) > size || index >= numberOfGlyphs) + { + FIXME("Index '%d' exceeds PostScript Format 2 table size (%d)\n", index, numberOfGlyphs); + return -1; + } + return GET_BE_WORD(post2header + offset); +} + void get_glyph_name(HDC hdc, WORD index, char *name) { struct @@ -673,6 +686,25 @@ void get_glyph_name(HDC hdc, WORD index, char *name) else WARN("Font uses PostScript Format 1, but non-standard glyph (%d) requested.\n", index); } + else if(post_header->format == MAKELONG(0, 2)) + { + BYTE *post2header = post + sizeof(*post_header); + int glyphNameIndex; + + size -= sizeof(*post_header); + if(size < sizeof(USHORT)) + { + FIXME("PostScript Format 2 table is invalid (cannot fit header)\n"); + goto cleanup; + } + glyphNameIndex = get_post2_name_index(post2header, size, index); + if(glyphNameIndex == -1) + goto cleanup; /* invalid index, use fallback name */ + else if(glyphNameIndex < 258) + get_standard_glyph_name(glyphNameIndex, name); + else + FIXME("PostScript Format 2 custom glyphs are currently unsupported.\n"); + } else FIXME("PostScript Format %d.%d glyph names are currently unsupported.\n", HIWORD(post_header->format), LOWORD(post_header->format));

1 0

Erich E. Hoover : wineps.drv: Add support for PostScript Format 2 custom glyph names.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: d79de513f754dd7572b6fe3f3b7bfe51dafd1dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79de513f754dd7572b6fe3f3… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Thu Sep 3 16:24:45 2015 -0600 wineps.drv: Add support for PostScript Format 2 custom glyph names. --- dlls/wineps.drv/download.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 7b99b33..30eb0db 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -644,6 +644,35 @@ static int get_post2_name_index(BYTE *post2header, DWORD size, WORD index) return GET_BE_WORD(post2header + offset); } +static void get_post2_custom_glyph_name(BYTE *post2header, DWORD size, WORD index, char *name) +{ + USHORT numberOfGlyphs = GET_BE_WORD(post2header); + int i, name_offset = (1 + numberOfGlyphs) * sizeof(USHORT); + BYTE name_length = 0; + + for(i = 0; i <= index; i++) + { + name_offset += name_length; + if(name_offset + sizeof(BYTE) > size) + { + FIXME("Pascal name offset '%d' exceeds PostScript Format 2 table size (%d)\n", + name_offset + sizeof(BYTE), size); + return; + } + name_length = (post2header + name_offset)[0]; + if(name_offset + name_length > size) + { + FIXME("Pascal name offset '%d' exceeds PostScript Format 2 table size (%d)\n", + name_offset + name_length, size); + return; + } + name_offset += sizeof(BYTE); + } + name_length = min(name_length, MAX_G_NAME); + memcpy(name, post2header + name_offset, name_length); + name[name_length] = 0; +} + void get_glyph_name(HDC hdc, WORD index, char *name) { struct @@ -703,7 +732,7 @@ void get_glyph_name(HDC hdc, WORD index, char *name) else if(glyphNameIndex < 258) get_standard_glyph_name(glyphNameIndex, name); else - FIXME("PostScript Format 2 custom glyphs are currently unsupported.\n"); + get_post2_custom_glyph_name(post2header, size, glyphNameIndex - 258, name); } else FIXME("PostScript Format %d.%d glyph names are currently unsupported.\n",

1 0

Vincent Povirk : shell32: Do nothing if we can' t convert PIDL to path in SHAddToRecentDocs.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: 69d57ee72fb436270c52eac446f2deacb5de8e54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d57ee72fb436270c52eac44… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 14 15:08:36 2015 -0500 shell32: Do nothing if we can't convert PIDL to path in SHAddToRecentDocs. --- dlls/shell32/shellord.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 914dc5a..7387520 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -876,7 +876,11 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) switch (uFlags) { case SHARD_PIDL: - SHGetPathFromIDListA(pv, doc_name); + if (!SHGetPathFromIDListA(pv, doc_name)) + { + WARN("can't get path from PIDL\n"); + return; + } break; case SHARD_PATHA:

1 0