May 2008 - Wine-Commits - list.winehq.org

Dylan Smith : wordpad: Added a null terminator needed for a unicode string.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: 76f2a0f33312c508b32794467c4c52f8aed34efa URL: http://source.winehq.org/git/wine.git/?a=commit;h=76f2a0f33312c508b32794467… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue May 27 16:40:13 2008 -0400 wordpad: Added a null terminator needed for a unicode string. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 4fa8009..92255fd 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1200,7 +1200,7 @@ static int current_units_to_twips(float number) static void append_current_units(LPWSTR buffer) { - static const WCHAR space[] = {' '}; + static const WCHAR space[] = {' ', 0}; lstrcatW(buffer, space); lstrcatW(buffer, units_cmW); }

1 0

Dylan Smith : wordpad: Removed spaces between dots in ellipses for english menu text.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: 4a9adfa04c254a11ca6dd3cc1eeb4d86346bf875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9adfa04c254a11ca6dd3cc1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri May 23 09:03:30 2008 -0400 wordpad: Removed spaces between dots in ellipses for english menu text. --- programs/wordpad/En.rc | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index d4d5398..298fb89 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -22,16 +22,16 @@ IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&File" BEGIN - MENUITEM "&New . . .\tCtrl+N", ID_FILE_NEW - MENUITEM "&Open . . .\tCtrl+O", ID_FILE_OPEN + MENUITEM "&New...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE - MENUITEM "Save &as . . .", ID_FILE_SAVEAS + MENUITEM "Save &as...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&Print . . .\tCtrl+P", ID_PRINT - MENUITEM "Print previe&w . . .", ID_PREVIEW - MENUITEM "Pag&e setup . . .", ID_PRINTSETUP + MENUITEM "&Print...\tCtrl+P", ID_PRINT + MENUITEM "Print previe&w...", ID_PREVIEW + MENUITEM "Pag&e setup...", ID_PRINTSETUP MENUITEM SEPARATOR - MENUITEM "E&xit", ID_FILE_EXIT + MENUITEM "E&xit", ID_FILE_EXIT END POPUP "&Edit" BEGIN @@ -44,9 +44,9 @@ BEGIN MENUITEM "&Clear\tDEL", ID_EDIT_CLEAR MENUITEM "&Select all\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Find . . .\tCrtl+F", ID_FIND + MENUITEM "&Find...\tCrtl+F", ID_FIND MENUITEM "Find &next\tF3", ID_FIND_NEXT - MENUITEM "&Replace . . .\tCtrl+H", ID_REPLACE + MENUITEM "&Replace...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "Read-&only", ID_EDIT_READONLY MENUITEM "&Modified", ID_EDIT_MODIFIED @@ -67,18 +67,18 @@ BEGIN MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Options . . .", ID_VIEWPROPERTIES + MENUITEM "&Options...", ID_VIEWPROPERTIES END POPUP "&Insert" BEGIN - MENUITEM "&Date and time . . .", ID_DATETIME + MENUITEM "&Date and time...", ID_DATETIME END POPUP "F&ormat" BEGIN - MENUITEM "&Font . . .", ID_FONTSETTINGS + MENUITEM "&Font...", ID_FONTSETTINGS MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT - MENUITEM "&Tabs . . ." ID_TABSTOPS + MENUITEM "&Paragraph..." ID_PARAFORMAT + MENUITEM "&Tabs..." ID_TABSTOPS POPUP "Backgroun&d" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 @@ -100,7 +100,7 @@ BEGIN MENUITEM "&Paste", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT + MENUITEM "&Paragraph..." ID_PARAFORMAT END END

1 0

