February 2015 - Wine-Commits

Austin English : ntoskrnl.exe: Add ExfInterlockedRemoveHeadList stub.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: b39efd9ed73927e4e5538b0cb61bec17d341358a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39efd9ed73927e4e5538b0cb… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 5 12:55:25 2015 -0600 ntoskrnl.exe: Add ExfInterlockedRemoveHeadList stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 51ac2ca..cdc5305 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2031,3 +2031,17 @@ PLIST_ENTRY WINAPI ExInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK loc FIXME("(%p %p) stub\n", head, lock); return NULL; } + +/*********************************************************************** + * ExfInterlockedRemoveHeadList (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( ExfInterlockedRemoveHeadList ) +PLIST_ENTRY WINAPI __regs_ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lock) +#else +PLIST_ENTRY WINAPI ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lock) +#endif +{ + FIXME("(%p %p) stub\n", head, lock); + return ExInterlockedRemoveHeadList( head, lock ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 79505ef..11d1c62 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -22,7 +22,7 @@ @ stub ExfInterlockedInsertTailList @ stub ExfInterlockedPopEntryList @ stub ExfInterlockedPushEntryList -@ stub ExfInterlockedRemoveHeadList +@ stdcall -norelay ExfInterlockedRemoveHeadList(ptr ptr) @ stub ExfReleasePushLock @ stub Exfi386InterlockedDecrementLong @ stub Exfi386InterlockedExchangeUlong

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_DrawBitmap().
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: 2f2e1b98fd285e76352a4d9b922d1eeb17535fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2e1b98fd285e76352a4d9b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:57:02 2015 +0100 d2d1: Implement d2d_d3d_render_target_DrawBitmap(). --- dlls/d2d1/render_target.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 3d9abb8..f109849 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -709,8 +709,62 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect) { - FIXME("iface %p, bitmap %p, dst_rect %p, opacity %.8e, interpolation_mode %#x, src_rect %p stub!\n", + D2D1_BITMAP_BRUSH_PROPERTIES bitmap_brush_desc; + D2D1_BRUSH_PROPERTIES brush_desc; + ID2D1BitmapBrush *brush; + D2D1_RECT_F s, d; + HRESULT hr; + + TRACE("iface %p, bitmap %p, dst_rect %p, opacity %.8e, interpolation_mode %#x, src_rect %p.\n", iface, bitmap, dst_rect, opacity, interpolation_mode, src_rect); + + if (src_rect) + { + s = *src_rect; + } + else + { + D2D1_SIZE_F size; + + size = ID2D1Bitmap_GetSize(bitmap); + s.left = 0.0f; + s.top = 0.0f; + s.right = size.width; + s.bottom = size.height; + } + + if (dst_rect) + { + d = *dst_rect; + } + else + { + d.left = 0.0f; + d.top = 0.0f; + d.right = s.right - s.left; + d.bottom = s.bottom - s.top; + } + + bitmap_brush_desc.extendModeX = D2D1_EXTEND_MODE_CLAMP; + bitmap_brush_desc.extendModeY = D2D1_EXTEND_MODE_CLAMP; + bitmap_brush_desc.interpolationMode = interpolation_mode; + + brush_desc.opacity = opacity; + brush_desc.transform._11 = (d.right - d.left) / (s.right - s.left); + brush_desc.transform._21 = 0.0f; + brush_desc.transform._31 = d.left; + brush_desc.transform._12 = 0.0f; + brush_desc.transform._22 = (d.bottom - d.top) / (s.bottom - s.top); + brush_desc.transform._32 = d.top; + + if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) + { + ERR("Failed to create bitmap brush, hr %#x.\n", hr); + return; + } + + ID2D1RenderTarget_FillRectangle(iface, &d, (ID2D1Brush *)brush); + ID2D1BitmapBrush_Release(brush); } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget *iface,

1 0

Stefan Dösinger : wined3d: Check the d3d buffer to find converted attributes.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: da5041eb4b3fc4bab7f6aef2a4b091a58c39f36a URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5041eb4b3fc4bab7f6aef2a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 6 10:46:48 2015 +0100 wined3d: Check the d3d buffer to find converted attributes. This fixes some tests with ARB shaders that were broken since 1360af6adcbc5c77a7b3c5e32f3c886e450456f5. When buffer_internal_preload is called by context_update_stream_info, si->elements[i].data is not yet set. --- dlls/wined3d/buffer.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2fba83b..f2a22b0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -266,7 +266,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This, #define WINED3D_BUFFER_FIXUP_XYZRHW 0x02 static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct wined3d_stream_info *si, - UINT attrib_idx, DWORD fixup_flags, DWORD *stride_this_run) + const struct wined3d_state *state, UINT attrib_idx, DWORD fixup_flags, DWORD *stride_this_run) { const struct wined3d_stream_info_element *attrib = &si->elements[attrib_idx]; enum wined3d_format_id format; @@ -276,7 +276,7 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win * there, on nonexistent attribs the vbo is 0. */ if (!(si->use_map & (1 << attrib_idx)) - || attrib->data.buffer_object != This->buffer_object) + || state->streams[attrib->stream_idx].buffer != This) return FALSE; format = attrib->format->id; @@ -304,7 +304,7 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win } static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_stream_info *si, - DWORD fixup_flags) + const struct wined3d_state *state, DWORD fixup_flags) { UINT stride_this_run = 0; BOOL ret = FALSE; @@ -378,31 +378,31 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_s * texcoord needs no conversion while a FLOAT4 positiont needs one */ - ret = buffer_check_attribute(This, si, WINED3D_FFP_POSITION, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_POSITION, fixup_flags, &stride_this_run) || ret; fixup_flags &= ~WINED3D_BUFFER_FIXUP_XYZRHW; - ret = buffer_check_attribute(This, si, WINED3D_FFP_NORMAL, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_NORMAL, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_DIFFUSE, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_DIFFUSE, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_SPECULAR, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_SPECULAR, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD0, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD0, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD1, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD1, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD2, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD2, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD3, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD3, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD4, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD4, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD5, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD5, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD6, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD6, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD7, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD7, fixup_flags, &stride_this_run) || ret; if (!stride_this_run && This->conversion_map) @@ -767,7 +767,7 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte fixup_flags |= WINED3D_BUFFER_FIXUP_XYZRHW; } - decl_changed = buffer_find_decl(buffer, &context->stream_info, fixup_flags); + decl_changed = buffer_find_decl(buffer, &context->stream_info, state, fixup_flags); buffer->flags |= WINED3D_BUFFER_HASDESC; }

