December 2011 - Wine-Commits

Frédéric Delanoy : taskmgr: Avoid dead assignment (Clang).
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 5ed423f53b4bd789064826393436b4ea78b9d047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed423f53b4bd789064826393… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 7 12:11:47 2011 +0100 taskmgr: Avoid dead assignment (Clang). --- programs/taskmgr/perfpage.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 13f7e92..5b1fd41 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -98,7 +98,6 @@ static void AdjustFrameSize(HWND hCntrl, HWND hDlg, int nXDifference, int nYDiff } else { cx = rc.left + nXDifference; cy = rc.top + nYDifference; - sx = sy = 0; SetWindowPos(hCntrl, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); } InvalidateRect(hCntrl, NULL, TRUE);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: a5427147f1309078eccd3576ed682630638a297c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5427147f1309078eccd3576e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 7 12:37:19 2011 +0100 po: Update French translation. --- po/fr.po | 67 ++++++++++++++++++++++++++++--------------------------------- 1 files changed, 31 insertions(+), 36 deletions(-) diff --git a/po/fr.po b/po/fr.po index c1c99aa..701d80d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -785,14 +785,12 @@ msgid "&Open" msgstr "&Ouvrir" #: comdlg32.rc:495 -#, fuzzy msgid "File name:" -msgstr "&Nom du fichier :" +msgstr "Nom du fichier :" #: comdlg32.rc:498 -#, fuzzy msgid "Files of type:" -msgstr "Fichiers du &type :" +msgstr "Fichiers du type :" #: comdlg32.rc:29 msgid "&About FolderPicker Test" @@ -2219,7 +2217,6 @@ msgid "Welcome to the Certificate Import Wizard" msgstr "Bienvenue dans l'assistant d'importation de certificats" #: cryptui.rc:283 -#, fuzzy msgid "" "This wizard helps you import certificates, certificate revocation lists, and " "certificate trust lists from a file to a certificate store.\n" @@ -2231,11 +2228,17 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"Cet assistant vous aide à importer des certificats, des listes de révocation " +"de certificats et des listes de certificats de confiance dans un magasin de " +"certificats à partir d'un fichier.\n" +"\n" "Un certificat peut être utilisé pour vous identifier, ou pour identifier " "l'ordinateur avec lequel vous communiquez. Il peut également être utilisé à " "des fins d'authentification ou de signature de messages. Les magasins de " "certificats sont des collections de certificats, de listes de révocation de " -"certificats et de listes de certificats de confiance." +"certificats et de listes de certificats de confiance.\n" +"\n" +"Pour continuer, cliquez sur Suivant." #: cryptui.rc:291 cryptui.rc:427 msgid "&File name:" @@ -2250,9 +2253,9 @@ msgid "" "Note: The following file formats may contain more than one certificate, " "certificate revocation list, or certificate trust list:" msgstr "" -"Remarque : les formats de fichiers suivants peuvent contenir plus d'un " +"Remarque : les formats de fichiers suivants peuvent contenir plus d'un " "certificat, liste de révocation de certificats ou liste de certificats de " -"confiance :" +"confiance :" #: cryptui.rc:296 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" @@ -2355,7 +2358,6 @@ msgid "Welcome to the Certificate Export Wizard" msgstr "Bienvenue dans l'assistant d'exportation de certificats" #: cryptui.rc:373 -#, fuzzy msgid "" "This wizard helps you export certificates, certificate revocation lists, and " "certificate trust lists from a certificate store to a file.\n" @@ -2367,11 +2369,17 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"Cet assistant vous aide à exporter des certificats, des listes de révocation " +"de certificats et des listes de certificats de confiance dans un fichier à " +"partir d'un magasin de certificats.\n" +"\n" "Un certificat peut être utilisé pour vous identifier, ou pour identifier " "l'ordinateur avec lequel vous communiquez. Il peut également être utilisé à " "des fins d'authentification ou de signature de messages. Les magasins de " "certificats sont des collections de certificats, de listes de révocation de " -"certificats et de listes de certificats de confiance." +"certificats et de listes de certificats de confiance.\n" +"\n" +"Pour continuer, cliquez sur Suivant." #: cryptui.rc:381 msgid "" @@ -9989,20 +9997,16 @@ msgid "N" msgstr "N" #: cmd.rc:294 -#, fuzzy msgid "File association missing for extension %1\n" -msgstr "Association de fichier manquante pour l'extension %s\n" +msgstr "Association de fichier manquante pour l'extension %1\n" #: cmd.rc:295 -#, fuzzy msgid "No open command associated with file type '%1'\n" -msgstr "" -"Aucune commande d'ouverture n'est associée avec le type de fichier « %s »\n" +msgstr "Aucune commande d'ouverture n'est associée au type de fichier « %1 »\n" #: cmd.rc:296 -#, fuzzy msgid "Overwrite %1" -msgstr "Écraser %s" +msgstr "Écraser %1" #: cmd.rc:297 msgid "More..." @@ -10021,23 +10025,20 @@ msgid "Syntax error\n" msgstr "Erreur de syntaxe\n" #: cmd.rc:303 -#, fuzzy msgid "No help available for %1\n" -msgstr "Pas d'aide disponible pour %s\n" +msgstr "Aucune aide disponible pour %1\n" #: cmd.rc:304 msgid "Target to GOTO not found\n" msgstr "La destination de l'instruction GOTO n'a pas été trouvée\n" #: cmd.rc:305 -#, fuzzy msgid "Current Date is %1\n" -msgstr "La date courante est %s\n" +msgstr "La date courante est %1\n" #: cmd.rc:306 -#, fuzzy msgid "Current Time is %1\n" -msgstr "L'heure courante est %s\n" +msgstr "L'heure courante est %1\n" #: cmd.rc:307 msgid "Enter new date: " @@ -10048,9 +10049,8 @@ msgid "Enter new time: " msgstr "Saisissez la nouvelle heure : " #: cmd.rc:309 -#, fuzzy msgid "Environment variable %1 not defined\n" -msgstr "La variable d'environnement %s n'est pas définie\n" +msgstr "La variable d'environnement %1 n'est pas définie\n" #: cmd.rc:310 xcopy.rc:38 msgid "Failed to open '%1'\n" @@ -10066,19 +10066,16 @@ msgid "A" msgstr "T" #: cmd.rc:313 -#, fuzzy msgid "%1, Delete" -msgstr "%s, Supprimer" +msgstr "%1, Supprimer" #: cmd.rc:314 -#, fuzzy msgid "Echo is %1\n" -msgstr "Echo est %s\n" +msgstr "Echo est %1\n" #: cmd.rc:315 -#, fuzzy msgid "Verify is %1\n" -msgstr "Verify est %s\n" +msgstr "Verify est %1\n" #: cmd.rc:316 msgid "Verify must be ON or OFF\n" @@ -10089,14 +10086,13 @@ msgid "Parameter error\n" msgstr "Erreur de paramètre\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume in drive %1!c! is %2\n" "Volume Serial Number is %3!04x!-%4!04x!\n" "\n" msgstr "" -"Le volume dans le lecteur %c est %s\n" -"Le numéro de série du volume est %04x-%04x\n" +"Le volume dans le lecteur %1!c! est %2\n" +"Le numéro de série du volume est %3!04x!-%4!04x!\n" "\n" #: cmd.rc:319 @@ -10116,9 +10112,8 @@ msgid "Wine Command Prompt" msgstr "Invite de commande Wine" #: cmd.rc:323 -#, fuzzy msgid "CMD Version %1!S!\n" -msgstr "CMD version %s\n" +msgstr "CMD version %1!S!\n" #: cmd.rc:324 msgid "More? "

