wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Bernhard Loos : server: If a debugger is attached to a process, child processes shouldn't get debugged.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: e7ec00d22cfcaedbccad499f503c50efc8125117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ec00d22cfcaedbccad499f5… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Sun Oct 9 23:26:03 2011 +0200 server: If a debugger is attached to a process, child processes shouldn't get debugged. --- server/debugger.c | 1 + server/process.c | 6 +++--- server/process.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index 35cb3e3..5c0e2c8 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -485,6 +485,7 @@ int debugger_detach( struct process *process, struct thread *debugger ) /* remove relationships between process and its debugger */ process->debugger = NULL; + process->debug_children = 0; if (!set_process_debug_flag( process, 0 )) clear_error(); /* ignore error */ /* from this function */ diff --git a/server/process.c b/server/process.c index c88c89b..de3b594 100644 --- a/server/process.c +++ b/server/process.c @@ -322,7 +322,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->priority = PROCESS_PRIOCLASS_NORMAL; process->suspend = 0; process->is_system = 0; - process->create_flags = 0; + process->debug_children = 0; process->console = NULL; process->startup_state = STARTUP_IN_PROGRESS; process->startup_info = NULL; @@ -937,7 +937,7 @@ DECL_HANDLER(new_process) if (!(thread = create_process( socket_fd, current, req->inherit_all ))) goto done; process = thread->process; - process->create_flags = req->create_flags; + process->debug_children = !(req->create_flags & DEBUG_ONLY_THIS_PROCESS); process->startup_info = (struct startup_info *)grab_object( info ); /* connect to the window station */ @@ -972,7 +972,7 @@ DECL_HANDLER(new_process) /* attach to the debugger if requested */ if (req->create_flags & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS)) set_process_debugger( process, current ); - else if (parent->debugger && !(parent->create_flags & DEBUG_ONLY_THIS_PROCESS)) + else if (parent->debugger && parent->debug_children) set_process_debugger( process, parent->debugger ); if (!(req->create_flags & CREATE_NEW_PROCESS_GROUP)) diff --git a/server/process.h b/server/process.h index da51a0e..93ec6c7 100644 --- a/server/process.h +++ b/server/process.h @@ -66,8 +66,8 @@ struct process affinity_t affinity; /* process affinity mask */ int priority; /* priority class */ int suspend; /* global process suspend count */ - int is_system; /* is it a system process? */ - unsigned int create_flags; /* process creation flags */ + unsigned int is_system:1; /* is it a system process? */ + unsigned int debug_children:1;/* also debug all child processes */ struct list locks; /* list of file locks owned by the process */ struct list classes; /* window classes owned by the process */ struct console_input*console; /* console input */

1 0

