March 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : gdi32: Don' t require a valid point as input to OffsetViewport/WindowOrgEx.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 5e2549d687a6b24bf4b987dfd1f222decaddf063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e2549d687a6b24bf4b987dfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 17:00:47 2011 +0200 gdi32: Don't require a valid point as input to OffsetViewport/WindowOrgEx. --- dlls/gdi32/enhmfdrv/dc.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 0e5bb63..76039f4 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -358,13 +358,14 @@ BOOL CDECL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetViewportOrgEx ); EMRSETVIEWPORTORGEX emr; EMFDRV_PDEVICE* physDev = (EMFDRV_PDEVICE*)dev; + POINT prev; - GetViewportOrgEx(physDev->hdc, pt); + GetViewportOrgEx(physDev->hdc, &prev); emr.emr.iType = EMR_SETVIEWPORTORGEX; emr.emr.nSize = sizeof(emr); - emr.ptlOrigin.x = pt->x + x; - emr.ptlOrigin.y = pt->y + y; + emr.ptlOrigin.x = prev.x + x; + emr.ptlOrigin.y = prev.y + y; if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0; return next->funcs->pOffsetViewportOrgEx( next, x, y, pt ); @@ -375,13 +376,14 @@ BOOL CDECL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetWindowOrgEx ); EMRSETWINDOWORGEX emr; EMFDRV_PDEVICE* physDev = (EMFDRV_PDEVICE*)dev; + POINT prev; - GetWindowOrgEx(physDev->hdc, pt); + GetWindowOrgEx(physDev->hdc, &prev); emr.emr.iType = EMR_SETWINDOWORGEX; emr.emr.nSize = sizeof(emr); - emr.ptlOrigin.x = pt->x + x; - emr.ptlOrigin.y = pt->y + y; + emr.ptlOrigin.x = prev.x + x; + emr.ptlOrigin.y = prev.y + y; if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0; return next->funcs->pOffsetWindowOrgEx( next, x, y, pt );

1 0