1 0

Jacek Caban : scrrun: Moved script extensions registration to scrrun.dll.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 0325ec71e9554fa43ed744fafd9ae29e5572417f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0325ec71e9554fa43ed744faf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 12:19:08 2011 +0100 scrrun: Moved script extensions registration to scrrun.dll. --- dlls/jscript/jscript.rgs | 1 - dlls/scrrun/scrrun.c | 14 ++++++++++---- dlls/scrrun/scrrun.rc | 3 +++ dlls/scrrun/scrrun.rgs | 5 +++++ dlls/vbscript/vbscript.rgs | 1 - 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/jscript.rgs b/dlls/jscript/jscript.rgs index fe6517a..b4da2b5 100644 --- a/dlls/jscript/jscript.rgs +++ b/dlls/jscript/jscript.rgs @@ -116,7 +116,6 @@ HKCR OLEScript } - ForceRemove '.js' = s 'JSFile' ForceRemove JSFile = s 'JScript Script File' { ScriptEngine = s 'JScript' diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index e825697..3284584 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -21,10 +21,15 @@ #include "windef.h" #include "winbase.h" +#include "ole2.h" +#include "rpcproxy.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(scrrun); +static HINSTANCE scrrun_instance; + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { TRACE("%p, %u, %p\n", hinst, reason, reserved); @@ -35,6 +40,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); + scrrun_instance = hinst; break; case DLL_PROCESS_DETACH: break; @@ -47,8 +53,8 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("\n"); - return S_OK; + TRACE("()\n"); + return __wine_register_resources(scrrun_instance); } /*********************************************************************** @@ -56,6 +62,6 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("\n"); - return S_OK; + TRACE("()\n"); + return __wine_unregister_resources(scrrun_instance); } diff --git a/dlls/scrrun/scrrun.rc b/dlls/scrrun/scrrun.rc index abc70a6..078afd6 100644 --- a/dlls/scrrun/scrrun.rc +++ b/dlls/scrrun/scrrun.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: scrrun.rgs */ +1 WINE_REGISTRY scrrun.rgs + #define WINE_FILEDESCRIPTION_STR "Wine ScrRun dll" #define WINE_FILENAME_STR "scrrun.dll" #define WINE_FILEVERSION 5,8,7600,16385 diff --git a/dlls/scrrun/scrrun.rgs b/dlls/scrrun/scrrun.rgs new file mode 100644 index 0000000..d10d6ca --- /dev/null +++ b/dlls/scrrun/scrrun.rgs @@ -0,0 +1,5 @@ +HKCR +{ + ForceRemove '.js' = s 'JSFile' + ForceRemove '.vbs' = s 'VBSFile' +} diff --git a/dlls/vbscript/vbscript.rgs b/dlls/vbscript/vbscript.rgs index 7834e3e..c390d17 100644 --- a/dlls/vbscript/vbscript.rgs +++ b/dlls/vbscript/vbscript.rgs @@ -56,7 +56,6 @@ HKCR { OLEScript } - ForceRemove '.vbs' = s 'VBSFile' ForceRemove VBSFile = s 'VBScript Script File' { ScriptEngine = s 'VBScript'

1 0

Jacek Caban : jscript: Use bytecode for post-decrement expression.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: e1da3d7242ba0411ccf3cc616cda0b8c76093d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1da3d7242ba0411ccf3cc616… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 11:02:07 2011 +0100 jscript: Use bytecode for post-decrement expression. --- dlls/jscript/compile.c | 8 +++++--- dlls/jscript/engine.c | 35 ----------------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 6 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index b274a0e..0ed6f29 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -292,7 +292,7 @@ static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *ex return hres; } -static HRESULT compile_increment_expression(compiler_ctx_t *ctx, unary_expression_t *expr) +static HRESULT compile_increment_expression(compiler_ctx_t *ctx, unary_expression_t *expr, int n) { HRESULT hres; @@ -308,7 +308,7 @@ static HRESULT compile_increment_expression(compiler_ctx_t *ctx, unary_expressio if(FAILED(hres)) return hres; - return push_instr_int(ctx, OP_postinc, 1); + return push_instr_int(ctx, OP_postinc, n); } /* ECMA-262 3rd Edition 11.14 */ @@ -647,8 +647,10 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_nz); case EXPR_PLUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum); + case EXPR_POSTDEC: + return compile_increment_expression(ctx, (unary_expression_t*)expr, -1); case EXPR_POSTINC: - return compile_increment_expression(ctx, (unary_expression_t*)expr); + return compile_increment_expression(ctx, (unary_expression_t*)expr, 1); case EXPR_SUB: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_THIS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8bf0a0a..102c305 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2735,41 +2735,6 @@ static HRESULT interp_postinc(exec_ctx_t *ctx) return stack_push(ctx, &v); } -/* ECMA-262 3rd Edition 11.3.2 */ -HRESULT post_decrement_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - unary_expression_t *expr = (unary_expression_t*)_expr; - VARIANT val, num; - exprval_t exprval; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_value(ctx, &exprval, ei, &val); - if(SUCCEEDED(hres)) { - hres = to_number(ctx, &val, ei, &num); - VariantClear(&val); - } - - if(SUCCEEDED(hres)) { - VARIANT dec; - num_set_val(&dec, num_val(&num)-1.0); - hres = put_value(ctx, &exprval, &dec, ei); - } - - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - ret->type = EXPRVAL_VARIANT; - ret->u.var = num; - return S_OK; -} - /* ECMA-262 3rd Edition 11.4.4 */ HRESULT pre_increment_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 21d599b..7359d06 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -563,7 +563,6 @@ HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f32788e..07414ce 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1323,7 +1323,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - post_decrement_expression_eval, + compiled_expression_eval, pre_increment_expression_eval, pre_decrement_expression_eval, compiled_expression_eval,