Charles Davis : wldap32: Silence a compiler warning.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: ad72c422ff186cbfd952569ccf077238a277f4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad72c422ff186cbfd952569cc… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sun Oct 9 13:07:52 2011 -0600 wldap32: Silence a compiler warning. --- dlls/wldap32/parse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index 1d65e40..62ffdba 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -442,7 +442,7 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, #ifdef HAVE_LDAP_PARSE_VLV_CONTROL if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count, - context, errcode ))) + (struct berval **)context, errcode ))) { *targetpos = pos; *listcount = count;

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_primitive_type() const.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 39a8ed3a00d15face31d02e4548b58a1ab0826d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a8ed3a00d15face31d02e45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 9 19:01:22 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_primitive_type() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f291a7a..6f754f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4109,7 +4109,7 @@ void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, device->updateStateBlock->state.gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); } -void CDECL wined3d_device_get_primitive_type(struct wined3d_device *device, +void CDECL wined3d_device_get_primitive_type(const struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_type) { TRACE("device %p, primitive_type %p\n", device, primitive_type); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8a38668..eb270e7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2230,7 +2230,8 @@ float __cdecl wined3d_device_get_npatch_mode(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_palette_entries(struct wined3d_device *device, UINT palette_idx, PALETTEENTRY *entries); struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); -void __cdecl wined3d_device_get_primitive_type(struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_topology); +void __cdecl wined3d_device_get_primitive_type(const struct wined3d_device *device, + WINED3DPRIMITIVETYPE *primitive_topology); HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device,

1 0

Henri Verbeet : winex11: Print the GL renderer and version when complaining about software / indirect rendering.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: dbe058249f7bcfce26cf6bfcaeb849064c9b9ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe058249f7bcfce26cf6bfca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 9 19:01:20 2011 +0200 winex11: Print the GL renderer and version when complaining about software / indirect rendering. --- dlls/winex11.drv/opengl.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a4ed5eb..78a717d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -299,6 +299,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) { int screen = DefaultScreen(gdi_display); Window win = 0, root = 0; + const char *gl_renderer; const char* str; XVisualInfo *vis; GLXContext ctx = NULL; @@ -349,6 +350,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) ERR_(winediag)( "Unable to activate OpenGL context, most likely your OpenGL drivers haven't been installed correctly\n" ); goto done; } + gl_renderer = (const char *)pglGetString(GL_RENDERER); WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); str = (const char *) pglGetString(GL_EXTENSIONS); WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); @@ -369,7 +371,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) WineGLInfo.glxDirect = pglXIsDirect(gdi_display, ctx); TRACE("GL version : %s.\n", WineGLInfo.glVersion); - TRACE("GL renderer : %s.\n", pglGetString(GL_RENDERER)); + TRACE("GL renderer : %s.\n", gl_renderer); TRACE("GLX version : %d.%d.\n", WineGLInfo.glxVersion[0], WineGLInfo.glxVersion[1]); TRACE("Server GLX version : %s.\n", WineGLInfo.glxServerVersion); TRACE("Server GLX vendor: : %s.\n", WineGLInfo.glxServerVendor); @@ -387,7 +389,9 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) * Detect a local X11 server by checking whether the X11 socket is a Unix socket. */ if(!getsockname(fd, (struct sockaddr *)&uaddr, &uaddrlen) && uaddr.sun_family == AF_UNIX) - ERR_(winediag)("Direct rendering is disabled, most likely your OpenGL drivers haven't been installed correctly\n"); + ERR_(winediag)("Direct rendering is disabled, most likely your OpenGL drivers " + "haven't been installed correctly (using GL renderer %s, version %s).\n", + debugstr_a(gl_renderer), debugstr_a(WineGLInfo.glVersion)); } else { @@ -400,9 +404,10 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) * to load a DRI module 'Software Rasterizer' is returned. When Mesa is compiled as a OpenGL reference driver * it shows 'Mesa X11'. */ - const char *gl_renderer = (const char *)pglGetString(GL_RENDERER); if(!strcmp(gl_renderer, "Software Rasterizer") || !strcmp(gl_renderer, "Mesa X11")) - ERR_(winediag)("The Mesa OpenGL driver is using software rendering, most likely your OpenGL drivers haven't been installed correctly\n"); + ERR_(winediag)("The Mesa OpenGL driver is using software rendering, most likely your OpenGL " + "drivers haven't been installed correctly (using GL renderer %s, version %s).\n", + debugstr_a(gl_renderer), debugstr_a(WineGLInfo.glVersion)); } ret = TRUE;

1 0