André Hentschel : winemaker: Fix library argument.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 8c88d6c6d87682fcab72f69d6c2ddb89c8a1adaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c88d6c6d87682fcab72f69d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 25 21:16:55 2011 +0100 winemaker: Fix library argument. --- tools/winemaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index f49c81f..33fb3d2 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -2639,7 +2639,7 @@ while (@ARGV>0) { } elsif ($arg =~ /^-L/) { push @{$global_settings[$T_LIBRARY_PATH]},$arg; } elsif ($arg =~ /^-l/) { - push @{$global_settings[$T_LIBRARIES]},$'; + push @{$global_settings[$T_LIBRARIES]},$arg; # 'Source'-based method options } elsif ($arg eq "--dll") {

1 0

Vincent Pelletier : dinput: Ramp from lStart to lEnd, not lStart to lStart.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 296b67f556dd811ffa9e7a6b68fc3264eeff8724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=296b67f556dd811ffa9e7a6b6… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sun Mar 20 11:20:12 2011 +0100 dinput: Ramp from lStart to lEnd, not lStart to lStart. --- dlls/dinput/effect_linuxinput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index d0e77d6..fbc5994 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -673,7 +673,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( return DIERR_INVALIDPARAM; tsp = peff->lpvTypeSpecificParams; This->effect.u.ramp.start_level = (tsp->lStart / 10) * 32; - This->effect.u.ramp.end_level = (tsp->lStart / 10) * 32; + This->effect.u.ramp.end_level = (tsp->lEnd / 10) * 32; } else if (type == DIEFT_CONDITION) { LPCDICONDITION tsp = peff->lpvTypeSpecificParams; if (peff->cbTypeSpecificParams == sizeof(DICONDITION)) {

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DBase requirement for surface_set_container().
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 85f2348549880331b53c64d7d9c5549a82709303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f2348549880331b53c64d7d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 18 19:10:57 2011 +0100 wined3d: Get rid of the IWineD3DBase requirement for surface_set_container(). This made sense back when we needed the container's parent and didn't know the container's type, but neither of those is true anymore. --- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 7866025..af4947c 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -457,7 +457,7 @@ HRESULT cubetexture_init(IWineD3DBaseTextureImpl *texture, UINT edge_length, UIN return hr; } - surface_set_container((IWineD3DSurfaceImpl *)surface, WINED3D_CONTAINER_TEXTURE, (IWineD3DBase *)texture); + surface_set_container((IWineD3DSurfaceImpl *)surface, WINED3D_CONTAINER_TEXTURE, texture); surface_set_texture_target((IWineD3DSurfaceImpl *)surface, cube_targets[j]); texture->baseTexture.sub_resources[idx] = &((IWineD3DSurfaceImpl *)surface)->resource; TRACE("Created surface level %u @ %p.\n", i, surface); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 745bd77..051bedb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -92,7 +92,7 @@ static void surface_cleanup(IWineD3DSurfaceImpl *This) resource_cleanup(&This->resource); } -void surface_set_container(IWineD3DSurfaceImpl *surface, enum wined3d_container_type type, IWineD3DBase *container) +void surface_set_container(IWineD3DSurfaceImpl *surface, enum wined3d_container_type type, void *container) { TRACE("surface %p, container %p.\n", surface, container); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c3b73bf..db42ff8 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -596,7 +596,7 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface goto err; } - surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_SWAPCHAIN, (IWineD3DBase *)swapchain); + surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_SWAPCHAIN, swapchain); if (surface_type == SURFACE_OPENGL) { surface_modify_location(swapchain->front_buffer, SFLAG_INDRAWABLE, TRUE); @@ -711,7 +711,7 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface goto err; } - surface_set_container(swapchain->back_buffers[i], WINED3D_CONTAINER_SWAPCHAIN, (IWineD3DBase *)swapchain); + surface_set_container(swapchain->back_buffers[i], WINED3D_CONTAINER_SWAPCHAIN, swapchain); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 90523b6..4604695 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -521,7 +521,7 @@ HRESULT texture_init(IWineD3DBaseTextureImpl *texture, UINT width, UINT height, return hr; } - surface_set_container((IWineD3DSurfaceImpl *)surface, WINED3D_CONTAINER_TEXTURE, (IWineD3DBase *)texture); + surface_set_container((IWineD3DSurfaceImpl *)surface, WINED3D_CONTAINER_TEXTURE, texture); surface_set_texture_target((IWineD3DSurfaceImpl *)surface, texture->baseTexture.target); texture->baseTexture.sub_resources[i] = &((IWineD3DSurfaceImpl *)surface)->resource; TRACE("Created surface level %u @ %p.\n", i, surface); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 65a7c24..19bf0ed 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2044,9 +2044,9 @@ struct wined3d_subresource_container enum wined3d_container_type type; union { - struct IWineD3DBase *base; struct IWineD3DSwapChainImpl *swapchain; struct IWineD3DBaseTextureImpl *texture; + void *base; } u; }; @@ -2157,7 +2157,7 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, unsigned int width, unsigned int height) DECLSPEC_HIDDEN; void surface_set_container(IWineD3DSurfaceImpl *surface, - enum wined3d_container_type type, IWineD3DBase *container) DECLSPEC_HIDDEN; + enum wined3d_container_type type, void *container) DECLSPEC_HIDDEN; void surface_set_texture_name(IWineD3DSurfaceImpl *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(IWineD3DSurfaceImpl *surface, GLenum target) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(IWineD3DSurfaceImpl *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 711aa3949f9dd41176dfabfce812a2b97e83c973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=711aa3949f9dd41176dfabfce… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Feb 16 15:58:04 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 33 +++++++++------------------------ 1 files changed, 9 insertions(+), 24 deletions(-) diff --git a/po/lt.po b/po/lt.po index aa4ff6d..043a1e7 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,18 +1,20 @@ # Lithuanian translations for Wine # Aurimas Fišeras <aurimas(a)gmail.com>, 2011. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011. msgid "" 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-01-29 17:28+0300\n" -"Last-Translator: Aurimas Fišeras <aurimas(a)gmail.com>\n" +"PO-Revision-Date: 2011-03-18 12:34+0300\n" +"Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Virtaal 0.6.1\n" +"X-Generator: Virtaal 0.7.0-beta4\n" +"X-Project-Style: default\n" #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -2790,7 +2792,6 @@ msgid "Signal pending\n" msgstr "Laukiama signalo\n" #: winerror.mc:681 -#, fuzzy msgid "Max system-wide thread count reached\n" msgstr "Pasiekta sistemos gijų skaičiaus riba\n" @@ -4221,7 +4222,6 @@ msgid "Private dialog index\n" msgstr "Privataus dialogo lango indeksas\n" #: winerror.mc:2476 -#, fuzzy msgid "List box ID not found\n" msgstr "Nerastas sąrašo langelio identifikatorius\n" @@ -4286,7 +4286,6 @@ msgid "Hook procedure not installed\n" msgstr "Hook procedūra neįdiegta\n" #: winerror.mc:2556 -#, fuzzy msgid "Invalid list box message\n" msgstr "Neteisingas sąrašo langelio pranešimas\n" @@ -4295,7 +4294,6 @@ msgid "Invalid LB_SETCOUNT sent\n" msgstr "Išsiųstas neteisingas LB_SETCOUNT\n" #: winerror.mc:2566 -#, fuzzy msgid "No tab stops on this list box\n" msgstr "Sąrašo langelis be tabuliavimo pozicijų\n" @@ -4312,7 +4310,6 @@ msgid "Window has no system menu\n" msgstr "Langas neturi sisteminio meniu\n" #: winerror.mc:2586 -#, fuzzy msgid "Invalid message box style\n" msgstr "Neteisingas pranešimo lango stilius\n" @@ -4365,7 +4362,6 @@ msgid "No system resources\n" msgstr "Nėra sistemos išteklių\n" #: winerror.mc:2651 -#, fuzzy msgid "No non-paged system resources\n" msgstr "Nėra nesukeičiamų sistemos išteklių\n" @@ -4378,7 +4374,6 @@ msgid "No working set quota\n" msgstr "Nėra darbinio rinkinio kvotos\n" #: winerror.mc:2666 -#, fuzzy msgid "No page file quota\n" msgstr "Nėra sukeitimų failo kvotos\n" @@ -4455,7 +4450,6 @@ msgid "Unknown component\n" msgstr "Nežinomas komponentas\n" #: winerror.mc:2761 -#, fuzzy msgid "Unknown property\n" msgstr "Nežinoma savybė\n" @@ -4988,7 +4982,6 @@ msgid "Invalid printer command\n" msgstr "Neteisinga spausdintuvo komanda\n" #: winerror.mc:3431 -#, fuzzy msgid "Invalid data type\n" msgstr "Neteisingas duomenų tipas\n" @@ -5301,7 +5294,6 @@ msgid "insert disk %s" msgstr "įdėkite diską %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -6891,13 +6883,12 @@ msgid "An invalid parameter was passed to a system function." msgstr "Sisteminei funkcijai buvo perduotas neteisingas parametras." #: winmm.rc:42 -#, fuzzy msgid "" "The specified format is not supported or cannot be translated. Use the " "Capabilities function to determine the supported formats." msgstr "" "Nurodytas formatas yra nepalaikomas arba negali būti perskaičiuotas. " -"Naudokite gebėjimų (Capabilities) funkciją palaikomiems formatams nustatyti" +"Naudokite gebėjimų (Capabilities) funkciją palaikomiems formatams nustatyti." #: winmm.rc:43 winmm.rc:49 msgid "" @@ -7087,7 +7078,6 @@ msgid "Cannot use 'all' as the device name with the specified command." msgstr "Negalima naudoti „all“ kaip įrenginio vardo nurodytai komandai." #: winmm.rc:77 -#, fuzzy msgid "" "Errors occurred in more than one device. Specify each command and device " "separately to determine which devices caused the error." @@ -8012,7 +8002,6 @@ msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "REN <failas> yra trumpa RENAME versija. Pervadina failą.\n" #: cmd.rc:158 -#, fuzzy msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <failas> pervadina failą.\n" @@ -8105,9 +8094,8 @@ msgstr "" "Tikrinimo žymos bitas neturi jokios funkcijos Wine.\n" #: cmd.rc:204 -#, fuzzy msgid "VER displays the version of cmd you are running.\n" -msgstr "VER parodo dabar vykdomo CMD versiją.\n" +msgstr "VER parodo dabar vykdomo cmd versiją.\n" #: cmd.rc:206 msgid "VOL shows the volume label of a disk device.\n" @@ -8706,9 +8694,8 @@ msgid "Unicode (UTF-16 big-endian)" msgstr "Unikodas (UTF-16 mažėjantys baitai)" #: notepad.rc:95 -#, fuzzy msgid "Unicode (UTF-8)" -msgstr "Unikodas (UTF-16)" +msgstr "Unikodas (UTF-8)" #: notepad.rc:102 msgid "" @@ -10385,7 +10372,6 @@ msgid "CD-ROM" msgstr "CD-ROM" #: winecfg.rc:86 -#, fuzzy msgid "" "You cannot add any more drives.\n" "\n" @@ -10394,7 +10380,7 @@ msgstr "" "Nebegalite pridėti daugiau diskų.\n" "\n" "Kiekvienas diskas turi turėti raidę, nuo A iki Z, todėl negalite turėti " -"daugiau nei 26" +"daugiau nei 26." #: winecfg.rc:87 msgid "System drive" @@ -11296,7 +11282,6 @@ msgid "&System\tCtrl+1" msgstr "&Sistemos\tVald+1" #: wordpad.rc:88 -#, fuzzy msgid "&Pale yellow\tCtrl+2" msgstr "&Gelsvas\tVald+2"

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DBaseTexture typedefs.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: eb5bfad18d03c6cb5ef8d3f686af1684a503589f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5bfad18d03c6cb5ef8d3f68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 18 19:11:00 2011 +0100 wined3d: Get rid of the IWineD3DBaseTexture typedefs. --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 92 ++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 10 ++-- dlls/wined3d/shader.c | 4 +- dlls/wined3d/state.c | 8 ++-- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/surface.c | 8 ++-- dlls/wined3d/utils.c | 11 +++-- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 24 ++++------ 11 files changed, 80 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb5bfad18d03c6cb5ef8d…

1 0

Eric Pouech : wineconsole: Ensure that the EXIT message is always properly propagated to the first caller of GrabChanges .
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 51f06239ffff85b11b1eaa3fb660d517f95ee0c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f06239ffff85b11b1eaa3fb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 20 09:18:10 2011 +0100 wineconsole: Ensure that the EXIT message is always properly propagated to the first caller of GrabChanges. --- programs/wineconsole/curses.c | 5 ++--- programs/wineconsole/user.c | 7 ++++--- programs/wineconsole/winecon_private.h | 5 +++-- programs/wineconsole/wineconsole.c | 8 ++++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index fc0261f..00e5039 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -1009,17 +1009,16 @@ static void WCCURSES_DeleteBackend(struct inner_data* data) static int WCCURSES_MainLoop(struct inner_data* data) { DWORD id; - BOOL cont = TRUE; WCCURSES_Resize(data); if (pipe( PRIVATE(data)->sync_pipe ) == -1) return 0; PRIVATE(data)->input_thread = CreateThread( NULL, 0, input_thread, data, 0, &id ); - while (cont && WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0) + while (!data->dying && WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0) { EnterCriticalSection(&PRIVATE(data)->lock); - cont = WINECON_GrabChanges(data); + WINECON_GrabChanges(data); LeaveCriticalSection(&PRIVATE(data)->lock); } diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index bc70a6b..22f33b1 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1368,13 +1368,12 @@ static int WCUSER_MainLoop(struct inner_data* data) MSG msg; ShowWindow(data->hWnd, data->nCmdShow); - for (;;) + while (!data->dying || !data->curcfg.exit_on_die) { switch (MsgWaitForMultipleObjects(1, &data->hSynchro, FALSE, INFINITE, QS_ALLINPUT)) { case WAIT_OBJECT_0: - if (!WINECON_GrabChanges(data) && data->curcfg.exit_on_die) - PostQuitMessage(0); + WINECON_GrabChanges(data); break; case WAIT_OBJECT_0+1: /* need to use PeekMessageW loop instead of simple GetMessage: @@ -1393,6 +1392,8 @@ static int WCUSER_MainLoop(struct inner_data* data) break; } } + PostQuitMessage(0); + return 0; } /****************************************************************** diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 8f08ff4..ca5cb8c 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -61,6 +61,7 @@ struct inner_data { HWND hWnd; /* handle of 'user' window or NULL for 'curses' */ INT nCmdShow; /* argument of WinMain */ BOOL in_set_config; /* to handle re-entrant calls to WINECON_SetConfig */ + BOOL dying; /* to TRUE when we've been notified by server that child has died */ int (*fnMainLoop)(struct inner_data* data); void (*fnPosCursor)(const struct inner_data* data); @@ -82,8 +83,8 @@ extern void WINECON_ResizeWithContainer(struct inner_data* data, int width, int extern int WINECON_GetHistorySize(HANDLE hConIn); extern int WINECON_GetHistoryMode(HANDLE hConIn); extern BOOL WINECON_GetConsoleTitle(HANDLE hConIn, WCHAR* buffer, size_t len); -extern int WINECON_GrabChanges(struct inner_data* data); -extern VOID WINECON_SetConfig(struct inner_data* data, +extern void WINECON_GrabChanges(struct inner_data* data); +extern void WINECON_SetConfig(struct inner_data* data, const struct config_data* cfg); /* from registry.c */ extern void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg); diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index ca20763..2938857 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -199,7 +199,7 @@ static BOOL WINECON_SetEditionMode(HANDLE hConIn, int edition_mode) * * A change occurs, try to figure out which */ -int WINECON_GrabChanges(struct inner_data* data) +void WINECON_GrabChanges(struct inner_data* data) { struct console_renderer_event evts[256]; int i, num, ev_found; @@ -213,7 +213,7 @@ int WINECON_GrabChanges(struct inner_data* data) else num = 0; } SERVER_END_REQ; - if (!num) {WINE_WARN("hmm renderer signaled but no events available\n"); return 1;} + if (!num) {WINE_WARN("hmm renderer signaled but no events available\n"); return;} /* FIXME: should do some event compression here (cursor pos, update) */ /* step 1: keep only last cursor pos event */ @@ -344,15 +344,15 @@ int WINECON_GrabChanges(struct inner_data* data) } break; case CONSOLE_RENDERER_EXIT_EVENT: + data->dying = TRUE; WINE_TRACE(". Exit!!\n"); - return 0; + return; default: WINE_FIXME("Unknown event type (%d)\n", evts[i].event); } } WINE_TRACE(".\n"); - return 1; } /******************************************************************

1 0

Alexandre Julliard : c2man: Fix a typo.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 35d72134075a9f2e77d15f0e69c62cb85a227654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d72134075a9f2e77d15f0e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 21:13:47 2011 +0100 c2man: Fix a typo. --- tools/c2man.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 3540911..bc25683 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -1990,7 +1990,7 @@ sub output_sgml_dll_file($) if (@$_[$EXPORT_CALL] ne "forward" && @$_[$EXPORT_CALL] ne "extern" && @$_[$EXPORT_CALL] ne "stub" && @$_[$EXPORT_CALL] ne "equate" && @$_[$EXPORT_CALL] ne "variable" && @$_[$EXPORT_CALL] ne "fake" && - @$_[$EXPORT_FLAGS] & $FLAGS_DOCUMENTED) + @$_[$EXPORT_FLAGS] & $FLAG_DOCUMENTED) { # A documented function push (@source_files,@$_[$EXPORT_IMPNAME]);

1 0

Henri Verbeet : wined3d: Remove COM from the texture implementation.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: fd8e18bd2b532dad69ce0b9d13dddd34439fd2c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8e18bd2b532dad69ce0b9d1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 18 19:10:59 2011 +0100 wined3d: Remove COM from the texture implementation. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/texture.c | 8 +- dlls/d3d8/cubetexture.c | 42 +++--- dlls/d3d8/d3d8_private.h | 10 +- dlls/d3d8/device.c | 20 ++-- dlls/d3d8/texture.c | 36 +++--- dlls/d3d8/volumetexture.c | 44 ++++---- dlls/d3d9/cubetexture.c | 48 ++++---- dlls/d3d9/d3d9_private.h | 11 +- dlls/d3d9/device.c | 36 +++--- dlls/d3d9/texture.c | 42 +++--- dlls/d3d9/volumetexture.c | 40 +++--- dlls/ddraw/ddraw.c | 4 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 38 +++--- dlls/ddraw/surface.c | 14 +-- dlls/wined3d/context.c | 3 +- dlls/wined3d/device.c | 42 +++---- dlls/wined3d/state.c | 5 +- dlls/wined3d/stateblock.c | 6 +- dlls/wined3d/surface.c | 8 +- dlls/wined3d/texture.c | 238 +++++++++++++----------------------- dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d.spec | 19 +++ dlls/wined3d/wined3d_private.h | 31 ++--- include/wine/wined3d.idl | 69 +++++------ 26 files changed, 380 insertions(+), 442 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd8e18bd2b532dad69ce0…

1 0

Eric Pouech : dbghelp: When parsing .debug_line section in dwarf debug info , protect against out of bounds indexes.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 4220cd660866d5c072b960ea27ba314f104575b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4220cd660866d5c072b960ea2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 19 16:58:27 2011 +0100 dbghelp: When parsing .debug_line section in dwarf debug info, protect against out of bounds indexes. --- dlls/dbghelp/dwarf.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1d5aa17..5596c45 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2116,6 +2116,11 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, if (sections[section_line].address == IMAGE_NO_MAP) return FALSE; + if (offset + 4 > sections[section_line].size) + { + WARN("out of bounds offset\n"); + return FALSE; + } traverse.data = sections[section_line].address + offset; traverse.end_data = traverse.data + 4; traverse.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; @@ -2123,6 +2128,11 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, length = dwarf2_parse_u4(&traverse); traverse.end_data = sections[section_line].address + offset + length; + if (offset + 4 + length > sections[section_line].size) + { + WARN("out of bounds header\n"); + return FALSE; + } version = dwarf2_parse_u2(&traverse); header_len = dwarf2_parse_u4(&traverse); insn_size = dwarf2_parse_byte(&traverse);

1 0