1 0

Jacek Caban : jscript: Pass 'this' as jsdisp_t to getters.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: d541b525e40b9ff0c1f654dff95c6f70ae2de02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d541b525e40b9ff0c1f654dff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 6 12:09:40 2015 +0100 jscript: Pass 'this' as jsdisp_t to getters. --- dlls/jscript/array.c | 21 +++++++++++++-------- dlls/jscript/date.c | 11 ++++++++--- dlls/jscript/dispex.c | 6 +----- dlls/jscript/function.c | 24 +++++++++++++----------- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/jsregexp.c | 45 ++++++++++++++++++++++++--------------------- dlls/jscript/number.c | 11 ++++++++--- dlls/jscript/object.c | 2 +- dlls/jscript/string.c | 15 ++++++++++----- 9 files changed, 80 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d541b525e40b9ff0c1f65…

1 0

Jacek Caban : jscript: Fixed handling VT_VARIANT|VY_BYREF types.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: a1543a3f7b0eafe67ff52e72a6d4c367c57d8944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1543a3f7b0eafe67ff52e72a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 6 12:10:00 2015 +0100 jscript: Fixed handling VT_VARIANT|VY_BYREF types. --- dlls/jscript/jsutils.c | 3 +++ dlls/jscript/tests/run.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 20e659c..85f573f 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -246,6 +246,9 @@ HRESULT jsval_copy(jsval_t v, jsval_t *r) HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) { + if(V_VT(var) == (VT_VARIANT|VT_BYREF)) + var = V_VARIANTREF(var); + switch(V_VT(var)) { case VT_EMPTY: *r = jsval_undefined(); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 2044789..97799db 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1211,7 +1211,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[5]; + VARIANT args[6], v; DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; @@ -1249,6 +1249,10 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_UNKNOWN(args+3) = NULL; V_VT(args+4) = VT_UI4; V_UI4(args+4) = 0xffffffff; + V_VT(args+5) = VT_BYREF|VT_VARIANT; + V_VARIANTREF(args+5) = &v; + V_VT(&v) = VT_I4; + V_I4(&v) = 2; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); ok(hres == S_OK, "Invoke failed: %08x\n", hres); @@ -2412,14 +2416,16 @@ static BOOL run_tests(void) CHECK_CALLED(global_propargput_i); SET_EXPECT(global_testargtypes_i); - parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(ui4,nullunk,d,i,s) {" + parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(i4ref,ui4,nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" " ok(getVT(nullunk) === 'VT_DISPATCH', 'getVT(nullunk) = ' + getVT(nullunk));" " ok(nullunk === null, 'nullunk !== null');" - " ok(getVT(ui4) === 'VT_R8', 'getVT(s) = ' + getVT(s));" + " ok(getVT(ui4) === 'VT_R8', 'getVT(ui4) = ' + getVT(ui4));" " ok(ui4 > 0, 'ui4 = ' + ui4);" + " ok(getVT(i4ref) === 'VT_I4', 'getVT(i4ref) = ' + getVT(i4ref));" + " ok(i4ref === 2, 'i4ref = ' + i4ref);" "});"); CHECK_CALLED(global_testargtypes_i);

1 0

Charles Davis : dbghelp: Support 64-bit dyld_all_image_infos structures, too.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: b3232e7c9d5232839160380bbbfd246f44862232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3232e7c9d5232839160380bb… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 5 13:28:59 2015 -0700 dbghelp: Support 64-bit dyld_all_image_infos structures, too. --- dlls/dbghelp/macho_module.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 2eb2b94..bb49aa5 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -981,10 +981,10 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, &pbi, sizeof(pbi), NULL); if (status == STATUS_SUCCESS) { - ULONG dyld_image_info; + ULONG_PTR dyld_image_info; /* Read dyld image info address from PEB */ - if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved, + if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], &dyld_image_info, sizeof(dyld_image_info), NULL)) { TRACE("got dyld_image_info 0x%08x from PEB %p MacDyldImageInfo %p\n", @@ -994,6 +994,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, } } +#ifndef __LP64__ /* No reading the symtab with nlist(3) in LP64 */ if (!ret) { static void* dyld_all_image_infos_addr; @@ -1017,6 +1018,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, ret = TRUE; } } +#endif } if (macho_info->flags & MACHO_INFO_MODULE)