Henri Verbeet : d3d9/tests: Add a test for IDirect3DDevice9:: GetRenderTarget().
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 1226ffe062fc67344b3a7c0009954c88e4ce4c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1226ffe062fc67344b3a7c000… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 9 19:01:19 2011 +0200 d3d9/tests: Add a test for IDirect3DDevice9::GetRenderTarget(). --- dlls/d3d9/tests/device.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bf15792..affbe08 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1758,6 +1758,56 @@ cleanup: if(hwnd) DestroyWindow(hwnd); } +static void test_get_rt(void) +{ + IDirect3DSurface9 *backbuffer, *rt; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + ULONG ref; + UINT i; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 128, 128, 0, 0, 0, 0); + device = create_device(d3d9, window, window, TRUE); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + ok(!!backbuffer, "Got a NULL backbuffer.\n"); + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + for (i = 1; i < caps.NumSimultaneousRTs; ++i) + { + rt = backbuffer; + hr = IDirect3DDevice9_GetRenderTarget(device, i, &rt); + ok(hr == D3DERR_NOTFOUND, "IDirect3DDevice9_GetRenderTarget returned %#x.\n", hr); + ok(!rt, "Got rt %p.\n", rt); + } + + IDirect3DSurface9_Release(backbuffer); + + ref = IDirect3DDevice9_Release(device); + ok(!ref, "The device was not properly freed: refcount %u.\n", ref); +done: + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + /* Test what happens when IDirect3DDevice9_DrawIndexedPrimitive is called without a valid index buffer set. */ static void test_draw_indexed(void) { @@ -3119,6 +3169,7 @@ START_TEST(device) test_scene(); test_limits(); test_depthstenciltest(); + test_get_rt(); test_draw_indexed(); test_null_stream(); test_lights();

1 0

Henri Verbeet : wined3d: Return WINED3DERR_NOTFOUND if the render target is NULL in wined3d_device_get_render_target ().
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 739a9d980503dfcbfa8856d7458539283c776a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=739a9d980503dfcbfa8856d74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 9 19:01:18 2011 +0200 wined3d: Return WINED3DERR_NOTFOUND if the render target is NULL in wined3d_device_get_render_target(). This is similar to how wined3d_device_get_depth_stencil() works. --- dlls/d3d9/device.c | 19 +++++++------------ dlls/wined3d/device.c | 8 +++++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2c67391..33c443a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1142,24 +1142,19 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(IDirect3DDevice9Ex *i } wined3d_mutex_lock(); - hr = wined3d_device_get_render_target(This->wined3d_device, RenderTargetIndex, &wined3d_surface); - - if (FAILED(hr)) - { - FIXME("Call to IWineD3DDevice_GetRenderTarget failed, hr %#x\n", hr); - } - else if (!wined3d_surface) - { - *ppRenderTarget = NULL; - } - else + if (SUCCEEDED(hr)) { *ppRenderTarget = wined3d_surface_get_parent(wined3d_surface); IDirect3DSurface9_AddRef(*ppRenderTarget); wined3d_surface_decref(wined3d_surface); } - + else + { + if (hr != WINED3DERR_NOTFOUND) + WARN("Failed to get render target %u, hr %#x.\n", RenderTargetIndex, hr); + *ppRenderTarget = NULL; + } wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8e4d827..f291a7a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5119,11 +5119,13 @@ HRESULT CDECL wined3d_device_get_render_target(struct wined3d_device *device, } *render_target = device->fb.render_targets[render_target_idx]; - if (*render_target) - wined3d_surface_incref(*render_target); - TRACE("Returning render target %p.\n", *render_target); + if (!*render_target) + return WINED3DERR_NOTFOUND; + + wined3d_surface_incref(*render_target); + return WINED3D_OK; }

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 918f0a297b2dd2bd471cb16088f4c8585c31c5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918f0a297b2dd2bd471cb1608… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Oct 7 13:51:37 2011 +0200 po: Update Italian translation. --- po/it.po | 1411 ++++++++++++++++++++++++-------------------------------------- 1 files changed, 535 insertions(+), 876 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=918f0a297b2dd2bd471cb…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 37bdf8c8e7d2f3038f675f9c6ff9c0a710e960e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37bdf8c8e7d2f3038f675f9c6… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Sep 8 19:21:55 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 37 ++++++++++++++++--------------------- 1 files changed, 16 insertions(+), 21 deletions(-) diff --git a/po/lt.po b/po/lt.po index a894935..86d843e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,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: 2011-09-14 18:03+0300\n" +"PO-Revision-Date: 2011-10-09 11:54+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -7975,17 +7975,16 @@ msgstr "" "PATH %PATH%;c:\\laikinas\n" #: cmd.rc:128 -#, fuzzy msgid "" "PAUSE displays a message on the screen asking the user to press a key.\n" "\n" "It is mainly useful in batch files to allow the user to read the output\n" "of a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE ekrane parodo pranešimą „Norėdami tęsti spauskite įvedimo klavišą“\n" -"ir laukia kol naudotojas paspaus įvedimo klavišą. Ši komanda naudingiausia\n" -"komandų failuose, kad leistų naudotojui perskaityti ankstesnės komandos\n" -"rezultatą kol jis nepasislinko už ekrano ribų.\n" +"PAUSE ekrane parodo pranešimą, kuriuo prašo naudotojo paspausti klavišą.\n" +"\n" +"Ši komanda naudingiausia komandų failuose, kad leistų naudotojui perskaityti " +"ankstesnės komandos rezultatą kol jis nepasislinko už ekrano ribų.\n" #: cmd.rc:149 msgid "" @@ -8247,7 +8246,6 @@ msgstr "" "ar apvalkalą iš kur CMD buvo iškviestas.\n" #: cmd.rc:289 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8291,21 +8289,21 @@ msgstr "" "ASSOC\t\tRodyti ar modifikuoti failų prievardžių sąsajas\n" "ATTRIB\t\tRodyti ar keisti DOS failo požymius\n" "CALL\t\tKviesti komandų failą iš kito komandų failo\n" -"CD (CHDIR)\tPakeisti dabartinį numatytą katalogą\n" +"CD (CHDIR)\tPakeisti dabartinį numatytąjį katalogą\n" "CHOICE\t\tLaukti klavišo paspaudimo iš pasirinkimų sąrašo\n" "CLS\t\tIšvalyti pulto ekraną\n" "COPY\t\tKopijuoti failą\n" "CTTY\t\tPakeisti įvedimo/išvedimo įrenginį\n" "DATE\t\tRodyti ar keisti sistemos datą\n" -"DEL (ERASE)\tŠalinti failą ar failų aibę\n" +"DEL (ERASE)\tŠalinti failą ar failų rinkinį\n" "DIR\t\tPateikti katalogo turinį\n" "ECHO\t\tKopijuoti tekstą tiesiai į pulto išvedimą\n" -"ENDLOCAL\tBaigia aplinkos pakeitimų lokalizavimą komandų faile\n" +"ENDLOCAL\tBaigti aplinkos pakeitimų lokalizavimą komandų faile\n" "FTYPE\t\tRodyti ar modifikuoti atvėrimo komandas susietas su failų tipais\n" "HELP\t\tParodyti trumpą pagalbą apie temą\n" "MD (MKDIR)\tSukurti pakatalogį\n" "MORE\t\tRodyti išvedimą puslapiais\n" -"MOVE\t\tPerkelti failą, failų aibę ar katalogų medį\n" +"MOVE\t\tPerkelti failą, failų rinkinį ar katalogų medį\n" "PATH\t\tNustatyti ar parodyti paieškos kelią\n" "POPD\t\tAtstato katalogą į paskutinį išsaugotą su PUSHD\n" "PROMPT\t\tKeičia komandos raginimą\n" @@ -8313,14 +8311,14 @@ msgstr "" "REN (RENAME)\tPervadinti failą\n" "RD (RMDIR)\tŠalinti pakatalogį\n" "SET\t\tNustatyti ar parodyti aplinkos kintamuosius\n" -"SETLOCAL\tPradeda aplinkos pakeitimų lokalizavimą komandų faile\n" +"SETLOCAL\tPradėti aplinkos pakeitimų lokalizavimą komandų faile\n" "TIME\t\tNustatyti ar parodyti dabartinį sistemos laiką\n" "TITLE\t\tNustatyti CMD seanso lango antraštę\n" "TYPE\t\tIšvesti tekstinio failo turinį\n" "VER\t\tParodyti dabartinę CMD versiją\n" -"VOL\t\tParodyti tomo vardą\n" -"XCOPY\t\tKopijuoja šaltinio failus ar katalogų medį į paskirtį\n" -"EXIT\t\tUžveria CMD\n" +"VOL\t\tParodyti diskų įtaiso tomo vardą\n" +"XCOPY\t\tKopijuoti šaltinio failus ar katalogų medžius į paskirtį\n" +"EXIT\t\tUžverti CMD\n" "\n" "Įveskite HELP <komanda> platesnei informacijai apie išvardintas komandas " "gauti.\n" @@ -8447,9 +8445,8 @@ msgid "PATH not found\n" msgstr "KELIAS nerastas\n" #: cmd.rc:321 -#, fuzzy msgid "Press any key to continue... " -msgstr "Norėdami tęsti spauskite įvedimo klavišą: " +msgstr "Norėdami tęsti spauskite bet kurį klavišą... " #: cmd.rc:322 msgid "Wine Command Prompt" @@ -10416,14 +10413,12 @@ msgid "(None)" msgstr "(jokia)" #: winecfg.rc:89 -#, fuzzy msgid "Audio test failed!" -msgstr "Nepavyko paleisti standžiojo disko iš naujo\n" +msgstr "Garso testas nepavyko!" #: winecfg.rc:91 -#, fuzzy msgid "(System default)" -msgstr "Sistemos kelias" +msgstr "(Sistemos numatytasis)" #: winecfg.rc:51 msgid ""

