May 2009 - Wine-commits - list.winehq.org

Francois Gouget : winhlp32: Use Win32 APIs instead of strdup().
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: e7f8aa7d2dc5ac88e1df646f46d82761ed65f16d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f8aa7d2dc5ac88e1df646f4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:28:45 2009 +0200 winhlp32: Use Win32 APIs instead of strdup(). --- programs/winhlp32/macro.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 0eeaa9b..9e6e5f8 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -47,6 +47,14 @@ static unsigned MACRO_NumLoaded /* = 0 */; /******* helper functions *******/ +static char* StrDup(const char* str) +{ + char* dst; + dst=HeapAlloc(GetProcessHeap(),0,strlen(str)+1); + strcpy(dst, str); + return dst; +} + static WINHELP_BUTTON** MACRO_LookupButton(WINHELP_WINDOW* win, LPCSTR name) { WINHELP_BUTTON** b; @@ -711,7 +719,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR else if ((dll = HeapAlloc(GetProcessHeap(), 0, sizeof(*dll)))) { dll->hLib = hLib; - dll->name = strdup(dll_name); /* FIXME */ + dll->name = StrDup(dll_name); /* FIXME: never freed */ dll->next = Globals.dlls; Globals.dlls = dll; dll->handler = (WINHELP_LDLLHandler)GetProcAddress(dll->hLib, "LDLLHandler"); @@ -731,10 +739,10 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR size = ++MACRO_NumLoaded * sizeof(struct MacroDesc); if (!MACRO_Loaded) MACRO_Loaded = HeapAlloc(GetProcessHeap(), 0, size); else MACRO_Loaded = HeapReAlloc(GetProcessHeap(), 0, MACRO_Loaded, size); - MACRO_Loaded[MACRO_NumLoaded - 1].name = strdup(proc); /* FIXME */ + MACRO_Loaded[MACRO_NumLoaded - 1].name = StrDup(proc); /* FIXME: never freed */ MACRO_Loaded[MACRO_NumLoaded - 1].alias = NULL; MACRO_Loaded[MACRO_NumLoaded - 1].isBool = 0; - MACRO_Loaded[MACRO_NumLoaded - 1].arguments = strdup(args); /* FIXME */ + MACRO_Loaded[MACRO_NumLoaded - 1].arguments = StrDup(args); /* FIXME: never freed */ MACRO_Loaded[MACRO_NumLoaded - 1].fn = fn; WINE_TRACE("Added %s(%s) at %p\n", proc, args, fn); }

1 0

Francois Gouget : msctf/tests: Reorder the code to avoid forward declarations.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: ad28174e26a79b8ded884dadf317ded25604837b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad28174e26a79b8ded884dadf… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:30:18 2009 +0200 msctf/tests: Reorder the code to avoid forward declarations. --- dlls/msctf/tests/inputprocessor.c | 1188 ++++++++++++++++++------------------ 1 files changed, 594 insertions(+), 594 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad28174e26a79b8ded884…

1 0

Anders Jonsson : notepad: Update Swedish translation.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: b0a57b47f903ac9159f7f66e5cd119208133df35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a57b47f903ac9159f7f66e5… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue May 12 19:12:41 2009 +0200 notepad: Update Swedish translation. --- programs/notepad/Sv.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Sv.rc b/programs/notepad/Sv.rc index fdd6660..7e4aa29 100644 --- a/programs/notepad/Sv.rc +++ b/programs/notepad/Sv.rc @@ -54,6 +54,7 @@ POPUP "&Redigera" { POPUP "&S�k" { MENUITEM "S�k...", CMD_SEARCH MENUITEM "&S�k n�sta\tF3", CMD_SEARCH_NEXT + MENUITEM "&Ers�tt...\tCtrl+H", CMD_REPLACE } POPUP "&Hj�lp" { MENUITEM "&Inneh�ll", CMD_HELP_CONTENTS

1 0

Anders Jonsson : regedit: Update Swedish translation.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: bfcda1f912f9dc1e4ba93de224dad24601283703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcda1f912f9dc1e4ba93de22… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue May 12 20:01:18 2009 +0200 regedit: Update Swedish translation. --- programs/regedit/Sv.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Sv.rc b/programs/regedit/Sv.rc index b47b050..dd384d9 100644 --- a/programs/regedit/Sv.rc +++ b/programs/regedit/Sv.rc @@ -281,6 +281,7 @@ BEGIN ID_EDIT_COPYKEYNAME "Kopierar namnet p� den valda nyckeln till utklipp" ID_EDIT_FIND "S�ker en textstr�ng i nyckel, v�rde eller data" ID_EDIT_FINDNEXT "S�ker n�sta tr�ff till texten specificerad i f�reg�ende s�kning" + ID_EDIT_EXPORT "Exporterar vald gren av registret till en textfil" END STRINGTABLE DISCARDABLE

1 0

Henri Verbeet : wined3d: Add missing GL locking to shader_backend_t. shader_free_private() implementations.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 59689262e74d7f69ecf8a1b641d7e503ce3f00d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59689262e74d7f69ecf8a1b64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 12 16:19:55 2009 +0200 wined3d: Add missing GL locking to shader_backend_t.shader_free_private() implementations. --- dlls/wined3d/arb_program_shader.c | 2 ++ dlls/wined3d/glsl_shader.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9b21f0e..beb37cf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1838,6 +1838,7 @@ static void shader_arb_free(IWineD3DDevice *iface) { struct shader_arb_priv *priv = This->shader_priv; int i; + ENTER_GL(); if(priv->depth_blt_vprogram_id) { GL_EXTCALL(glDeleteProgramsARB(1, &priv->depth_blt_vprogram_id)); } @@ -1846,6 +1847,7 @@ static void shader_arb_free(IWineD3DDevice *iface) { GL_EXTCALL(glDeleteProgramsARB(1, &priv->depth_blt_fprogram_id[i])); } } + LEAVE_GL(); HeapFree(GetProcessHeap(), 0, This->shader_priv); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b248a3b..8316a0e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4038,6 +4038,7 @@ static void shader_glsl_free(IWineD3DDevice *iface) { struct shader_glsl_priv *priv = This->shader_priv; int i; + ENTER_GL(); for (i = 0; i < tex_type_count; ++i) { if (priv->depth_blt_program[i]) @@ -4045,6 +4046,7 @@ static void shader_glsl_free(IWineD3DDevice *iface) { GL_EXTCALL(glDeleteObjectARB(priv->depth_blt_program[i])); } } + LEAVE_GL(); hash_table_destroy(priv->glsl_program_lookup, NULL, NULL); constant_heap_free(&priv->pconst_heap);

1 0

Henri Verbeet : wined3d: Add missing GL locking to state table calls.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 7f14ea01c6f62e19e68051cec415f3940d317e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f14ea01c6f62e19e68051cec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 12 16:19:56 2009 +0200 wined3d: Add missing GL locking to state table calls. --- dlls/wined3d/context.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8a4296d..803a7cc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1670,6 +1670,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU IWineD3DDeviceImpl_FindTexUnitMap(This); + ENTER_GL(); for(i=0; i < context->numDirtyEntries; i++) { dirtyState = context->dirtyArray[i]; idx = dirtyState >> 5; @@ -1677,6 +1678,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU context->isStateDirty[idx] &= ~(1 << shift); StateTable[dirtyState].apply(dirtyState, This->stateBlock, context); } + LEAVE_GL(); context->numDirtyEntries = 0; /* This makes the whole list clean */ context->last_was_blit = FALSE; break;

1 0

Henri Verbeet : wined3d: Add missing GL locking to shader_backend_t. shader_select() calls.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: b7ac22004fc2ced3914a31df7da91cb24e65186f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ac22004fc2ced3914a31df7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 12 16:19:56 2009 +0200 wined3d: Add missing GL locking to shader_backend_t.shader_select() calls. --- dlls/wined3d/context.c | 3 +++ dlls/wined3d/glsl_shader.c | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 803a7cc..0fe00fc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1120,7 +1120,10 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex /* TODO: Use a display list */ /* Disable shaders */ + ENTER_GL(); This->shader_backend->shader_select((IWineD3DDevice *)This, FALSE, FALSE); + LEAVE_GL(); + Context_MarkStateDirty(context, STATE_VSHADER, StateTable); Context_MarkStateDirty(context, STATE_PIXELSHADER, StateTable); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8316a0e..44e0eea 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3889,12 +3889,20 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { ps = (IWineD3DPixelShaderImpl *) This; if(ps->num_gl_shaders == 0) return; if (priv->glsl_program && (IWineD3DBaseShader *)priv->glsl_program->pshader == iface) + { + ENTER_GL(); shader_glsl_select(This->baseShader.device, FALSE, FALSE); + LEAVE_GL(); + } } else { vs = (IWineD3DVertexShaderImpl *) This; if(vs->num_gl_shaders == 0) return; if (priv->glsl_program && (IWineD3DBaseShader *)priv->glsl_program->vshader == iface) + { + ENTER_GL(); shader_glsl_select(This->baseShader.device, FALSE, FALSE); + LEAVE_GL(); + } } linked_programs = &This->baseShader.linked_programs;

1 0

Juan Lang : inetmib1: Fix memory leaks.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 52722e663855186cb9213ad70f34813ce2863b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52722e663855186cb9213ad70… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu May 7 11:06:50 2009 -0700 inetmib1: Fix memory leaks. --- dlls/inetmib1/main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 1093117..91f5fd5 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -143,7 +143,10 @@ static BOOL mib2IfNumberQuery(BYTE bPduType, SnmpVarBind *pVarBind, copyInt(&pVarBind->value, &numIfs); if (bPduType == SNMP_PDU_GETNEXT) + { + SnmpUtilOidFree(&pVarBind->name); SnmpUtilOidCpy(&pVarBind->name, &numberOid); + } *pErrorStatus = SNMP_ERRORSTATUS_NOERROR; } else @@ -440,6 +443,7 @@ static INT setOidWithItem(AsnObjectIdentifier *dst, AsnObjectIdentifier *base, AsnObjectIdentifier oid; INT ret; + SnmpUtilOidFree(dst); ret = SnmpUtilOidCpy(dst, base); if (ret) {

1 0

Damjan Jovanovic : oleaut32: fix a rounding bug in VarFormat.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 560e76ee38ec6d6b6c2056b32fb95965fc0390ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=560e76ee38ec6d6b6c2056b32… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 12 18:41:41 2009 +0200 oleaut32: fix a rounding bug in VarFormat. --- dlls/oleaut32/tests/varformat.c | 1 + dlls/oleaut32/varformat.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index b19efbd..c2d45ae 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -379,6 +379,7 @@ static void test_VarFormat(void) VARFMT(VT_R8,V_R8,-1.57,"0.00",S_OK,"-1.57"); VARFMT(VT_R8,V_R8,-1.57,"#.##",S_OK,"-1.57"); VARFMT(VT_R8,V_R8,-0.1,".#",S_OK,"-.1"); + VARFMT(VT_R8,V_R8,0.099,"#.#",S_OK,".1"); /* 'out' is not cleared */ diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 06bab0f..fd257f0 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1305,7 +1305,10 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, else { rgbDig[have_int + need_frac] = 0; - have_int++; + if (exponent < 0) + exponent++; + else + have_int++; } } else

1 0

Alexandre Julliard : include: Fix the C_ASSERT macro for the latest gcc.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 5d31eb93771f00f94b907cd19b251adcb907a49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d31eb93771f00f94b907cd19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 10:32:03 2009 +0200 include: Fix the C_ASSERT macro for the latest gcc. --- include/winnt.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index abcc502..93c7961 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -291,10 +291,8 @@ extern "C" { #if defined(_MSC_VER) # define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1] -#elif defined(__GNUC__) -# define C_ASSERT(e) extern char __C_ASSERT__[(e)?1:-1] __attribute__((unused)) #else -# define C_ASSERT(e) +# define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1]) #endif /* Eliminate Microsoft C/C++ compiler warning 4715 */

1 0