1 0

Austin English : apphelp: Add a stub for SdbCloseDatabase.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: 3f9a4ac10c3d2f7c3ced9d37d14c41fa07a5641d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9a4ac10c3d2f7c3ced9d37d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 5 12:25:55 2015 -0600 apphelp: Add a stub for SdbCloseDatabase. --- dlls/apphelp/apphelp.c | 5 +++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 67c2139..64dcd87 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -106,3 +106,8 @@ TAGID WINAPI SdbGetFirstChild(PDB pdb, TAGID parent) FIXME("stub: %p %d\n", pdb, parent); return TAGID_NULL; } + +void WINAPI SdbCloseDatabase(PDB pdb) +{ + FIXME("stub: %p\n", pdb); +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index e826aba..a658e5c 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -22,7 +22,7 @@ @ stub SdbApphelpNotifyExSdbApphelpNotifyEx @ stub SdbBuildCompatEnvVariables @ stub SdbCloseApphelpInformation -@ stub SdbCloseDatabase +@ stdcall SdbCloseDatabase(ptr) @ stub SdbCloseDatabaseWrite @ stub SdbCloseLocalDatabase @ stub SdbCommitIndexes

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: 4dd4d0b30a7bb261b12a843ec5f452aaa88f0a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd4d0b30a7bb261b12a843ec… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 5 19:18:15 2015 +0200 po: Update Finnish translation. --- po/fi.po | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/po/fi.po b/po/fi.po index 12d117e..c609240 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13060,20 +13060,16 @@ msgid "&Test Sound" msgstr "&Testiääni" #: winecfg.rc:275 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Winen asetukset" +msgstr "Kaiutinasetukset" #: winecfg.rc:276 -#, fuzzy -#| msgid "De&vice:" msgid "Device:" -msgstr "Lai&te:" +msgstr "Laite:" #: winecfg.rc:278 msgid "Speakers:" -msgstr "" +msgstr "Kaiuttimet:" #: winecfg.rc:286 msgid "Appearance" @@ -13181,21 +13177,19 @@ msgstr "(Järjestelmän oletus)" #: winecfg.rc:89 msgid "5.1 Surround" -msgstr "" +msgstr "5.1 Surround" #: winecfg.rc:90 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "kuva" +msgstr "Neliääninen" #: winecfg.rc:91 msgid "Stereo" -msgstr "" +msgstr "Stereo" #: winecfg.rc:92 msgid "Mono" -msgstr "" +msgstr "Mono" #: winecfg.rc:54 msgid ""

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: 31e588b73ef6909e72f2e7fd93bd0131e9f6152b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e588b73ef6909e72f2e7fd9… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Feb 5 22:21:46 2015 +0100 po: Update German translation. --- po/de.po | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/po/de.po b/po/de.po index 50e98e4..bf6e069 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-10-06 21:51+0200\n" +"PO-Revision-Date: 2015-02-05 22:22+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -13175,20 +13175,16 @@ msgid "&Test Sound" msgstr "Sound &testen" #: winecfg.rc:275 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Wine-Konfiguration" +msgstr "Lautsprecher-Konfiguration" #: winecfg.rc:276 -#, fuzzy -#| msgid "De&vice:" msgid "Device:" -msgstr "Ge&rät:" +msgstr "Gerät:" #: winecfg.rc:278 msgid "Speakers:" -msgstr "" +msgstr "Lautsprecher:" #: winecfg.rc:286 msgid "Appearance" @@ -13288,29 +13284,27 @@ msgstr "(Kein)" #: winecfg.rc:86 msgid "Audio test failed!" -msgstr "Festplattenreset fehlgeschlagen!" +msgstr "Audiotest fehlgeschlagen!" #: winecfg.rc:88 msgid "(System default)" -msgstr "(System Standard)" +msgstr "(Systemstandard)" #: winecfg.rc:89 msgid "5.1 Surround" -msgstr "" +msgstr "5.1 Surround" #: winecfg.rc:90 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "Grafik" +msgstr "Quadrofon" #: winecfg.rc:91 msgid "Stereo" -msgstr "" +msgstr "Stereo" #: winecfg.rc:92 msgid "Mono" -msgstr "" +msgstr "Mono" #: winecfg.rc:54 msgid ""

1 0

Austin English : apphelp: Add a stub for SdbGetFirstChild.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: c9973679119310a9b81b31c5b92c506208098ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9973679119310a9b81b31c5b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 5 12:15:06 2015 -0600 apphelp: Add a stub for SdbGetFirstChild. --- dlls/apphelp/apphelp.c | 10 ++++++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index dd120a9..67c2139 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -34,6 +34,10 @@ typedef enum _PATH_TYPE { /* FIXME: don't know where to place that typedef */ typedef HANDLE PDB; typedef HANDLE HSDB; +typedef DWORD TAGID; + +/* FIXME: don't know where to place that define */ +#define TAGID_NULL 0x0 BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { @@ -96,3 +100,9 @@ PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return NULL; } + +TAGID WINAPI SdbGetFirstChild(PDB pdb, TAGID parent) +{ + FIXME("stub: %p %d\n", pdb, parent); + return TAGID_NULL; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index d94c5fa..e826aba 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -62,7 +62,7 @@ @ stub SdbGetFileImageType @ stub SdbGetFileImageTypeEx @ stub SdbGetFileInfo -@ stub SdbGetFirstChild +@ stdcall SdbGetFirstChild(ptr long) @ stub SdbGetIndex @ stub SdbGetItemFromItemRef @ stub SdbGetLayerName

1 0