1 0

Pierre Schweitzer : wineps.drv: Fix memory leak.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 0652bbc3d56b7e63f8188598da65bf4f06b2a244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0652bbc3d56b7e63f8188598d… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Dec 6 21:54:42 2011 +0100 wineps.drv: Fix memory leak. --- dlls/wineps.drv/download.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 6996205..6af4841 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -258,15 +258,18 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev) assert(physDev->font.fontloc == Download); + if (!GetObjectW( GetCurrentObject(dev->hdc, OBJ_FONT), sizeof(lf), &lf )) + return FALSE; + potm = HeapAlloc(GetProcessHeap(), 0, len); + if (!potm) + return FALSE; + GetOutlineTextMetricsA(dev->hdc, len, potm); get_download_name(dev, potm, &ps_name); physDev->font.fontinfo.Download = is_font_downloaded(physDev, ps_name); - if (!GetObjectW( GetCurrentObject(dev->hdc, OBJ_FONT), sizeof(lf), &lf )) - return FALSE; - ppem = calc_ppem_for_height(dev->hdc, lf.lfHeight); /* Retrieve the world -> device transform */

1 0

Pierre Schweitzer : msacm32: Fix buffer double free.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 1ac7096728dbb46a56f84fa0d25fdc3cc5282519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac7096728dbb46a56f84fa0d… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Dec 6 21:52:51 2011 +0100 msacm32: Fix buffer double free. --- dlls/msacm32/internal.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 239f4d3..b3f6bf3 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -1016,6 +1016,9 @@ PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER paldrv, LPAR PWINE_ACMLOCALDRIVERINST pDrvInst; pDrvInst = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMLOCALDRIVERINST)); + if (!pDrvInst) + return NULL; + pDrvInst->pLocalDriver = paldrv; pDrvInst->dwDriverID = 0; pDrvInst->pNextACMInst = NULL; @@ -1037,9 +1040,14 @@ PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER paldrv, LPAR ret = MSACM_OpenLocalDriver(paldrv, lParam2); if (!ret) { - MSACM_CloseLocalDriver(pDrvInst); ERR("load1 failed\n"); - goto exit; + /* If MSACM_CloseLocalDriver returns TRUE, + * then pDrvInst has been freed + */ + if (!MSACM_CloseLocalDriver(pDrvInst)) + goto exit; + + return NULL; } pDrvInst->bSession = TRUE; return ret;