1 0

Aurimas Fišeras : winecfg: Update Lithuanian translation.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 7f1b339a883ad9f25eb79e4532143cf18d94c978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1b339a883ad9f25eb79e453… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Oct 9 12:03:22 2011 +0300 winecfg: Update Lithuanian translation. --- programs/winecfg/Lt.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index d9ffd81..6ecc37b 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -167,11 +167,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Tvarkyklės diagnostika ",IDC_STATIC,8,4,244,27 LTEXT "",IDC_AUDIO_DRIVER,18,16,230,8 - GROUPBOX " Defaults ",IDC_STATIC,8,33,244,76 - LTEXT "Output device:",IDC_STATIC,18,45,230,8 - LTEXT "Voice output device:",IDC_STATIC,18,61,230,8 - LTEXT "Input device:",IDC_STATIC,18,77,230,8 - LTEXT "Voice input device:",IDC_STATIC,18,93,230,8 + GROUPBOX " Numatytosios reikšmės ",IDC_STATIC,8,33,244,76 + LTEXT "Išvedimo įtaisas:",IDC_STATIC,18,45,230,8 + LTEXT "Balso išvedimo įtaisas:",IDC_STATIC,18,61,230,8 + LTEXT "Įvedimo įtaisas:",IDC_STATIC,18,77,230,8 + LTEXT "Balso įvedimo įtaisas:",IDC_STATIC,18,93,230,8 COMBOBOX IDC_AUDIOOUT_DEVICE,110,43,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_VOICEOUT_DEVICE,110,59,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_AUDIOIN_DEVICE,110,75,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

1 0

Francois Gouget : ntdll: ETIME is not defined on FreeBSD.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 5feb7b9b33513289b0f0e64e345f2385085b15d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5feb7b9b33513289b0f0e64e3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 9 15:29:28 2011 +0200 ntdll: ETIME is not defined on FreeBSD. --- dlls/ntdll/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 85fc858..744e09f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -347,7 +347,9 @@ NTSTATUS FILE_GetNtStatus(void) case ECONNRESET:return STATUS_PIPE_DISCONNECTED; case EFAULT: return STATUS_ACCESS_VIOLATION; case ESPIPE: return STATUS_ILLEGAL_FUNCTION; +#ifdef ETIME /* Missing on FreeBSD */ case ETIME: return STATUS_IO_TIMEOUT; +#endif case ENOEXEC: /* ?? */ case EEXIST: /* ?? */ default:

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011