wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Stefan Dösinger : wined3d: Only perform sRGB write correction on formats that advertise it.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 6b794cbd64ba4a33cde3f349c0af2a3de88c2427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b794cbd64ba4a33cde3f349c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 2 22:21:02 2010 +0200 wined3d: Only perform sRGB write correction on formats that advertise it. --- dlls/wined3d/context.c | 5 +++++ dlls/wined3d/shader.c | 13 +++++++++---- dlls/wined3d/utils.c | 4 +++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 435c315..b8d35c7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2192,6 +2192,11 @@ static void context_setup_target(IWineD3DDeviceImpl *device, { Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); } + /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ + if ((old->Flags & WINED3DFMT_FLAG_SRGB_WRITE) != (new->Flags & WINED3DFMT_FLAG_SRGB_WRITE)) + { + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), StateTable); + } } /* When switching away from an offscreen render target, and we're not diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f26122a..66a81fb 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2008,10 +2008,16 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct ps_compile_args *args) { IWineD3DBaseTextureImpl *texture; + IWineD3DDeviceImpl *device = stateblock->device; UINT i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ - args->srgb_correction = stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0; + if (stateblock->renderState[WINED3DRS_SRGBWRITEENABLE]) + { + IWineD3DSurfaceImpl *rt = device->render_targets[0]; + if(rt->resource.format_desc->Flags & WINED3DFMT_FLAG_SRGB_WRITE) args->srgb_correction = 1; + } + args->np2_fixup = 0; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) @@ -2036,7 +2042,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, } if (shader->baseShader.reg_maps.shader_version.major >= 3) { - if (((IWineD3DDeviceImpl *)shader->baseShader.device)->strided_streams.position_transformed) + if (device->strided_streams.position_transformed) { args->vp_mode = pretransformed; } @@ -2058,8 +2064,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, switch (stateblock->renderState[WINED3DRS_FOGTABLEMODE]) { case WINED3DFOG_NONE: - if (((IWineD3DDeviceImpl *)shader->baseShader.device)->strided_streams.position_transformed - || use_vs(stateblock)) + if (device->strided_streams.position_transformed || use_vs(stateblock)) { args->fog = FOG_LINEAR; break; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b38d6c0..7a36998 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2698,6 +2698,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting DWORD ttff; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; IWineD3DDeviceImpl *device = stateblock->device; + IWineD3DSurfaceImpl *rt = device->render_targets[0]; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; for (i = 0; i < gl_info->limits.texture_stages; ++i) @@ -2886,7 +2887,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting break; } } - if(stateblock->renderState[WINED3DRS_SRGBWRITEENABLE]) { + if(stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] && + rt->resource.format_desc->Flags & WINED3DFMT_FLAG_SRGB_WRITE) { settings->sRGB_write = 1; } else { settings->sRGB_write = 0;

1 0

Paul Vriens : appwiz.cpl: Add the Serbian (Cyrillic) translation.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: d3a5242c971df897aea0d5462a15558f79a50e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a5242c971df897aea0d5462… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 21 22:43:35 2010 +0200 appwiz.cpl: Add the Serbian (Cyrillic) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/appwiz.cpl/Sr.rc | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Sr.rc b/dlls/appwiz.cpl/Sr.rc index 9fb2e77..0b98c22 100644 --- a/dlls/appwiz.cpl/Sr.rc +++ b/dlls/appwiz.cpl/Sr.rc @@ -85,3 +85,65 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_CPL_TITLE, "Додај/Уклони програме" + IDS_CPL_DESC, "Инсталирање новог програма или брисање истог савашег рачунара." + IDS_TAB1_TITLE, "Програми" + + IDS_UNINSTALL_FAILED, "Брисање програма се не може прекинути, '%s'. Да ли желите да уклоните опцију Брисање за овајпрограм из регистра?" + IDS_NOT_SPECIFIED, "Није одређено" + + IDS_COLUMN_NAME, "Име" + IDS_COLUMN_PUBLISHER, "Издавач" + IDS_COLUMN_VERSION, "Верзија" + IDS_INSTALL_FILTER, "Инсталациони програми\\0*instal*.exe;*setup*.exe;*.msi\\0Programs (*.exe)\\0*.exe\\0Сви фајлови (*.*)\\0*.*\\0\\0" + + IDS_REMOVE, "&Уклони..." + IDS_MODIFY_REMOVE, "&Измени/Уклони..." +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Инсталирај/Уклони" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Да инсталирате нови програм са дискете,диска или са вашегхард диска, кликните Инсталирај.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Инсталирај...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "Програм се може аутоматски уклонити. Да уклоните програм илида измените његове инсталиране делове, изаберите са листе и кликнитеИзмени/Уклони,", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&Инфо подршке...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&Измени...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Уклони...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Инфо подршке" +FONT 8, "MS Shell Dlg" +{ + CONTROL "ОK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Ова информација се може користити да добијете Техничку подршку за %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Издавач:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Верзија:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Контакт:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Инфо подршке:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Телефон подршке:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Прочитај ме:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Нове верзије:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Коментари:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +}

1 0

Paul Vriens : comctl32: Use the Cyrillic 'O' in the Serbian translation.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 36b595e69cd08bd90edfed22ec743b204f29435a URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b595e69cd08bd90edfed22e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 21 22:37:02 2010 +0200 comctl32: Use the Cyrillic 'O' in the Serbian translation. --- dlls/comctl32/comctl_Sr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl_Sr.rc b/dlls/comctl32/comctl_Sr.rc index 52f520c..ecca989 100644 --- a/dlls/comctl32/comctl_Sr.rc +++ b/dlls/comctl32/comctl_Sr.rc @@ -98,7 +98,7 @@ STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_V CAPTION "Детаљи за %s" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + DEFPUSHBUTTON "ОK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP PUSHBUTTON "Откажи", IDCANCEL,58,122,50,14 PUSHBUTTON "&Примени", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "Помоћ", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP

1 0

Henri Verbeet : wined3d: Framebuffer blits are affected by the color mask.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 3d8ff7f27a8818d6a89192c56f993d0689a419bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8ff7f27a8818d6a89192c56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 21 18:48:24 2010 +0200 wined3d: Framebuffer blits are affected by the color mask. --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/swapchain.c | 6 ++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 447aa40..4b87245 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5835,6 +5835,13 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL); context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); } + + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); + glDisable(GL_SCISSOR_TEST); IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 783033c..87db680 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -126,6 +126,12 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); context_set_draw_buffer(context, GL_BACK); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); + glDisable(GL_SCISSOR_TEST); IWineD3DDeviceImpl_MarkStateDirty(This->device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE));

1 0

Henri Verbeet : wined3d: Preload resources before FBO setup.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 4817a650911d78dd59baf954a65fcc8df124af1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4817a650911d78dd59baf954a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 21 18:48:23 2010 +0200 wined3d: Preload resources before FBO setup. --- dlls/wined3d/context.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fe397dc..435c315 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2110,6 +2110,14 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp const struct StateEntry *state_table = device->StateTable; unsigned int i; + /* Preload resources before FBO setup. Texture preload in particular may + * result in changes to the current FBO, due to using e.g. FBO blits for + * updating a resource location. */ + IWineD3DDeviceImpl_FindTexUnitMap(device); + device_preload_textures(device); + if (isStateDirty(context, STATE_VDECL)) + device_update_stream_info(device, context->gl_info); + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { context_validate_onscreen_formats(device, context, device->depth_stencil); @@ -2139,11 +2147,6 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); } - IWineD3DDeviceImpl_FindTexUnitMap(device); - device_preload_textures(device); - if (isStateDirty(context, STATE_VDECL)) - device_update_stream_info(device, context->gl_info); - ENTER_GL(); for (i = 0; i < context->numDirtyEntries; ++i) {

1 0

Henri Verbeet : wined3d: Remove LoadLocation() from the public wined3d surface interface.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: f7760656f3b09b3151e8c274c4151a0cdec19174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7760656f3b09b3151e8c274c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 21 18:48:22 2010 +0200 wined3d: Remove LoadLocation() from the public wined3d surface interface. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 8 +- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 268 ++++++++++++++++++++------------------- dlls/wined3d/surface_gdi.c | 13 -- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 4 - 10 files changed, 147 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7760656f3b09b3151e8c…

1 0

Henri Verbeet : wined3d: Remove ModifyLocation() from the public wined3d surface interface.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 147f24dd7865d8942e3f16ca8acf5dd8f7b7f89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=147f24dd7865d8942e3f16ca8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 21 18:48:21 2010 +0200 wined3d: Remove ModifyLocation() from the public wined3d surface interface. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 10 ++-- dlls/wined3d/drawprim.c | 8 ++-- dlls/wined3d/surface.c | 99 +++++++++++++++++++++---------------- dlls/wined3d/surface_gdi.c | 11 ---- dlls/wined3d/swapchain.c | 18 ++++--- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 4 -- 11 files changed, 81 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=147f24dd7865d8942e3f1…

1 0

Andrew Eikum : shlwapi: Implement SHSetIniStringW.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: ab418fc258165a1a4ac05f91983d34a230759439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab418fc258165a1a4ac05f919… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 21 11:23:57 2010 -0500 shlwapi: Implement SHSetIniStringW. --- dlls/shlwapi/ordinal.c | 26 +++++++++++------ dlls/shlwapi/tests/ordinal.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 2c9db24..2bf0e79 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3292,18 +3292,26 @@ DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, /************************************************************************* * @ [SHLWAPI.295] * - * Called by ICQ2000b install via SHDOCVW: - * str1: "InternetShortcut" - * x: some unknown pointer - * str2: "http://free.aol.com/tryaolfree/index.adp?139269" - * str3: "C:\\WINDOWS\\Desktop.new2\\Free AOL & Unlimited Internet.url" + * Set a key value in an INI file. See WritePrivateProfileString for + * more information. + * + * PARAMS + * appName [I] The section in the INI file that contains the key + * keyName [I] The key to be set + * str [O] The value of the key + * filename [I] The location of the INI file * - * In short: this one maybe creates a desktop link :-) + * RETURNS + * Success: TRUE + * Failure: FALSE */ -BOOL WINAPI SHSetIniStringW(LPWSTR str1, LPVOID x, LPWSTR str2, LPWSTR str3) +BOOL WINAPI SHSetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPCWSTR str, + LPCWSTR filename) { - FIXME("(%s, %p, %s, %s), stub.\n", debugstr_w(str1), x, debugstr_w(str2), debugstr_w(str3)); - return TRUE; + TRACE("(%s, %p, %s, %s)\n", debugstr_w(appName), keyName, debugstr_w(str), + debugstr_w(filename)); + + return WritePrivateProfileStringW(appName, keyName, str, filename); } /************************************************************************* diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 829819d..88165ef 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -59,6 +59,7 @@ static HRESULT (WINAPI *pIUnknown_ProfferService)(IUnknown*, REFGUID, IServicePr static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, LONG_PTR); static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONTF, IEnumIDList**); static DWORD (WINAPI *pSHGetIniStringW)(LPCWSTR, LPCWSTR, LPWSTR, DWORD, LPCWSTR); +static BOOL (WINAPI *pSHSetIniStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -2545,6 +2546,26 @@ static void write_inifile(LPCWSTR filename) CloseHandle(file); } +#define verify_inifile(f, e) r_verify_inifile(__LINE__, f, e) +static void r_verify_inifile(unsigned l, LPCWSTR filename, LPCSTR exp) +{ + HANDLE file; + CHAR buf[1024]; + DWORD read; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if(file == INVALID_HANDLE_VALUE) + return; + + ReadFile(file, buf, sizeof(buf) * sizeof(CHAR), &read, NULL); + buf[read] = '\0'; + + CloseHandle(file); + + ok_(__FILE__,l)(!strcmp(buf, exp), "Expected:\n%s\nGot:\n%s\n", exp, + buf); +} + static void test_SHGetIniString(void) { DWORD ret; @@ -2599,6 +2620,44 @@ static void test_SHGetIniString(void) DeleteFileW(TestIniW); } +static void test_SHSetIniString(void) +{ + BOOL ret; + + static const WCHAR TestAppW[] = {'T','e','s','t','A','p','p',0}; + static const WCHAR AnotherAppW[] = {'A','n','o','t','h','e','r','A','p','p',0}; + static const WCHAR TestIniW[] = {'C',':','\\','t','e','s','t','.','i','n','i',0}; + static const WCHAR AKeyW[] = {'A','K','e','y',0}; + static const WCHAR NewKeyW[] = {'N','e','w','K','e','y',0}; + static const WCHAR AValueW[] = {'A','V','a','l','u','e',0}; + + if(!pSHSetIniStringW || is_win2k_and_lower){ + win_skip("SHSetIniStringW is not available\n"); + return; + } + + write_inifile(TestIniW); + + ret = pSHSetIniStringW(TestAppW, AKeyW, AValueW, TestIniW); + ok(ret == TRUE, "SHSetIniStringW should not have failed\n"); + todo_wine /* wine sticks an extra \r\n at the end of the file */ + verify_inifile(TestIniW, "[TestApp]\r\nAKey=AValue\r\nAnotherKey=asdf\r\n"); + + ret = pSHSetIniStringW(TestAppW, AKeyW, NULL, TestIniW); + ok(ret == TRUE, "SHSetIniStringW should not have failed\n"); + verify_inifile(TestIniW, "[TestApp]\r\nAnotherKey=asdf\r\n"); + + ret = pSHSetIniStringW(AnotherAppW, NewKeyW, AValueW, TestIniW); + ok(ret == TRUE, "SHSetIniStringW should not have failed\n"); + verify_inifile(TestIniW, "[TestApp]\r\nAnotherKey=asdf\r\n[AnotherApp]\r\nNewKey=AValue\r\n"); + + ret = pSHSetIniStringW(TestAppW, NULL, AValueW, TestIniW); + ok(ret == TRUE, "SHSetIniStringW should not have failed\n"); + verify_inifile(TestIniW, "[AnotherApp]\r\nNewKey=AValue\r\n"); + + DeleteFileW(TestIniW); +} + static void init_pointers(void) { #define MAKEFUNC(f, ord) (p##f = (void*)GetProcAddress(hShlwapi, (LPSTR)(ord))) @@ -2616,6 +2675,7 @@ static void init_pointers(void) MAKEFUNC(IConnectionPoint_InvokeWithCancel, 283); MAKEFUNC(IConnectionPoint_SimpleInvoke, 284); MAKEFUNC(SHGetIniStringW, 294); + MAKEFUNC(SHSetIniStringW, 295); MAKEFUNC(SHFormatDateTimeA, 353); MAKEFUNC(SHFormatDateTimeW, 354); MAKEFUNC(SHIShellFolder_EnumObjects, 404); @@ -2653,4 +2713,5 @@ START_TEST(ordinal) test_SHCreateWorkerWindowA(); test_SHIShellFolder_EnumObjects(); test_SHGetIniString(); + test_SHSetIniString(); }

1 0

Andrew Eikum : shlwapi: Implement SHGetIniStringW.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: ef8cf0fdf2d6f892296f43616d1a5ef1ed2579b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef8cf0fdf2d6f892296f43616… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 21 11:23:55 2010 -0500 shlwapi: Implement SHGetIniStringW. --- dlls/shlwapi/ordinal.c | 43 ++++++++++++++++++++-- dlls/shlwapi/tests/ordinal.c | 83 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 7c00669..2c9db24 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3246,12 +3246,47 @@ BOOL WINAPI PlaySoundWrapW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound) /************************************************************************* * @ [SHLWAPI.294] + * + * Retrieve a key value from an INI file. See GetPrivateProfileString for + * more information. + * + * PARAMS + * appName [I] The section in the INI file that contains the key + * keyName [I] The key to be retrieved + * out [O] The buffer into which the key's value will be copied + * outLen [I] The length of the `out' buffer + * filename [I] The location of the INI file + * + * RETURNS + * Length of string copied into `out'. */ -BOOL WINAPI SHGetIniStringW(LPCWSTR str1, LPCWSTR str2, LPWSTR pStr, DWORD some_len, LPCWSTR lpStr2) +DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, + DWORD outLen, LPCWSTR filename) { - FIXME("(%s,%s,%p,%08x,%s): stub!\n", debugstr_w(str1), debugstr_w(str2), - pStr, some_len, debugstr_w(lpStr2)); - return TRUE; + INT ret; + WCHAR *buf; + + TRACE("(%s,%s,%p,%08x,%s)\n", debugstr_w(appName), debugstr_w(keyName), + out, outLen, debugstr_w(filename)); + + if(outLen == 0) + return 0; + + buf = HeapAlloc(GetProcessHeap(), 0, outLen * sizeof(WCHAR)); + if(!buf){ + *out = 0; + return 0; + } + + ret = GetPrivateProfileStringW(appName, keyName, NULL, buf, outLen, filename); + if(ret) + strcpyW(out, buf); + else + *out = 0; + + HeapFree(GetProcessHeap(), 0, buf); + + return strlenW(out); } /************************************************************************* diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 4b1690a..829819d 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -58,6 +58,7 @@ static HRESULT (WINAPI *pIUnknown_QueryServiceExec)(IUnknown*, REFIID, const GUI static HRESULT (WINAPI *pIUnknown_ProfferService)(IUnknown*, REFGUID, IServiceProvider*, DWORD*); static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, LONG_PTR); static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONTF, IEnumIDList**); +static DWORD (WINAPI *pSHGetIniStringW)(LPCWSTR, LPCWSTR, LPWSTR, DWORD, LPCWSTR); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -70,6 +71,13 @@ static const CHAR ie_international[] = { static const CHAR acceptlanguage[] = { 'A','c','c','e','p','t','L','a','n','g','u','a','g','e',0}; +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return lstrcmpA(stra, buf); +} + typedef struct { int id; const void *args[5]; @@ -2518,6 +2526,79 @@ static void test_SHIShellFolder_EnumObjects(void) IShellFolder_Release(folder); } +static void write_inifile(LPCWSTR filename) +{ + DWORD written; + HANDLE file; + + static const char data[] = + "[TestApp]\r\n" + "AKey=1\r\n" + "AnotherKey=asdf\r\n"; + + file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if(file == INVALID_HANDLE_VALUE) + return; + + WriteFile(file, data, sizeof(data), &written, NULL); + + CloseHandle(file); +} + +static void test_SHGetIniString(void) +{ + DWORD ret; + WCHAR out[64] = {0}; + + static const WCHAR TestAppW[] = {'T','e','s','t','A','p','p',0}; + static const WCHAR TestIniW[] = {'C',':','\\','t','e','s','t','.','i','n','i',0}; + static const WCHAR AKeyW[] = {'A','K','e','y',0}; + static const WCHAR AnotherKeyW[] = {'A','n','o','t','h','e','r','K','e','y',0}; + static const WCHAR JunkKeyW[] = {'J','u','n','k','K','e','y',0}; + + if(!pSHGetIniStringW || is_win2k_and_lower){ + win_skip("SHGetIniStringW is not available\n"); + return; + } + + write_inifile(TestIniW); + + if(0){ + /* these crash on Windows */ + ret = pSHGetIniStringW(NULL, NULL, NULL, 0, NULL); + ret = pSHGetIniStringW(NULL, AKeyW, out, sizeof(out), TestIniW); + ret = pSHGetIniStringW(TestAppW, AKeyW, NULL, sizeof(out), TestIniW); + } + + ret = pSHGetIniStringW(TestAppW, AKeyW, out, 0, TestIniW); + ok(ret == 0, "SHGetIniStringW should have given 0, instead: %d\n", ret); + + /* valid arguments */ + ret = pSHGetIniStringW(TestAppW, NULL, out, sizeof(out), TestIniW); + ok(broken(ret == 0) || /* win 98 */ + ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); + ok(!lstrcmpW(out, AKeyW), "Expected %s, got: %s\n", + wine_dbgstr_w(AKeyW), wine_dbgstr_w(out)); + + ret = pSHGetIniStringW(TestAppW, AKeyW, out, sizeof(out), TestIniW); + ok(broken(ret == 0) || /* win 98 */ + ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret); + ok(broken(*out == 0) || /*win 98 */ + !strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); + + ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, sizeof(out), TestIniW); + ok(broken(ret == 0) || /* win 98 */ + ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); + ok(broken(*out == 0) || /* win 98 */ + !strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); + + ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, sizeof(out), TestIniW); + ok(ret == 0, "SHGetIniStringW should have given 0, instead: %d\n", ret); + ok(*out == 0, "Expected L\"\", got: %s\n", wine_dbgstr_w(out)); + + DeleteFileW(TestIniW); +} + static void init_pointers(void) { #define MAKEFUNC(f, ord) (p##f = (void*)GetProcAddress(hShlwapi, (LPSTR)(ord))) @@ -2534,6 +2615,7 @@ static void init_pointers(void) MAKEFUNC(SHPackDispParams, 282); MAKEFUNC(IConnectionPoint_InvokeWithCancel, 283); MAKEFUNC(IConnectionPoint_SimpleInvoke, 284); + MAKEFUNC(SHGetIniStringW, 294); MAKEFUNC(SHFormatDateTimeA, 353); MAKEFUNC(SHFormatDateTimeW, 354); MAKEFUNC(SHIShellFolder_EnumObjects, 404); @@ -2570,4 +2652,5 @@ START_TEST(ordinal) test_IUnknown_ProfferService(); test_SHCreateWorkerWindowA(); test_SHIShellFolder_EnumObjects(); + test_SHGetIniString(); }

1 0

Igor Paliychuk : wineconsole: Add Ukrainian translation.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 0a3f093fe4ab2407fa68a224afd85bb33f9fb496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3f093fe4ab2407fa68a224a… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Wed Jul 21 14:55:12 2010 +0300 wineconsole: Add Ukrainian translation. --- programs/wineconsole/Makefile.in | 1 + programs/wineconsole/wineconsole_Uk.rc | 139 ++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index f925a10..74e99a1 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -36,6 +36,7 @@ RC_SRCS = \ wineconsole_Si.rc \ wineconsole_Sv.rc \ wineconsole_Tr.rc \ + wineconsole_Uk.rc \ wineconsole_Zh.rc @MAKE_PROG_RULES@ diff --git a/programs/wineconsole/wineconsole_Uk.rc b/programs/wineconsole/wineconsole_Uk.rc new file mode 100644 index 0000000..47d164e --- /dev/null +++ b/programs/wineconsole/wineconsole_Uk.rc @@ -0,0 +1,139 @@ +/* + * Copyright 2001 Eric Pouech + * Copyright 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wineconsole_res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN +IDS_EDIT, "Реда&гування" +IDS_DEFAULT, "За &замовчанням" +IDS_PROPERTIES, "&Властивості" +IDS_MARK, "Ві&дзначити" +IDS_COPY, "&Копіювати" +IDS_PASTE, "В&ставити" +IDS_SELECTALL, "Вид&ілити все" +IDS_SCROLL, "Прок&рутити" +IDS_SEARCH, "По&шук" +IDS_FNT_DISPLAY, "Кожен символ має %ld пікселів в ширину і %ld пікселів в висоту" +IDS_FNT_PREVIEW, "Це тест" +IDS_DLG_TIT_DEFAULT, "Налаштування - Станд. параметри" +IDS_DLG_TIT_CURRENT, "Налаштування - Поточні параметри" +IDS_DLG_TIT_ERROR, "Помилка конфігурації" +IDS_DLG_ERR_SBWINSIZE, "Розмір буфера екрану повинен бути не менший буфера вікна" + +IDS_CMD_INVALID_EVENT_ID "wineconsole: Невірний код події\n" +IDS_CMD_INVALID_BACKEND "wineconsole: Невірний backend\n" +IDS_CMD_INVALID_OPTION "wineconsole: Невідомий параметр командного рядка\n" +IDS_CMD_ABOUT "Запуск програми в консолі Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: Запуск програми %s не вдався.\n"\ + "Команда невірна.\n" + +IDS_USAGE_HEADER "\nВикористання:\n wineconsole [параметри] <команда>\n\nПараметри:\n" +IDS_USAGE_BACKEND " --backend={user|curses} Вибір user відкриє нове вікно, curses спробує\n"\ + " налаштувати поточний термінал як консоль Wine\n" +IDS_USAGE_COMMAND " <команда> Назва програми для запуску в консолі Wine\n" +IDS_USAGE_FOOTER "\nПриклад:\n wineconsole cmd\nЗапуск командного рядка Wine в консолі Wine\n\n" + +END + +IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Параметри " +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Розмір курсора", -1, 10, 11, 60, 44, BS_GROUPBOX + AUTORADIOBUTTON "&Малий", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Середній", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Великий", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP + + GROUPBOX "Керування", -1, 75, 11, 125, 44, BS_GROUPBOX + LTEXT "Сплив. меню", -1, 79, 23, 44, 10 + AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 140, 23, 60, 10, WS_TABSTOP + AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 140, 33, 60, 10, WS_TABSTOP + LTEXT "Швидке редагув.", -1, 79, 43, 58, 10 + AUTOCHECKBOX "вв&імкнути", IDC_OPT_QUICK_EDIT, 140, 43, 60, 10, WS_TABSTOP + + GROUPBOX "Історія команд", -1, 10, 57, 190, 35, BS_GROUPBOX + LTEXT "&Кількість нагаданих команд :", -1, 14, 67, 78, 18 + EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + AUTOCHECKBOX "Видаляти &повтори", IDC_OPT_HIST_NODOUBLE, 140, 67, 50, 18, WS_TABSTOP|BS_MULTILINE +} + +IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Шрифт " +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Шрифт", -1, 5, 5, 24, 8 + LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL + LTEXT "&Колір", -1, 100, 5, 50, 8 + CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 + CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 + LTEXT "&Розмір", -1, 158, 5, 40, 8 + LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL + CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 + LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 25 +} + +IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Конфігурація " +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Зона буфера", -1, 10, 11, 100, 42, BS_GROUPBOX + LTEXT "&Ширина :", -1, 14, 25, 54, 9 + EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + LTEXT "&Висота :", -1, 14, 39, 54, 9 + EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + + GROUPBOX "Розмір вікна", -1, 10, 55, 100, 42 + LTEXT "Ш&ирина :", -1, 14, 69, 54, 9 + EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + LTEXT "Висо&та :", -1, 14, 83, 54, 9 + EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + + GROUPBOX "Завершення програми", -1, 115, 11, 84, 42, BS_GROUPBOX + AUTOCHECKBOX "&Закрити консоль", IDC_CNF_CLOSE_EXIT, 119, 25, 72, 20, WS_TABSTOP + + GROUPBOX "Випуск", -1, 115, 55, 84, 42 + COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 72, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP +} + +IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 202, 60 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "Параметри консолі" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 10, 10, 182, 31, BS_GROUPBOX + AUTORADIOBUTTON "Зберегти ці налаштування для наступних сесій", IDC_SAV_SAVE, 14, 15, 172, 10, WS_TABSTOP + AUTORADIOBUTTON "Змінювати лише поточну сесію", IDC_SAV_SESSION, 14, 27, 140, 10, WS_TABSTOP + + PUSHBUTTON "OK", IDOK, 55, 45, 40, 12 + PUSHBUTTON "Скасувати", IDCANCEL, 105, 45, 40, 12 +}

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
90
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 July 2010