Igor Tarasov : user32: Further implementation of MNS_NOTIFYBYPOS.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: 356c47e89e12154737dc71ecc7a30676ec96cdb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=356c47e89e12154737dc71ecc… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Fri May 23 18:35:33 2008 +0900 user32: Further implementation of MNS_NOTIFYBYPOS. --- dlls/user32/menu.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 49de5e1..dd859b1 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2472,7 +2472,10 @@ static INT MENU_ExecFocusedItem( MTRACKER* pmt, HMENU hMenu, UINT wFlags ) MAKELPARAM((INT16)pmt->pt.x, (INT16)pmt->pt.y) ); else { - if (menu->dwStyle & MNS_NOTIFYBYPOS) + POPUPMENU *topmenu = MENU_GetMenu( pmt->hTopMenu ); + DWORD dwStyle = menu->dwStyle | (topmenu ? topmenu->dwStyle : 0); + + if (dwStyle & MNS_NOTIFYBYPOS) PostMessageW( pmt->hOwnerWnd, WM_MENUCOMMAND, menu->FocusedItem, (LPARAM)hMenu); else

1 0

Jon Griffiths : msvcrt: Follow Vista behaviour in wcscpy_s.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: b86915382d50c33ce863b8a1997f9c2c86cb3ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b86915382d50c33ce863b8a19… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Mon May 26 08:21:13 2008 -0700 msvcrt: Follow Vista behaviour in wcscpy_s. --- dlls/msvcrt/wcs.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c6f3e95..14daf90 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -979,27 +979,21 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con { INT size = 0; - if(!wcDest) + if(!wcDest || !numElement) return MSVCRT_EINVAL; + wcDest[0] = 0; + if(!wcSrc) { - wcDest[0] = 0; return MSVCRT_EINVAL; } - if(numElement == 0) - { - wcDest[0] = 0; - return MSVCRT_ERANGE; - } - size = strlenW(wcSrc) + 1; if(size > numElement) { - wcDest[0] = 0; - return MSVCRT_EINVAL; + return MSVCRT_ERANGE; } if(size > numElement)

1 0

Dan Kegel : advapi32: Don't test buffer length if buffer is null.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: 0161606b538c69ad6207b7adab867d0896adc04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0161606b538c69ad6207b7ada… Author: Dan Kegel <dank(a)kegel.com> Date: Mon May 26 19:58:49 2008 -0700 advapi32: Don't test buffer length if buffer is null. --- dlls/advapi32/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index fc5be79..c04eb8c 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1811,7 +1811,7 @@ BOOL WINAPI GetServiceKeyNameA( SC_HANDLE hSCManager, LPCSTR lpDisplayName, sizeW = *lpcchBuffer; if (!GetServiceKeyNameW(hSCManager, lpDisplayNameW, lpServiceNameW, &sizeW)) { - if (*lpcchBuffer && lpServiceName) + if (lpServiceName && *lpcchBuffer) lpServiceName[0] = 0; *lpcchBuffer = sizeW*2; /* we can only provide an upper estimation of string length */ goto cleanup; @@ -1922,7 +1922,7 @@ BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName, sizeW = *lpcchBuffer; if (!GetServiceDisplayNameW(hSCManager, lpServiceNameW, lpDisplayNameW, &sizeW)) { - if (*lpcchBuffer && lpDisplayName) + if (lpDisplayName && *lpcchBuffer) lpDisplayName[0] = 0; *lpcchBuffer = sizeW*2; /* we can only provide an upper estimation of string length */ goto cleanup;

1 0

James Hawkins : usp10: Fix several failing test in win2k3.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: a4c10fda8e13827de96fa1b8fd40a9435fd8d9be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c10fda8e13827de96fa1b8f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue May 27 11:16:01 2008 -0500 usp10: Fix several failing test in win2k3. --- dlls/usp10/tests/usp10.c | 73 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 55 insertions(+), 18 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 252f7d9..3902e2b 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -635,54 +635,74 @@ static void test_ScriptXtoX(void) cGlyphs = 10; hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); - ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); - ok(piTrailing == TRUE, "Negative iX should return piTrailing=TRUE not %d\n", piTrailing); + if (piTrailing) + ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); + else /* win2k3 */ + ok(piCP == 10, "Negative iX should return piCP=10 not %d\n", piCP); + iX = 1954; cChars = 10; cGlyphs = 10; hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); - ok(piCP == 10, "Excessive iX should return piCP=10 not %d\n", piCP); - ok(piTrailing == FALSE, "Excessive iX should return piTrailing=FALSE not %d\n", piTrailing); + if (piTrailing) /* win2k3 */ + ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); + else + ok(piCP == 10, "Negative iX should return piCP=10 not %d\n", piCP); + iX = 779; cChars = 10; cGlyphs = 10; hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); - ok(piCP == 3, "iX=%d should return piCP=3 not %d\n", iX, piCP); + ok(piCP == 3 || + piCP == -1, /* win2k3 */ + "iX=%d should return piCP=3 or piCP=-1 not %d\n", iX, piCP); ok(piTrailing == 1, "iX=%d should return piTrailing=1 not %d\n", iX, piTrailing); + iX = 780; cChars = 10; cGlyphs = 10; hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); - ok(piCP == 3, "iX=%d should return piCP=3 not %d\n", iX, piCP); + ok(piCP == 3 || + piCP == -1, /* win2k3 */ + "iX=%d should return piCP=3 or piCP=-1 not %d\n", iX, piCP); ok(piTrailing == 1, "iX=%d should return piTrailing=1 not %d\n", iX, piTrailing); + iX = 868; cChars = 10; cGlyphs = 10; hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); - ok(piCP == 4, "iX=%d should return piCP=4 not %d\n", iX, piCP); + ok(piCP == 4 || + piCP == -1, /* win2k3 */ + "iX=%d should return piCP=4 or piCP=-1 not %d\n", iX, piCP); iX = 0; cChars = 10; cGlyphs = 10; hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); - ok(piCP == 0, "iX=%d should return piCP=0 not %d\n", iX, piCP); + ok(piCP == 0 || + piCP == 10, /* win2k3 */ + "iX=%d should return piCP=0 piCP=10 not %d\n", iX, piCP); + iX = 195; cChars = 10; cGlyphs = 10; hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 0, "iX=%d should return piCP=0 not %d\n", iX, piCP); + iX = 196; cChars = 10; cGlyphs = 10; hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); - ok(piCP == 1, "iX=%d should return piCP=1 not %d\n", iX, piCP); + ok(piCP == 1 || + piCP == 0, /* win2k3 */ + "iX=%d should return piCP=1 or piCP=0 not %d\n", iX, piCP); iCP=5; fTrailing = FALSE; @@ -690,36 +710,49 @@ static void test_ScriptXtoX(void) cGlyphs = 10; hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); - ok(piX == 976, "iCP=%d should return piX=976 not %d\n", iCP, piX); + ok(piX == 976 || + piX == 100, /* win2k3 */ + "iCP=%d should return piX=976 or piX=100 not %d\n", iCP, piX); + iCP=5; fTrailing = TRUE; cChars = 10; cGlyphs = 10; hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); - ok(piX == 1171, "iCP=%d should return piX=1171 not %d\n", iCP, piX); + ok(piX == 1171 || + piX == 80, /* win2k3 */ + "iCP=%d should return piX=1171 or piX=80 not %d\n", iCP, piX); + iCP=6; fTrailing = FALSE; cChars = 10; cGlyphs = 10; hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); - ok(piX == 1171, "iCP=%d should return piX=1171 not %d\n", iCP, piX); + ok(piX == 1171 || + piX == 80, /* win2k3 */ + "iCP=%d should return piX=1171 or piX=80 not %d\n", iCP, piX); + iCP=11; fTrailing = FALSE; cChars = 10; cGlyphs = 10; hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); - ok(piX == 1953, "iCP=%d should return piX=1953 not %d\n", iCP, piX); + ok(piX == 1953 || + piX == 0, /* win2k3 */ + "iCP=%d should return piX=1953 or piX=0 not %d\n", iCP, piX); + iCP=11; fTrailing = TRUE; cChars = 10; cGlyphs = 10; hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); - ok(piX == 1953, "iCP=%d should return piX=1953 not %d\n", iCP, piX); - + ok(piX == 1953 || + piX == 0, /* win2k3 */ + "iCP=%d should return piX=1953 or piX=0 not %d\n", iCP, piX); } static void test_ScriptString(HDC hdc) @@ -838,10 +871,14 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, ReqWidth, &Control, &State, NULL, &Tabdef, &InClass, &ssa); - ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); - ok(ssa != NULL, "ScriptStringAnalyse ssa should not be NULL\n"); - if (hr == 0) + ok(hr == S_OK || + hr == E_INVALIDARG, /* NT */ + "ScriptStringAnalyse should return S_OK or E_INVALIDARG not %08x\n", hr); + + if (hr == S_OK) { + ok(ssa != NULL, "ScriptStringAnalyse ssa should not be NULL\n"); + /* * Loop to generate character positions to provide starting positions for the * ScriptStringCPtoX and ScriptStringXtoCP functions

1 0

Jon Griffiths : msvcrt/tests: Fix 3 tests that always fail on Vista.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: 288a48fcf0702fe3197d609a4e98e9ad2391fb7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=288a48fcf0702fe3197d609a4… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Mon May 26 08:13:49 2008 -0700 msvcrt/tests: Fix 3 tests that always fail on Vista. --- dlls/msvcrt/tests/string.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 3da32d8..5247515 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -589,8 +589,11 @@ static void test_wcscpy_s(void) /* Test invalid size */ szDest[0] = 'A'; ret = p_wcscpy_s(szDest, 0, szLongText); - ok(ret == ERANGE, "expected ERANGE got %d\n", ret); - ok(szDest[0] == 0, "szDest[0] not 0\n"); + /* Later versions changed the return value for this case to EINVAL, + * and don't modify the result if the dest size is 0. + */ + ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); + ok(szDest[0] == 0 || ret == EINVAL, "szDest[0] not 0\n"); /* Copy same buffer size */ ret = p_wcscpy_s(szDest, 18, szLongText); @@ -600,7 +603,7 @@ static void test_wcscpy_s(void) /* Copy smaller buffer size */ szDest[0] = 'A'; ret = p_wcscpy_s(szDestShort, 8, szLongText); - ok(ret == EINVAL, "expected EINVAL got %d\n", ret); + ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); }