1 0

Pierre Schweitzer : usp10: Fix memory leaks.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 783683be2decd90079e484e6d12eee958da29754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=783683be2decd90079e484e6d… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Dec 6 21:54:25 2011 +0100 usp10: Fix memory leaks. --- dlls/usp10/usp10.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index fdd8750..1506bd5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1439,7 +1439,10 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, { int tab_x = 0; if (!(analysis->glyphs = heap_alloc_zero(sizeof(StringGlyphs) * analysis->numItems))) + { + heap_free(BidiLevel); goto error; + } for (i = 0; i < analysis->numItems; i++) { @@ -2422,8 +2425,16 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, if (!(pwOutGlyphs[i] = get_cache_glyph(psc, chInput))) { WORD glyph; - if (!hdc) return E_PENDING; - if (GetGlyphIndicesW(hdc, &chInput, 1, &glyph, 0) == GDI_ERROR) return S_FALSE; + if (!hdc) + { + heap_free(rChars); + return E_PENDING; + } + if (GetGlyphIndicesW(hdc, &chInput, 1, &glyph, 0) == GDI_ERROR) + { + heap_free(rChars); + return S_FALSE; + } pwOutGlyphs[i] = set_cache_glyph(psc, chInput, glyph); } rChars[i] = chInput; @@ -2487,7 +2498,11 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, charProps = heap_alloc_zero(sizeof(SCRIPT_CHARPROP)*cChars); if (!charProps) return E_OUTOFMEMORY; glyphProps = heap_alloc_zero(sizeof(SCRIPT_GLYPHPROP)*cMaxGlyphs); - if (!glyphProps) return E_OUTOFMEMORY; + if (!glyphProps) + { + heap_free(charProps); + return E_OUTOFMEMORY; + } hr = ScriptShapeOpenType(hdc, psc, psa, scriptInformation[psa->eScript].scriptTag, 0, NULL, NULL, 0, pwcChars, cChars, cMaxGlyphs, pwLogClust, charProps, pwOutGlyphs, glyphProps, pcGlyphs);

1 0

Frédéric Delanoy : cmd: Avoid duplication of commonly used strings.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 0eec6b5de0a4d728a87b094d4c767c5cf1db0f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eec6b5de0a4d728a87b094d4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 6 23:08:00 2011 +0100 cmd: Avoid duplication of commonly used strings. --- programs/cmd/directory.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 1134f23..d58351e 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -410,8 +410,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le cur_width = 0; } else { static const WCHAR padfmt[] = {'%','1','!','*','s','!','\0'}; - static const WCHAR empty[] = {'\0'}; - WCMD_output(padfmt, cur_width - tmp_width, empty); + WCMD_output(padfmt, cur_width - tmp_width, nullW); } } else if ((fd+i)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {

1 0

Henri Verbeet : wined3d: Get rid of the WineDirect3DStridedData typedef.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 4c3dfa1bca2827dd8ccccff510f08f99e8626af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3dfa1bca2827dd8ccccff51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 6 22:57:48 2011 +0100 wined3d: Get rid of the WineDirect3DStridedData typedef. --- dlls/ddraw/device.c | 40 ++++++++++++++++++++-------------------- dlls/wined3d/device.c | 16 ++++++++-------- dlls/wined3d/drawprim.c | 23 ++++++++++++----------- include/wine/wined3d.h | 20 ++++++++++---------- 4 files changed, 50 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c3dfa1bca2827dd8cccc…

1 0

Aric Stewart : usp10: Unicode does not compose the Gurmukhi letter SHA.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: c481cdd25e0c37e9359244c1129e17a6eae37740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c481cdd25e0c37e9359244c11… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 07:57:02 2011 -0600 usp10: Unicode does not compose the Gurmukhi letter SHA. --- dlls/usp10/shape.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 8d3a355..5b9bb56 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2625,7 +2625,6 @@ static int gurmukhi_lex(WCHAR c) static const ConsonantComponents Gurmukhi_consonants[] = { {{0x0A32,0x0A3C,0x0000}, 0x0A33}, - {{0x0A38,0x0A3C,0x0000}, 0x0A36}, {{0x0A16,0x0A3C,0x0000}, 0x0A59}, {{0x0A17,0x0A3C,0x0000}, 0x0A5A}, {{0x0A1C,0x0A3C,0x0000}, 0x0A5B},

1 0