April 2008 - Wine-commits - list.winehq.org

Andrew Talbot : netapi32: Remove unused variable.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 34480aef09a6aa840d93f5eb4325db22fcd15bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=34480aef09a6aa840d93f5eb4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:04:56 2008 +0100 netapi32: Remove unused variable. --- dlls/netapi32/wksta.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 1eb22d6..6914d02 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -348,7 +348,6 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, { PWKSTA_USER_INFO_1 ui; PWKSTA_USER_INFO_0 ui0; - DWORD dwSize; LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle; PPOLICY_ACCOUNT_DOMAIN_INFO DomainInfo; @@ -405,7 +404,6 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, oth_domains_sz * sizeof(WCHAR)); /* get data */ - dwSize = username_sz; lstrcpyW(ui->wkui1_username, ui0->wkui0_username); NetApiBufferFree(ui0);

1 0

Paul Vriens : gdi32/tests: Run tests on win9x again.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 55902e0ce0e80dd3b6c50a7fc85a4f2d28cfb43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=55902e0ce0e80dd3b6c50a7fc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Apr 22 20:47:29 2008 +0200 gdi32/tests: Run tests on win9x again. --- dlls/gdi32/tests/font.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 803994b..c627521 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -492,7 +492,7 @@ static void test_GetCharABCWidths(void) hfont = SelectObject(hdc, hfont); nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); - ok(nb == 1, "pGetGlyphIndicesW should have returned 1\n"); + ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = pGetCharABCWidthsI(NULL, 0, 1, glyphs, abc); ok(!ret, "GetCharABCWidthsI should have failed\n"); @@ -602,7 +602,7 @@ static void test_GetGlyphIndices(void) HFONT hOldFont; if (!pGetGlyphIndicesW) { - skip("GetGlyphIndices not available on platform\n"); + skip("GetGlyphIndicesW not available on platform\n"); return; } @@ -611,12 +611,12 @@ static void test_GetGlyphIndices(void) ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); flags |= GGI_MARK_NONEXISTING_GLYPHS; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndicesW should have returned a nonexistent char not %04x\n", glyphs[4]); flags = 0; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndices should have returned a %04x not %04x\n", + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", textm.tmDefaultChar, glyphs[4]); if(!is_font_installed("Tahoma")) @@ -633,14 +633,14 @@ static void test_GetGlyphIndices(void) ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); flags |= GGI_MARK_NONEXISTING_GLYPHS; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == 0xffff, "GetGlyphIndices should have returned 0xffff char not %04x\n", glyphs[4]); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok(glyphs[4] == 0xffff, "GetGlyphIndicesW should have returned 0xffff char not %04x\n", glyphs[4]); flags = 0; testtext[0] = textm.tmDefaultChar; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - todo_wine ok(glyphs[0] == 0, "GetGlyphIndices for tmDefaultChar should be 0 not %04x\n", glyphs[0]); - ok(glyphs[4] == 0, "GetGlyphIndices should have returned 0 not %04x\n", glyphs[4]); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + todo_wine ok(glyphs[0] == 0, "GetGlyphIndicesW for tmDefaultChar should be 0 not %04x\n", glyphs[0]); + ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); DeleteObject(SelectObject(hdc, hOldFont)); } @@ -1130,7 +1130,7 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count SetLastError(0xdeadbeef); ret = pGetGlyphIndicesW(hdc, unicode_buf, count, idx, 0); - ok(ret == count, "GetGlyphIndicesA error %u\n", GetLastError()); + ok(ret == count, "GetGlyphIndicesW error %u\n", GetLastError()); } else { @@ -1513,7 +1513,7 @@ static void test_negative_width(HDC hdc, const LOGFONTA *lf) hfont_prev = SelectObject(hdc, hfont); - ret = GetGlyphIndicesA(hdc, "x", 1, &idx, GGI_MARK_NONEXISTING_GLYPHS); + ret = pGetGlyphIndicesA(hdc, "x", 1, &idx, GGI_MARK_NONEXISTING_GLYPHS); if (ret == GDI_ERROR || idx == 0xffff) { SelectObject(hdc, hfont_prev);

1 0

Andrew Talbot : msvfw32: Remove unused variable.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 7b0c084e502238fad7fd2d5654b7a8b5678b3512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0c084e502238fad7fd2d565… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:04:49 2008 +0100 msvfw32: Remove unused variable. --- dlls/msvfw32/drawdib.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index 137716d..902f0ca 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -458,7 +458,6 @@ HPALETTE VFWAPI DrawDibGetPalette(HDRAWDIB hdd) UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground) { WINE_HDD *whdd; - HPALETTE oldPal; UINT ret = 0; FIXME("(%p, %p, %d), stub\n", hdd, hdc, fBackground); @@ -475,7 +474,7 @@ UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground) if (!whdd->hpal) whdd->hpal = CreateHalftonePalette(hdc); - oldPal = SelectPalette(hdc, whdd->hpal, fBackground); + SelectPalette(hdc, whdd->hpal, fBackground); ret = RealizePalette(hdc); out:

1 0

Andrew Talbot : msvcrt: Remove unused variable.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: bacd4516d69dff48943caa4d0a1875bc4828719a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bacd4516d69dff48943caa4d0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:04:43 2008 +0100 msvcrt: Remove unused variable. --- dlls/msvcrt/undname.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 16991eb..93030b2 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -893,7 +893,6 @@ static BOOL handle_data(struct parsed_symbol* sym) struct datatype_t ct; char* name = NULL; BOOL ret = FALSE; - char dt; /* 0 private static * 1 protected static @@ -924,7 +923,7 @@ static BOOL handle_data(struct parsed_symbol* sym) name = get_class_string(sym, 0); - switch (dt = *sym->current++) + switch (*sym->current++) { case '0': case '1': case '2': case '3': case '4': case '5':

1 0

Andrew Talbot : oleaut32: Remove unused variables.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: ba742868e50244e300c2c0a5f7d21ce2adcd04bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba742868e50244e300c2c0a5f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:05:10 2008 +0100 oleaut32: Remove unused variables. --- dlls/oleaut32/typelib.c | 15 +++++++-------- dlls/oleaut32/varformat.c | 2 -- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 123810b..4c710c6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2024,7 +2024,6 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL, int offset) { - int j; TLBRefType *ref; TRACE_(typelib)("TLB context %p, TLB offset %x\n", pcx, offset); @@ -2046,7 +2045,7 @@ static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL, MSFT_ReadLEDWords(&impinfo, sizeof(impinfo), pcx, pcx->pTblDir->pImpInfo.offset + (offset & 0xfffffffc)); - for(j=0;pImpLib;j++){ /* search the known offsets of all import libraries */ + while (pImpLib){ /* search the known offsets of all import libraries */ if(pImpLib->offset==impinfo.oImpFile) break; pImpLib=pImpLib->next; } @@ -3284,7 +3283,7 @@ static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, SLTG_TypeInfoTail *pTITail) { - char *pFirstItem, *pNextItem; + char *pFirstItem; sltg_ref_lookup_t *ref_lookup = NULL; if(pTIHeader->href_table != 0xffffffff) { @@ -3292,10 +3291,10 @@ static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI, pNameTable); } - pFirstItem = pNextItem = pBlk; + pFirstItem = pBlk; if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) { - pNextItem = SLTG_DoImpls(pFirstItem, pTI, FALSE, ref_lookup); + SLTG_DoImpls(pFirstItem, pTI, FALSE, ref_lookup); } HeapFree(GetProcessHeap(), 0, ref_lookup); } @@ -3305,7 +3304,7 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, const SLTG_TypeInfoTail *pTITail) { - char *pFirstItem, *pNextItem; + char *pFirstItem; sltg_ref_lookup_t *ref_lookup = NULL; if(pTIHeader->href_table != 0xffffffff) { @@ -3313,10 +3312,10 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI, pNameTable); } - pFirstItem = pNextItem = pBlk; + pFirstItem = pBlk; if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) { - pNextItem = SLTG_DoImpls(pFirstItem, pTI, TRUE, ref_lookup); + SLTG_DoImpls(pFirstItem, pTI, TRUE, ref_lookup); } if (pTITail->funcs_off != 0xffff) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 399009c..3b35d38 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -522,7 +522,6 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, FMT_HEADER *header = (FMT_HEADER*)rgbTok; FMT_STRING_HEADER *str_header = (FMT_STRING_HEADER*)(rgbTok + sizeof(FMT_HEADER)); FMT_NUMBER_HEADER *num_header = (FMT_NUMBER_HEADER*)str_header; - FMT_DATE_HEADER *date_header = (FMT_DATE_HEADER*)str_header; BYTE* pOut = rgbTok + sizeof(FMT_HEADER) + sizeof(FMT_STRING_HEADER); BYTE* pLastHours = NULL; BYTE fmt_number = 0; @@ -591,7 +590,6 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, header->starts[fmt_number] = pOut - rgbTok; str_header = (FMT_STRING_HEADER*)pOut; num_header = (FMT_NUMBER_HEADER*)pOut; - date_header = (FMT_DATE_HEADER*)pOut; memset(str_header, 0, sizeof(FMT_STRING_HEADER)); pOut += sizeof(FMT_STRING_HEADER); fmt_state = 0;

1 0

