January 2007 - Wine-Commits

Andrew Talbot : dinput: Declare some functions static.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: e946ce6b38645bf1920a3aec7681d0f286be76a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e946ce6b38645bf1920a3aec7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jan 3 22:24:09 2007 +0000 dinput: Declare some functions static. --- dlls/dinput/joystick_linux.c | 14 +++++++------- dlls/dinput/keyboard.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 914d05d..a5d6aad 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -1214,11 +1214,11 @@ static HRESULT WINAPI JoystickAImpl_GetP /****************************************************************************** * GetObjectInfo : get object info */ -HRESULT WINAPI JoystickAImpl_GetObjectInfo( - LPDIRECTINPUTDEVICE8A iface, - LPDIDEVICEOBJECTINSTANCEA pdidoi, - DWORD dwObj, - DWORD dwHow) +static HRESULT WINAPI JoystickAImpl_GetObjectInfo( + LPDIRECTINPUTDEVICE8A iface, + LPDIDEVICEOBJECTINSTANCEA pdidoi, + DWORD dwObj, + DWORD dwHow) { JoystickImpl *This = (JoystickImpl *)iface; DIDEVICEOBJECTINSTANCEA didoiA; @@ -1302,7 +1302,7 @@ HRESULT WINAPI JoystickAImpl_GetObjectIn /****************************************************************************** * GetDeviceInfo : get information about a device's identity */ -HRESULT WINAPI JoystickAImpl_GetDeviceInfo( +static HRESULT WINAPI JoystickAImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEINSTANCEA pdidi) { @@ -1342,7 +1342,7 @@ HRESULT WINAPI JoystickAImpl_GetDeviceIn /****************************************************************************** * GetDeviceInfo : get information about a device's identity */ -HRESULT WINAPI JoystickWImpl_GetDeviceInfo( +static HRESULT WINAPI JoystickWImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi) { diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index f217e9a..ce04ff9 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -61,7 +61,7 @@ static SysKeyboardImpl* current_lock = N static BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; /* array for 'GetDeviceState' */ -LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam ) +static LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam ) { SysKeyboardImpl *This = (SysKeyboardImpl *)current_lock; int dik_code;

1 0

Andrew Talbot : winedump: Fix memory leak.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: d39e1c360a31e64512d594dd6aad4d3d89993881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d39e1c360a31e64512d594dd6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jan 3 13:22:49 2007 +0000 winedump: Fix memory leak. --- tools/winedump/pe.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index d6a0503..cbebba9 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -532,7 +532,12 @@ static void dump_dir_exported_functions( printf("\n"); } pFunc = RVA(exportDir->AddressOfFunctions, exportDir->NumberOfFunctions * sizeof(DWORD)); - if (!pFunc) {printf("Can't grab functions' address table\n"); return;} + if (!pFunc) + { + printf("Can't grab functions' address table\n"); + free(map); + return; + } for (i = 0; i < exportDir->NumberOfFunctions; i++) { if (pFunc[i] && !(map[i / 32] & (1 << (i % 32))))

1 0

Louis Lenders : wininet: Update Dutch resource.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: e39a3be8600d44e8e07003a0f08aec6db1207892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39a3be8600d44e8e07003a0f… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Jan 3 16:58:34 2007 +0000 wininet: Update Dutch resource. --- dlls/wininet/wininet_Nl.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Nl.rc b/dlls/wininet/wininet_Nl.rc index 8cee244..16c80cc 100644 --- a/dlls/wininet/wininet_Nl.rc +++ b/dlls/wininet/wininet_Nl.rc @@ -39,3 +39,8 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "LAN Verbinding" +}

1 0

Louis Lenders : mstml: Update Dutch resource.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: e7bebaeb13c45b47c4db0a9345b46cce18fd82dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bebaeb13c45b47c4db0a934… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Jan 3 16:06:13 2007 +0000 mstml: Update Dutch resource. --- dlls/mshtml/Nl.rc | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Nl.rc b/dlls/mshtml/Nl.rc index 2906779..7378ff8 100644 --- a/dlls/mshtml/Nl.rc +++ b/dlls/mshtml/Nl.rc @@ -25,4 +25,20 @@ STRINGTABLE DISCARDABLE { IDS_HTMLDISABLED "De HTML weergave is op dit moment uitgeschakeld." IDS_HTMLDOCUMENT "HTML document" + IDS_DOWNLOADING "Bezig met downloaden..." + IDS_INSTALLING "Bezig met installeren..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine-Gecko-Installatie" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Dit programma probeert een HTML-pagina weer te geven. Wine moet " \ + "Gecko (Mozilla HTML-Bibliotheek) installeren om de pagina " \ + "weer te kunnen geven. Klik op Installeren, om Gecko automatisch " \ + "te downloaden en te installeren.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT + CONTROL "Voortgang", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 + PUSHBUTTON "Afbreken", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Installeren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP }

1 0

Hans Leidekker : usp10: Document ScriptItemize. Get rid of the remaining tabs.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 586e16de761deb924379f97175f55d28cacfd8c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=586e16de761deb924379f9717… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jan 3 12:12:43 2007 +0100 usp10: Document ScriptItemize. Get rid of the remaining tabs. --- dlls/usp10/usp10.c | 54 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 3afaadd..35cf0b2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -208,12 +208,13 @@ static HRESULT get_script_cache(const HD */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { - switch(fdwReason) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: - break; + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + case DLL_PROCESS_DETACH: + break; } return TRUE; } @@ -333,12 +334,12 @@ HRESULT WINAPI ScriptRecordDigitSubstitu * CONTEXT or NONE in reality */ if (!sds) return E_POINTER; - + locale = ConvertDefaultLocale(locale); if (!IsValidLocale(locale, LCID_INSTALLED)) return E_INVALIDARG; - + plgid = PRIMARYLANGID(LANGIDFROMLCID(locale)); sds->TraditionalDigitLanguage = plgid; @@ -420,9 +421,23 @@ HRESULT WINAPI ScriptApplyDigitSubstitut /*********************************************************************** * ScriptItemize (USP10.@) * + * Split a Unicode string into shapeable parts. + * + * PARAMS + * pwcInChars [I] String to split. + * cInChars [I] Number of characters in pwcInChars. + * cMaxItems [I] Maximum number of items to return. + * psControl [I] Pointer to a SCRIPT_CONTROL structure. + * psState [I] Pointer to a SCRIPT_STATE structure. + * pItems [O] Buffer to receive SCRIPT_ITEM structures. + * pcItems [O] Number of script items returned. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. */ -HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItems, - const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, +HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItems, + const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, SCRIPT_ITEM *pItems, int *pcItems) { @@ -479,7 +494,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR New_Script = Script_Latin; else New_Script = SCRIPT_UNDEFINED; - + if (New_Script != pItems[index].a.eScript) { TRACE("New_Script=%d, eScript=%d ", New_Script, pItems[index].a.eScript); @@ -714,12 +729,10 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_ int runningX = 0; int runningCp = 0; StringAnalysis* analysis = ssa; + TRACE("(%p), %d, %d, (%p)\n", ssa, icp, fTrailing, pX); - if(!ssa || !pX) - { - return 1; - } + if (!ssa || !pX) return S_FALSE; /* icp out of range */ if(icp < 0) @@ -767,17 +780,14 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_ TRACE("(%p), %d, (%p), (%p)\n", ssa, iX, piCh, piTrailing); - if(!ssa || !piCh || !piTrailing) - { - return 1; - } + if (!ssa || !piCh || !piTrailing) return S_FALSE; /* out of range */ if(iX < 0) { *piCh = -1; *piTrailing = TRUE; - return S_OK; + return S_OK; } for(i=0; i<analysis->numItems; i++) @@ -917,7 +927,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, *piCP = cChars; *piTrailing = FALSE; return S_OK; - } + } fAvePosX = fMaxPosX / cGlyphs; iPosX = fAvePosX; @@ -927,7 +937,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, *piTrailing = 0; else *piTrailing = 1; /* yep we are over halfway */ - + *piCP = item -1; /* Return character position */ TRACE("*piCP=%d iPposX=%d\n", *piCP, iPosX); return S_OK;

1 0

Hans Leidekker : usp10: Implement and test ScriptStringGetOrder and ScriptString_pcOutChars.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: f152153f15de09acbee08d890f8b8ebab04f5dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f152153f15de09acbee08d890… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jan 3 12:12:29 2007 +0100 usp10: Implement and test ScriptStringGetOrder and ScriptString_pcOutChars. --- dlls/usp10/tests/usp10.c | 42 ++++++++++++----------- dlls/usp10/usp10.c | 80 ++++++++++++++++++++++++++++++++++++++------- dlls/usp10/usp10.spec | 4 +- 3 files changed, 91 insertions(+), 35 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index a4d6e6e..42a4da7 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -617,8 +617,8 @@ static void test_ScriptString(HDC hdc) HRESULT hr; WCHAR teststr[] = {'T','e','s','t','1',' ','a','2','b','3', '\0'}; - int String = (sizeof(teststr)/sizeof(WCHAR))-1; - int Glyphs = String * 2 + 16; + int len = (sizeof(teststr) / sizeof(WCHAR)) - 1; + int Glyphs = len * 2 + 16; int Charset; DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; @@ -633,49 +633,51 @@ static void test_ScriptString(HDC hdc) int Y = 100; UINT Options = 0; const RECT rc = {0, 50, 100, 100}; - int MinSel = 0; + int MinSel = 0; int MaxSel = 0; BOOL Disabled = FALSE; + const int *clip_len; + UINT *order, i; - LOGFONTA lf; - - lstrcpyA(lf.lfFaceName, "Symbol"); - lf.lfHeight = 10; - lf.lfItalic = 0; - lf.lfEscapement = 0; - lf.lfOrientation = 0; - lf.lfUnderline = 0; - lf.lfStrikeOut = 0; - lf.lfWeight = 300; - lf.lfWidth = 10; Charset = -1; /* this flag indicates unicode input */ /* Test without hdc to get E_PENDING */ - hr = ScriptStringAnalyse( NULL, teststr, String, Glyphs, Charset, Flags, + hr = ScriptStringAnalyse( NULL, teststr, len, Glyphs, Charset, Flags, ReqWidth, &Control, &State, Dx, &Tabdef, &InClass, &ssa); ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", hr); /* test with hdc, this should be a valid test */ - hr = ScriptStringAnalyse( hdc, teststr, String, Glyphs, Charset, Flags, + hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, ReqWidth, &Control, &State, Dx, &Tabdef, &InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); /* test makes sure that a call with a valid pssa still works */ - hr = ScriptStringAnalyse( hdc, teststr, String, Glyphs, Charset, Flags, + hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, ReqWidth, &Control, &State, Dx, &Tabdef, &InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); ok(ssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n"); - if (hr == 0) + if (hr == S_OK) { hr = ScriptStringOut(ssa, X, Y, Options, &rc, MinSel, MaxSel, Disabled); ok(hr == S_OK, "ScriptStringOut should return S_OK not %08x\n", hr); - hr = ScriptStringFree(&ssa); - ok(hr == S_OK, "ScriptStringFree should return S_OK not %08x\n", hr); } + + clip_len = ScriptString_pcOutChars(ssa); + ok(*clip_len == len, "ScriptString_pcOutChars failed, got %d, expected %d\n", *clip_len, len); + + order = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *clip_len * sizeof(UINT)); + hr = ScriptStringGetOrder(ssa, order); + ok(hr == S_OK, "ScriptStringGetOrder failed, got %08x, expected S_OK\n", hr); + + for (i = 0; i < *clip_len; i++) ok(order[i] == i, "%d: got %d expected %d\n", i, order[i], i); + HeapFree(GetProcessHeap(), 0, order); + + hr = ScriptStringFree(&ssa); + ok(hr == S_OK, "ScriptStringFree should return S_OK not %08x\n", hr); } static void test_ScriptStringXtoCP_CPtoX(HDC hdc) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ca713bd..3afaadd 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -159,6 +159,7 @@ typedef struct { typedef struct { BOOL invalid; + int clip_len; ScriptCache *sc; int cItems; int cMaxGlyphs; @@ -520,19 +521,12 @@ HRESULT WINAPI ScriptItemize(const WCHAR * ScriptStringAnalyse (USP10.@) * */ -HRESULT WINAPI ScriptStringAnalyse(HDC hdc, - const void *pString, - int cString, - int cGlyphs, - int iCharset, - DWORD dwFlags, - int iReqWidth, - SCRIPT_CONTROL *psControl, - SCRIPT_STATE *psState, - const int *piDx, - SCRIPT_TABDEF *pTabdef, - const BYTE *pbInClass, - SCRIPT_STRING_ANALYSIS *pssa) +HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, + int cGlyphs, int iCharset, DWORD dwFlags, + int iReqWidth, SCRIPT_CONTROL *psControl, + SCRIPT_STATE *psState, const int *piDx, + SCRIPT_TABDEF *pTabdef, const BYTE *pbInClass, + SCRIPT_STRING_ANALYSIS *pssa) { HRESULT hr = E_OUTOFMEMORY; StringAnalysis *analysis = NULL; @@ -542,12 +536,20 @@ HRESULT WINAPI ScriptStringAnalyse(HDC h hdc, pString, cString, cGlyphs, iCharset, dwFlags, iReqWidth, psControl, psState, piDx, pTabdef, pbInClass, pssa); + if (iCharset != -1) + { + FIXME("Only Unicode strings are supported\n"); + return E_INVALIDARG; + } if (cString < 1 || !pString) return E_INVALIDARG; if ((dwFlags & SSA_GLYPHS) && !hdc) return E_PENDING; if (!(analysis = usp_zero_alloc(sizeof(StringAnalysis)))) return E_OUTOFMEMORY; if (!(analysis->pItem = usp_zero_alloc(num_items * sizeof(SCRIPT_ITEM) + 1))) goto error; + /* FIXME: handle clipping */ + analysis->clip_len = cString; + hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, &analysis->numItems); @@ -1567,3 +1569,55 @@ const SCRIPT_LOGATTR * WINAPI ScriptStri if (!analysis) return NULL; return analysis->logattrs; } + +/*********************************************************************** + * ScriptString_pcOutChars (USP10.@) + * + * Retrieve the length of a string after clipping. + * + * PARAMS + * ssa [I] String analysis. + * + * RETURNS + * Success: Pointer to the length. + * Failure: NULL + */ +const int * WINAPI ScriptString_pcOutChars(SCRIPT_STRING_ANALYSIS ssa) +{ + StringAnalysis *analysis = ssa; + + TRACE("(%p)\n", ssa); + + if (!analysis) return NULL; + return &analysis->clip_len; +} + +/*********************************************************************** + * ScriptStringGetOrder (USP10.@) + * + * Retrieve a glyph order map. + * + * PARAMS + * ssa [I] String analysis. + * order [I/O] Array of glyph positions. + * + * RETURNS + * Success: S_OK + * Failure: a non-zero HRESULT. + */ +HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order) +{ + unsigned int i, j, k; + StringAnalysis *analysis = ssa; + + TRACE("(%p)\n", ssa); + + if (!analysis) return S_FALSE; + + /* FIXME: handle RTL scripts */ + for (i = 0, k = 0; i < analysis->numItems; i++) + for (j = 0; j < analysis->glyphs[i].numGlyphs; j++, k++) + order[k] = k; + + return S_OK; +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 8051da2..df07f43 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -21,13 +21,13 @@ @ stdcall ScriptStringCPtoX(ptr long long ptr) @ stdcall ScriptStringFree(ptr) @ stdcall ScriptStringGetLogicalWidths(ptr ptr) -@ stub ScriptStringGetOrder +@ stdcall ScriptStringGetOrder(ptr ptr) @ stdcall ScriptStringOut(ptr long long long ptr long long long) @ stdcall ScriptStringValidate(ptr) @ stdcall ScriptStringXtoCP(ptr long ptr ptr) @ stdcall ScriptString_pLogAttr(ptr) @ stdcall ScriptString_pSize(ptr) -@ stub ScriptString_pcOutChars +@ stdcall ScriptString_pcOutChars(ptr) @ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr) @ stdcall ScriptXtoCP(long long long ptr ptr ptr ptr ptr ptr) @ stub UspAllocCache