1 0

Dan Kegel : fusion: Use HeapAlloc, not strdup, to avoid malloc/ HeapFree mismatch.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: 713290ebcea57bc5f2a0b7c1a7e237a225e8fdcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=713290ebcea57bc5f2a0b7c1a… Author: Dan Kegel <dank(a)kegel.com> Date: Mon May 26 19:19:11 2008 -0700 fusion: Use HeapAlloc, not strdup, to avoid malloc/HeapFree mismatch. --- dlls/fusion/assembly.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 8973af3..94ea542 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -406,7 +406,11 @@ HRESULT assembly_release(ASSEMBLY *assembly) static LPSTR assembly_dup_str(ASSEMBLY *assembly, WORD index) { - return strdup((LPSTR)&assembly->strings[index]); + LPSTR str = (LPSTR)&assembly->strings[index]; + LPSTR cpy = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); + if (cpy) + strcpy(cpy, str); + return cpy; } HRESULT assembly_get_name(ASSEMBLY *assembly, LPSTR *name) @@ -431,8 +435,11 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPSTR *name) HRESULT assembly_get_path(ASSEMBLY *assembly, LPSTR *path) { - *path = strdup(assembly->path); - if (!*path) + LPSTR cpy = HeapAlloc(GetProcessHeap(), 0, strlen(assembly->path)+1); + *path = cpy; + if (cpy) + strcpy(cpy, assembly->path); + else return E_OUTOFMEMORY; return S_OK;

1 0

Paul Vriens : shell32/tests: Run tests again on win95.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: b44df3a852e42a51b7b03b8c44c736dd89d1cfd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b44df3a852e42a51b7b03b8c4… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue May 27 16:57:25 2008 +0200 shell32/tests: Run tests again on win95. --- dlls/shell32/tests/shelllink.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 27e8032..5cbd8bf 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -501,6 +501,12 @@ static void test_load_save(void) HANDLE hf; DWORD r; + if (!pGetLongPathNameA) + { + skip("GetLongPathNameA is not available\n"); + return; + } + /* Save an empty .lnk file */ memset(&desc, 0, sizeof(desc)); create_lnk(lnkfile, &desc, 0); @@ -534,7 +540,7 @@ static void test_load_save(void) *p='\0'; /* IShellLink returns path in long form */ - GetLongPathNameA(mypath, realpath, MAX_PATH); + pGetLongPathNameA(mypath, realpath, MAX_PATH); /* Overwrite the existing lnk file and point it to existing files */ desc.description="test 2"; @@ -568,11 +574,6 @@ static void test_load_save(void) /* Create a temporary non-executable file */ r=GetTempPath(sizeof(mypath), mypath); ok(r<sizeof(mypath), "GetTempPath failed (%d), err %d\n", r, GetLastError()); - if (!pGetLongPathNameA) - { - skip("GetLongPathNameA is not available\n"); - goto cleanup; - } r=pGetLongPathNameA(mypath, mydir, sizeof(mydir)); ok(r<sizeof(mydir), "GetLongPathName failed (%d), err %d\n", r, GetLastError()); p=strrchr(mydir, '\\'); @@ -605,7 +606,6 @@ static void test_load_save(void) * represented as a path. */ -cleanup: /* DeleteFileW is not implemented on Win9x */ r=DeleteFileA("c:\\test.lnk"); ok(r, "failed to delete link (%d)\n", GetLastError());

1 0

Dan Kegel : fusion: UninstallAssembly test: Fix typo, avoid undefined value .
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: b8ad05a25fb572286b92f25e43db65e0d0175606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ad05a25fb572286b92f25e4… Author: Dan Kegel <dank(a)kegel.com> Date: Tue May 27 07:38:34 2008 -0700 fusion: UninstallAssembly test: Fix typo, avoid undefined value. --- dlls/fusion/tests/asmcache.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index a160b0a..a8900fd 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -918,10 +918,11 @@ static void test_InstallAssembly(void) ok(attr != INVALID_FILE_ATTRIBUTES, "Expected assembly to exist\n"); /* uninstall the assembly from the GAC */ + disp = 0xf00dbad; hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); todo_wine { - ok(hr == S_OK, "Expected S_OK, got %d\n", S_OK); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); }

1 0