Jeff Latimer : user32/tests: Fix typedefs & function definitions so that the code compiles in visual C++ 2005 .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 41e757c812e5a2abd22839475451eda63b9e1964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e757c812e5a2abd22839475… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Apr 22 23:49:42 2008 +1000 user32/tests: Fix typedefs & function definitions so that the code compiles in visual C++ 2005. --- dlls/user32/tests/broadcast.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 5806ed9..67e767e 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -32,8 +32,8 @@ #include "wine/test.h" -typedef LONG WINAPI (*PBROADCAST)( DWORD,LPDWORD,UINT,WPARAM,LPARAM ); -typedef LONG WINAPI (*PBROADCASTEX)( DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO ); +typedef LONG (WINAPI *PBROADCAST)( DWORD,LPDWORD,UINT,WPARAM,LPARAM ); +typedef LONG (WINAPI *PBROADCASTEX)( DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO ); static PBROADCAST pBroadcastA; static PBROADCAST pBroadcastW; static PBROADCASTEX pBroadcastExA; @@ -249,8 +249,8 @@ static void test_parametersEx(PBROADCASTEX broadcastex) PulseEvent(hevent); } -static BOOL WINAPI (*pOpenProcessToken)(HANDLE, DWORD, HANDLE*); -static BOOL WINAPI (*pAdjustTokenPrivileges)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD); +static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, HANDLE*); +static BOOL (WINAPI *pAdjustTokenPrivileges)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD); static void test_noprivileges(void) {

1 0

Frans Kool : start: Fixed Dutch translations.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 30a00e8dfd605d7e8d6b8d8e4566a3c27ded39a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a00e8dfd605d7e8d6b8d8e4… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Tue Apr 22 15:44:59 2008 +0200 start: Fixed Dutch translations. --- programs/start/Nl.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/start/Nl.rc b/programs/start/Nl.rc index 14c0355..d6202b3 100644 --- a/programs/start/Nl.rc +++ b/programs/start/Nl.rc @@ -2,6 +2,7 @@ * Start (Dutch resources) * * Copyright 2003 Hans Leidekker + * Copyright 2008 Frans Kool * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ Options: \n\ /MAX[imized] Start het programma gemaximaliseerd. \n\ /R[estored] Start het programma normaal (noch geminimaliseerd noch gemaximaliseerd). \n\ /W[ait] Wacht totdat het gestarte programma is be�indigd, eindig dan met de exit code van dat programma. \n\ +/Unix Gebruik een Unix bestandsnaam en start het bestand als de windows verkenner. \n\ /L Laat de gebruikerslicentie zien. \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ @@ -59,4 +61,6 @@ See the COPYING.LIB file for license information. \n\ " STRING_EXECFAIL "Programma kan niet worden gestart, of er is geen programma verbonden met het opgegeven bestand.\nShellExecuteEx is mislukt" + +STRING_UNIXFAIL "Kon de opgegeven Unix bestandsnaam niet omzetten naar een DOS bestandsnaam." }

1 0

Joris Huizer : mshtml: Fixed copy/paste mistake.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 1a0bf043bc6cdf37eab345ab266a771498250453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0bf043bc6cdf37eab345ab2… Author: Joris Huizer <jorishuizer(a)debian> Date: Tue Apr 22 16:27:32 2008 +0200 mshtml: Fixed copy/paste mistake. --- dlls/mshtml/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0bb2ebf..425fb39 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1361,7 +1361,7 @@ static ULONG WINAPI DocDispatchEx_Release(IDispatchEx *iface) { HTMLDocument *This = DISPEX_THIS(iface); - return IHTMLWindow2_AddRef(HTMLDOC(This)); + return IHTMLWindow2_Release(HTMLDOC(This)); } static HRESULT WINAPI DocDispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo)

1 0

ByeongSik Jeon : shdoclc: Update Korean translation.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: fcbc9fad96912fe47eb0473500618cca679aff4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcbc9fad96912fe47eb047350… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:43:56 2008 +0900 shdoclc: Update Korean translation. --- dlls/shdoclc/Ko.rc | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shdoclc/Ko.rc b/dlls/shdoclc/Ko.rc index dde528b..d038994 100644 --- a/dlls/shdoclc/Ko.rc +++ b/dlls/shdoclc/Ko.rc @@ -18,7 +18,18 @@ */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_MESSAGE_BOX_TITLE, "Wine ��ͳ� Explorer" +} + +STRINGTABLE DISCARDABLE +{ + IDS_PRINT_HEADER_TEMPLATE "&w&bPage &p" /* FIXME: should be "&w&bPage &p of &P" */ + IDS_PRINT_FOOTER_TEMPLATE "&u&b&d" +} IDR_BROWSE_CONTEXT_MENU MENU {

1 0

Erik de Castro Lopo : include: Fix "warning: cast from pointer to integer of different size".
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: fc9f8dac17282f8f56d1d0fcb2209837dfb304be URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc9f8dac17282f8f56d1d0fcb… Author: Erik de Castro Lopo <mle+win(a)mega-nerd.com> Date: Tue Apr 22 22:24:41 2008 +1000 include: Fix "warning: cast from pointer to integer of different size". --- include/wine/list.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index b018a1f..b610e5e 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -225,6 +225,6 @@ static inline void list_move_head( struct list *dst, struct list *src ) /* get pointer to object containing list element */ #define LIST_ENTRY(elem, type, field) \ - ((type *)((char *)(elem) - (unsigned int)(&((type *)0)->field))) + ((type *)((char *)(elem) - (unsigned long)(&((type *)0)->field))) #endif /* __WINE_SERVER_LIST_H */

1 0