1 0

Hans Leidekker : usp10: Use macro functions for memory allocation and start checking for allocation failures .
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: e0c38fd10f97934b0c25abadb0eef3ccfde07125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c38fd10f97934b0c25abadb… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jan 3 12:12:17 2007 +0100 usp10: Use macro functions for memory allocation and start checking for allocation failures. --- dlls/usp10/usp10.c | 156 ++++++++++++++++++++++++++++----------------------- 1 files changed, 86 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0c38fd10f97934b0c25a…

1 0

Hans Leidekker : usp10: Make the script cache accessible from a string analysis.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 23b3299cdb9b6e5c25bb19c0b3ecb51c5e76ac7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b3299cdb9b6e5c25bb19c0b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jan 3 12:12:03 2007 +0100 usp10: Make the script cache accessible from a string analysis. --- dlls/usp10/usp10.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 68110e5..f315f5a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -159,7 +159,7 @@ typedef struct { typedef struct { BOOL invalid; - HDC hdc; + ScriptCache *sc; int cItems; int cMaxGlyphs; SCRIPT_ITEM* pItem; @@ -517,9 +517,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC h { HRESULT hr; StringAnalysis* analysis; - int numItemizedItems; - int i; - SCRIPT_CACHE* sc = 0; + int i, numItemizedItems = 255; TRACE("(%p,%p,%d,%d,%d,0x%x,%d,%p,%p,%p,%p,%p,%p)\n", hdc, pString, cString, cGlyphs, iCharset, dwFlags, @@ -534,8 +532,6 @@ HRESULT WINAPI ScriptStringAnalyse(HDC h analysis = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(StringAnalysis)); - analysis->hdc = hdc; - numItemizedItems = 255; analysis->pItem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, numItemizedItems*sizeof(SCRIPT_ITEM)+1); @@ -556,10 +552,10 @@ HRESULT WINAPI ScriptStringAnalyse(HDC h analysis->glyphs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(StringGlyphs)*analysis->numItems); - sc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SCRIPT_CACHE)); for(i=0; i<analysis->numItems; i++) { + SCRIPT_CACHE *sc = (SCRIPT_CACHE *)&analysis->sc; int cChar = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; int numGlyphs = 1.5 * cChar + 16; WORD* glyphs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WORD)*numGlyphs); @@ -587,10 +583,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC h analysis->glyphs[i].abc = abc; } - HeapFree(GetProcessHeap(), 0, sc); - *pssa = analysis; - return S_OK; } @@ -628,7 +621,6 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_ST WORD *glyphs; int item, cnt, x; HRESULT hr; - SCRIPT_CACHE sc = 0; TRACE("(%p,%d,%d,0x%1x,%p,%d,%d,%d)\n", ssa, iX, iY, uOptions, prc, iMinSel, iMaxSel, fDisabled); @@ -671,17 +663,15 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_ST cnt += analysis->glyphs[item].numGlyphs; /* point to the end of the copied text */ } - hr = ScriptTextOut(analysis->hdc, &sc, iX, iY, uOptions, prc, &analysis->pItem->a, - NULL, 0, glyphs, cnt, analysis->glyphs->piAdvance, NULL, - analysis->glyphs->pGoffset); + hr = ScriptTextOut(analysis->sc->hdc, (SCRIPT_CACHE *)&analysis->sc, iX, iY, + uOptions, prc, &analysis->pItem->a, NULL, 0, glyphs, cnt, + analysis->glyphs->piAdvance, NULL, analysis->glyphs->pGoffset); TRACE("ScriptTextOut hr=%08x\n", hr); /* * Free the output buffer and script cache */ HeapFree(GetProcessHeap(), 0, glyphs); - ScriptFreeCache(&sc); - return hr; } @@ -1524,7 +1514,7 @@ const SIZE * WINAPI ScriptString_pSize(S * appropriate place so that we can just pass cached * values here. */ - if (!GetTextMetricsW(analysis->hdc, &metric)) + if (!GetTextMetricsW(analysis->sc->hdc, &metric)) { HeapFree(GetProcessHeap(), 0, analysis->sz); analysis->sz = NULL;

1 0

Rob Shearman : kernel32: Be more verbose about the expected and received values for failures in the resource function tests .
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 140a610e2a9de6e2a8ef6745d007433ed76fe080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=140a610e2a9de6e2a8ef6745d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 3 12:59:19 2007 +0000 kernel32: Be more verbose about the expected and received values for failures in the resource function tests. --- dlls/kernel32/tests/resource.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 9a26a12..964f17a 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -211,8 +211,8 @@ void check_empty( IMAGE_RESOURCE_DIRECTO { char *pad; - ok( dir->NumberOfNamedEntries == 0, "NumberOfNamedEntries wrong\n"); - ok( dir->NumberOfIdEntries == 0, "NumberOfIdEntries wrong\n"); + ok( dir->NumberOfNamedEntries == 0, "NumberOfNamedEntries should be 0 instead of %d\n", dir->NumberOfNamedEntries); + ok( dir->NumberOfIdEntries == 0, "NumberOfIdEntries should be 0 instead of %d\n", dir->NumberOfIdEntries); pad = (char*) &dir[1]; @@ -221,8 +221,8 @@ void check_empty( IMAGE_RESOURCE_DIRECTO void check_version( IMAGE_RESOURCE_DIRECTORY *dir ) { - ok( dir->NumberOfNamedEntries == 0, "NumberOfNamedEntries wrong\n"); - todo_wine ok( dir->NumberOfIdEntries == 2, "NumberOfIdEntries wrong\n"); + ok( dir->NumberOfNamedEntries == 0, "NumberOfNamedEntries should be 0 instead of %d\n", dir->NumberOfNamedEntries); + todo_wine ok( dir->NumberOfIdEntries == 2, "NumberOfIdEntries should be 2 instead of %d\n", dir->NumberOfIdEntries); } void check_exe( res_check_func fn )

1 0

Alexandre Julliard : server: Avoid crash in alloc_console when the process has no parent.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 31b02bbd1facee6a80d8e3eebc649ec974df17a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b02bbd1facee6a80d8e3eeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 4 09:41:14 2007 +0100 server: Avoid crash in alloc_console when the process has no parent. --- server/console.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/server/console.c b/server/console.c index 5f44827..64601fb 100644 --- a/server/console.c +++ b/server/console.c @@ -1252,12 +1252,20 @@ DECL_HANDLER(alloc_console) struct process *renderer = current->process; struct console_input *console; - process = (req->pid) ? get_process_from_id( req->pid ) : - (struct process *)grab_object( renderer->parent ); + if (req->pid) + { + if (!(process = get_process_from_id( req->pid ))) return; + } + else + { + if (!(process = renderer->parent)) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } + grab_object( process ); + } - reply->handle_in = 0; - reply->event = 0; - if (!process) return; if (process != renderer && process->console) { set_error( STATUS_ACCESS_DENIED );

1 0