January 2009 - Wine-Commits

Michael Stefaniuc : dbghelp: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 3c3a9b50812a4e2ca967e1158f286a4e4bab059b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3a9b50812a4e2ca967e1158… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 19 10:24:06 2009 +0100 dbghelp: Remove superfluous pointer casts. --- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/minidump.c | 8 ++++---- dlls/dbghelp/msc.c | 6 +++--- dlls/dbghelp/path.c | 10 +++++----- dlls/dbghelp/pe_module.c | 2 +- dlls/dbghelp/symbol.c | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 3667c67..44e2cad 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -72,7 +72,7 @@ static void dump(const void* ptr, unsigned len) int i, j; BYTE msg[128]; static const char hexof[] = "0123456789abcdef"; - const BYTE* x = (const BYTE*)ptr; + const BYTE* x = ptr; for (i = 0; i < len; i += 16) { diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 0419bc8..da0632a 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -282,13 +282,13 @@ static BOOL add_module(struct dump_context* dc, const WCHAR* name, static BOOL WINAPI fetch_pe_module_info_cb(PCWSTR name, DWORD64 base, ULONG size, PVOID user) { - struct dump_context* dc = (struct dump_context*)user; + struct dump_context* dc = user; IMAGE_NT_HEADERS nth; if (!validate_addr64(base)) return FALSE; if (pe_load_nt_header(dc->hProcess, base, &nth)) - add_module((struct dump_context*)user, name, base, size, + add_module(user, name, base, size, nth.FileHeader.TimeDateStamp, nth.OptionalHeader.CheckSum, FALSE); return TRUE; @@ -302,7 +302,7 @@ static BOOL WINAPI fetch_pe_module_info_cb(PCWSTR name, DWORD64 base, ULONG size static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base, void* user) { - struct dump_context* dc = (struct dump_context*)user; + struct dump_context* dc = user; DWORD rbase, size, checksum; /* FIXME: there's no relevant timestamp on ELF modules */ @@ -971,7 +971,7 @@ BOOL WINAPI MiniDumpReadDumpStream(PVOID base, ULONG str_idx, PMINIDUMP_DIRECTORY* pdir, PVOID* stream, ULONG* size) { - MINIDUMP_HEADER* mdHead = (MINIDUMP_HEADER*)base; + MINIDUMP_HEADER* mdHead = base; if (mdHead->Signature == MINIDUMP_SIGNATURE) { diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 564e745..f894afb 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -71,7 +71,7 @@ static void dump(const void* ptr, unsigned len) unsigned int i, j; char msg[128]; const char* hexof = "0123456789abcdef"; - const BYTE* x = (const BYTE*)ptr; + const BYTE* x = ptr; for (i = 0; i < len; i += 16) { @@ -2150,7 +2150,7 @@ static void pdb_convert_symbol_file(const PDB_SYMBOLS* symbols, { if (symbols->version < 19970000) { - const PDB_SYMBOL_FILE *sym_file = (const PDB_SYMBOL_FILE*)image; + const PDB_SYMBOL_FILE *sym_file = image; memset(sfile, 0, sizeof(*sfile)); sfile->file = sym_file->file; sfile->range.index = sym_file->range.index; @@ -2385,7 +2385,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, imp = (const PDB_SYMBOL_IMPORT*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) + symbols->module_size + symbols->offset_size + symbols->hash_size + symbols->srcmodule_size); - first = (const char*)imp; + first = imp; last = (const char*)imp + symbols->pdbimport_size; while (imp < (const PDB_SYMBOL_IMPORT*)last) { diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index e0cfc97..6af51d0 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -234,7 +234,7 @@ static BOOL do_searchW(PCWSTR file, PWSTR buffer, BOOL recurse, strcpyW(buffer + pos, fd.cFileName); if (recurse && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) found = do_searchW(file, buffer, TRUE, cb, user); - else if (SymMatchFileNameW(buffer, (WCHAR*)file, NULL, NULL)) + else if (SymMatchFileNameW(buffer, file, NULL, NULL)) { if (!cb || cb(buffer, user)) found = TRUE; } @@ -340,13 +340,13 @@ struct sffip */ static BOOL CALLBACK sffip_cb(PCWSTR buffer, PVOID user) { - struct sffip* s = (struct sffip*)user; + struct sffip* s = user; if (!s->cb) return TRUE; /* yes, EnumDirTree/do_search and SymFindFileInPath callbacks use the opposite * convention to stop/continue enumeration. sigh. */ - return !(s->cb)((WCHAR*)buffer, s->user); + return !(s->cb)(buffer, s->user); } /****************************************************************** @@ -461,7 +461,7 @@ struct module_find */ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) { - struct module_find* mf = (struct module_find*)user; + struct module_find* mf = user; DWORD size, checksum, timestamp; unsigned matched = 0; @@ -580,7 +580,7 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) if ((mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL) { const IMAGE_SEPARATE_DEBUG_HEADER* hdr; - hdr = (const IMAGE_SEPARATE_DEBUG_HEADER*)mapping; + hdr = mapping; if (hdr->Signature == IMAGE_SEPARATE_DEBUG_SIGNATURE) { diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index a79396f..4e77790 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -435,7 +435,7 @@ PVOID WINAPI ImageDirectoryEntryToDataEx( PVOID base, BOOLEAN image, USHORT dir, *size = nt->OptionalHeader.DataDirectory[dir].Size; if (image || addr < nt->OptionalHeader.SizeOfHeaders) return (char *)base + addr; - return RtlImageRvaToVa( nt, (HMODULE)base, addr, section ); + return RtlImageRvaToVa( nt, base, addr, section ); } /*********************************************************************** diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 280666d..4df69d1 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1046,7 +1046,7 @@ struct sym_enumerate static BOOL CALLBACK sym_enumerate_cb(PSYMBOL_INFO syminfo, ULONG size, void* ctx) { - struct sym_enumerate* se = (struct sym_enumerate*)ctx; + struct sym_enumerate* se = ctx; return (se->cb)(syminfo->Name, syminfo->Address, syminfo->Size, se->ctx); } @@ -1073,7 +1073,7 @@ struct sym_enumerate64 static BOOL CALLBACK sym_enumerate_cb64(PSYMBOL_INFO syminfo, ULONG size, void* ctx) { - struct sym_enumerate64* se = (struct sym_enumerate64*)ctx; + struct sym_enumerate64* se = ctx; return (se->cb)(syminfo->Name, syminfo->Address, syminfo->Size, se->ctx); } @@ -1473,7 +1473,7 @@ BOOL WINAPI SymGetLinePrev(HANDLE hProcess, PIMAGEHLP_LINE Line) if (!module_get_debug(&pair)) return FALSE; if (Line->Key == 0) return FALSE; - li = (struct line_info*)Line->Key; + li = Line->Key; /* things are a bit complicated because when we encounter a DLIT_SOURCEFILE * element we have to go back until we find the prev one to get the real * source file name for the DLIT_OFFSET element just before @@ -1523,7 +1523,7 @@ BOOL symt_get_func_line_next(const struct module* module, PIMAGEHLP_LINE line) struct line_info* li; if (line->Key == 0) return FALSE; - li = (struct line_info*)line->Key; + li = line->Key; while (!li->is_last) { li++;

1 0

Michael Stefaniuc : winex11.drv: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: a2187cad1fb90180d4a9f97cff99bf15cc6f7991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2187cad1fb90180d4a9f97cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 19 10:23:40 2009 +0100 winex11.drv: Remove superfluous pointer casts. --- dlls/winex11.drv/dib.c | 8 ++++---- dlls/winex11.drv/ime.c | 2 +- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/opengl.c | 14 +++++++------- dlls/winex11.drv/x11ddraw.c | 4 ++-- dlls/winex11.drv/xdnd.c | 6 +++--- dlls/winex11.drv/xfont.c | 2 +- dlls/winex11.drv/xim.c | 4 ++-- dlls/winex11.drv/xrender.c | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 6a0b5c1..4af4336 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -352,7 +352,7 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping, { if (quads) { - const RGBQUAD * rgb = (const RGBQUAD *)colorPtr; + const RGBQUAD * rgb = colorPtr; if (depth == 1) /* Monochrome */ { @@ -376,7 +376,7 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping, } else { - const RGBTRIPLE * rgb = (const RGBTRIPLE *)colorPtr; + const RGBTRIPLE * rgb = colorPtr; if (depth == 1) /* Monochrome */ { @@ -401,7 +401,7 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping, } else /* DIB_PAL_COLORS */ { - const WORD * index = (const WORD *)colorPtr; + const WORD * index = colorPtr; for (i = start; i < end; i++, index++) colorMapping[i] = X11DRV_PALETTE_ToPhysical( physDev, PALETTEINDEX(*index) ); @@ -4102,7 +4102,7 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start int num_colors = 1 << descr.infoBpp, i; RGBQUAD *rgb; COLORREF colref; - WORD *index = (WORD*)colorPtr; + WORD *index = colorPtr; descr.colorMap = rgb = HeapAlloc(GetProcessHeap(), 0, num_colors * sizeof(RGBQUAD)); for(i = 0; i < num_colors; i++, rgb++, index++) { colref = X11DRV_PALETTE_ToLogical(X11DRV_PALETTE_ToPhysical(physDev, PALETTEINDEX(*index))); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 6ca3f9e..87d4faa 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -109,7 +109,7 @@ static LPINPUTCONTEXT LockRealIMC(HIMC hIMC) { HIMC real_imc = RealIMC(hIMC); if (real_imc) - return (LPINPUTCONTEXT)ImmLockIMC(real_imc); + return ImmLockIMC(real_imc); else return NULL; } diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 8b7aca0..480486f 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -334,7 +334,7 @@ INT CDECL X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, L case X11DRV_SET_DRAWABLE: if (in_count >= sizeof(struct x11drv_escape_set_drawable)) { - const struct x11drv_escape_set_drawable *data = (const struct x11drv_escape_set_drawable *)in_data; + const struct x11drv_escape_set_drawable *data = in_data; if(physDev->xrender) X11DRV_XRender_UpdateDrawable( physDev ); physDev->dc_rect = data->dc_rect; physDev->drawable = data->drawable; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5d34fad..2aa5afa 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1923,7 +1923,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD if (GetGlyphOutline_ptr(hdc, glyph, GGO_BITMAP, &gm, size, bitmap, NULL) == GDI_ERROR) goto error; if (TRACE_ON(wgl)) { unsigned int height, width, bitmask; - unsigned char *bitmap_ = (unsigned char *) bitmap; + unsigned char *bitmap_ = bitmap; TRACE(" - bbox : %d x %d\n", gm.gmBlackBoxX, gm.gmBlackBoxY); TRACE(" - origin : (%d , %d)\n", gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y); @@ -2374,7 +2374,7 @@ create_failed: */ static GLboolean WINAPI X11DRV_wglDestroyPbufferARB(HPBUFFERARB hPbuffer) { - Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer; + Wine_GLPBuffer* object = hPbuffer; TRACE("(%p)\n", hPbuffer); if (NULL == object) { SetLastError(ERROR_INVALID_HANDLE); @@ -2397,7 +2397,7 @@ static GLboolean WINAPI X11DRV_wglDestroyPbufferARB(HPBUFFERARB hPbuffer) */ HDC CDECL X11DRV_wglGetPbufferDCARB(X11DRV_PDEVICE *physDev, HPBUFFERARB hPbuffer) { - Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer; + Wine_GLPBuffer* object = hPbuffer; if (NULL == object) { SetLastError(ERROR_INVALID_HANDLE); return NULL; @@ -2421,7 +2421,7 @@ HDC CDECL X11DRV_wglGetPbufferDCARB(X11DRV_PDEVICE *physDev, HPBUFFERARB hPbuffe */ static GLboolean WINAPI X11DRV_wglQueryPbufferARB(HPBUFFERARB hPbuffer, int iAttribute, int *piValue) { - Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer; + Wine_GLPBuffer* object = hPbuffer; TRACE("(%p, 0x%x, %p)\n", hPbuffer, iAttribute, piValue); if (NULL == object) { SetLastError(ERROR_INVALID_HANDLE); @@ -2564,7 +2564,7 @@ static int WINAPI X11DRV_wglReleasePbufferDCARB(HPBUFFERARB hPbuffer, HDC hdc) */ static GLboolean WINAPI X11DRV_wglSetPbufferAttribARB(HPBUFFERARB hPbuffer, const int *piAttribList) { - Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer; + Wine_GLPBuffer* object = hPbuffer; GLboolean ret = GL_FALSE; WARN("(%p, %p): alpha-testing, report any problem\n", hPbuffer, piAttribList); @@ -2956,7 +2956,7 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribfvARB(HDC hdc, int iPixelF */ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuffer) { - Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer; + Wine_GLPBuffer* object = hPbuffer; GLboolean ret = GL_FALSE; TRACE("(%p, %d)\n", hPbuffer, iBuffer); @@ -3051,7 +3051,7 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf */ static GLboolean WINAPI X11DRV_wglReleaseTexImageARB(HPBUFFERARB hPbuffer, int iBuffer) { - Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer; + Wine_GLPBuffer* object = hPbuffer; GLboolean ret = GL_FALSE; TRACE("(%p, %d)\n", hPbuffer, iBuffer); diff --git a/dlls/winex11.drv/x11ddraw.c b/dlls/winex11.drv/x11ddraw.c index 223659f..ae5e865 100644 --- a/dlls/winex11.drv/x11ddraw.c +++ b/dlls/winex11.drv/x11ddraw.c @@ -375,7 +375,7 @@ INT X11DRV_DCICommand(INT cbInput, const DCICMD *lpCmd, LPVOID lpOutData) return TRUE; case DDVERSIONINFO: { - LPDDVERSIONDATA lpVer = (LPDDVERSIONDATA)lpOutData; + LPDDVERSIONDATA lpVer = lpOutData; ddraw_ver = lpCmd->dwParam1; if (!lpVer) break; /* well, whatever... the DDK says so */ @@ -396,7 +396,7 @@ INT X11DRV_DCICommand(INT cbInput, const DCICMD *lpCmd, LPVOID lpOutData) return TRUE; case DDCREATEDRIVEROBJECT: { - LPDWORD lpInstance = (LPDWORD)lpOutData; + LPDWORD lpInstance = lpOutData; /* FIXME: get x11drv's hInstance */ X11DRV_Settings_CreateDriver(&hal_info); diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 1422578..954284f 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -355,7 +355,7 @@ static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int */ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) { - char *uriList = (char*) data; + char *uriList = data; char *uri; WCHAR *path; @@ -444,7 +444,7 @@ static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len) char* dostext; /* Always supply plain text */ - X11DRV_XDND_UnixToDos(&dostext, (char*)data, len); + X11DRV_XDND_UnixToDos(&dostext, data, len); X11DRV_XDND_InsertXDNDData(property, CF_TEXT, dostext, strlen(dostext)); TRACE("CF_TEXT (%d): %s\n", CF_TEXT, dostext); @@ -494,7 +494,7 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) if (current != NULL) { - DROPFILES *lpDrop = (DROPFILES*) current->data; + DROPFILES *lpDrop = current->data; if (lpDrop) { diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 16d7406..16409c5 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -421,7 +421,7 @@ static UINT16 __lfCheckSum( const LOGFONT16 *plf ) static UINT16 __genericCheckSum( const void *ptr, int size ) { unsigned int checksum = 0; - const char *p = (const char *)ptr; + const char *p = ptr; while (size-- > 0) checksum ^= (checksum << 3) + (checksum >> 29) + *p++; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 7c3c9d1..5c30d5b 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -154,7 +154,7 @@ static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset, } } - rc = IME_SetCompositionString(SCS_SETSTR, (LPWSTR)CompositionString, + rc = IME_SetCompositionString(SCS_SETSTR, CompositionString, dwCompStringLength, NULL, 0); } else if ((dwIndex == GCS_RESULTSTR) && (lpComp) && (dwCompLen)) @@ -165,7 +165,7 @@ static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset, ResultString= HeapAlloc(GetProcessHeap(),0,byte_length); memcpy(ResultString,lpComp,byte_length); - rc = IME_SetCompositionString(SCS_SETSTR, (LPWSTR)ResultString, + rc = IME_SetCompositionString(SCS_SETSTR, ResultString, dwResultStringSize, NULL, 0); IME_NotifyIME( NI_COMPOSITIONSTR, CPS_COMPLETE, 0); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 596d9f0..fd405be 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1081,7 +1081,7 @@ static void SmoothGlyphGray(XImage *image, int x, int y, void *bitmap, XGlyphInf width = gi->width; height = gi->height; - maskLine = (unsigned char *) bitmap; + maskLine = bitmap; maskStride = (width + 3) & ~3; ExamineBitfield (image->red_mask, &r_shift, &r_len);

1 0

Michael Stefaniuc : crypt32: Remove some superfluous pointer casts.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 14b136ca4352fe66a439fc0bb3ec55d5ffe786a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b136ca4352fe66a439fc0bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 19 10:23:15 2009 +0100 crypt32: Remove some superfluous pointer casts. --- dlls/crypt32/decode.c | 142 +++++++++++++++++++++++------------------------- 1 files changed, 68 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14b136ca4352fe66a439f…

1 0

Nikolay Sivov : include/msiquery.h: Fix MSIMODIFY enum definition.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 61808b16892c2df630e75142df9f155b7a63bd01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61808b16892c2df630e75142d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jan 19 00:11:44 2009 +0300 include/msiquery.h: Fix MSIMODIFY enum definition. --- include/msiquery.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/msiquery.h b/include/msiquery.h index fa42f17..6a1bfa4 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -47,6 +47,7 @@ typedef enum tagMSICOSTTREE typedef enum tagMSIMODIFY { + MSIMODIFY_SEEK = -1, MSIMODIFY_REFRESH = 0, MSIMODIFY_INSERT = 1, MSIMODIFY_UPDATE = 2,

1 0

Jeff Latimer : user32/tests: Resend: Fix test to work on Vista.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: be027eeb2885d8398c8cb42ab4a784f2e106d94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be027eeb2885d8398c8cb42ab… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Jan 18 11:46:53 2009 +1100 user32/tests: Resend: Fix test to work on Vista. --- dlls/user32/tests/dde.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index f1d6388..1d14df6 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2257,8 +2257,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV size, msg_index); else if (msg_index ==22) - todo_wine - ok(size == 9, "Expected that size should be 9 not %d, msg_index=%d\n", + ok(size == 8 || size == 9, "Expected that size should be 8 or 9 not %d, msg_index=%d\n", size, msg_index); else if (msg_index == 5)

1 0

Ge van Geldorp : user32/tests: Save iSmCaptionWidth for later testing.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: df0168d8ebb9365de841f05864f1d033d647d2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0168d8ebb9365de841f0586… Author: Ge van Geldorp <ge(a)gse.nl> Date: Sun Jan 18 01:00:32 2009 +0100 user32/tests: Save iSmCaptionWidth for later testing. --- dlls/user32/tests/sysparams.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index cf228e0..27d8ea4 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1353,6 +1353,7 @@ static int get_tmheight( LOGFONTA *plf, int flag) } static void test_GetSystemMetrics( void); +static UINT smcxsmsize = 999999999; static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ { @@ -1374,6 +1375,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ if (!test_error_msg(rc,"SPI_{GET,SET}NONCLIENTMETRICS")) return; Ncmstart = Ncmorig; + smcxsmsize = Ncmstart.iSmCaptionWidth; /* SPI_GETNONCLIENTMETRICS returns some "cooked" values. For instance if the caption font height is higher than the CaptionHeight field, the latter is adjusted accordingly. To be able to restore these setting @@ -2437,7 +2439,6 @@ static void get_text_metr_size( HDC hdc, LOGFONTA *plf, TEXTMETRICA * ptm, UINT } static int gsm_error_ctr; -static UINT smcxsmsize = 999999999; #define ok_gsm( i, e)\ {\

1 0

Michael Stefaniuc : view: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 59360ced973fde7ef007c0e55659cfe34f16b348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59360ced973fde7ef007c0e55… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 17 22:56:30 2009 +0100 view: Remove superfluous pointer casts. --- programs/view/view.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index e28901d..aba4c79 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -76,7 +76,7 @@ static HMETAFILE GetPlaceableMetaFile( HWND hwnd, LPCSTR szFileName ) if( (fh = _lopen( szFileName, OF_READ ) ) == HFILE_ERROR ) return 0; _llseek(fh, 0, 0); - if (!_lread(fh, (LPSTR)&APMHeader, sizeof(APMFILEHEADER))) return 0; + if (!_lread(fh, &APMHeader, sizeof(APMFILEHEADER))) return 0; _llseek(fh, sizeof(APMFILEHEADER), 0); checksum = 0; p = (WORD *) &APMHeader; @@ -91,14 +91,14 @@ static HMETAFILE GetPlaceableMetaFile( HWND hwnd, LPCSTR szFileName ) return 0; } - if (!_lread(fh, (LPSTR)&mfHeader, sizeof(METAHEADER))) return 0; + if (!_lread(fh, &mfHeader, sizeof(METAHEADER))) return 0; if (!(lpData = GlobalAlloc(GPTR, (mfHeader.mtSize * 2L)))) return 0; _llseek(fh, sizeof(APMFILEHEADER), 0); if (!_lread(fh, lpData, (UINT)(mfHeader.mtSize * 2L))) { - GlobalFree((HGLOBAL)lpData); + GlobalFree(lpData); _lclose(fh); return 0; }

1 0

Damjan Jovanovic : shlwapi: Support the content type query.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: c160b944b1a15de2018581394fe459c04ce39121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c160b944b1a15de2018581394… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Jan 18 14:25:08 2009 +0200 shlwapi: Support the content type query. --- dlls/shlwapi/assoc.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index b619518..070ca1a 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -825,6 +825,32 @@ get_friendly_name_fail: return ASSOC_ReturnData(pszOut, pcchOut, path, strlenW(path) + 1); } + case ASSOCSTR_CONTENTTYPE: + { + static const WCHAR Content_TypeW[] = {'C','o','n','t','e','n','t',' ','T','y','p','e',0}; + WCHAR *contentType; + DWORD ret; + DWORD size; + + size = 0; + ret = RegGetValueW(This->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, NULL, &size); + if (ret != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(ret); + contentType = HeapAlloc(GetProcessHeap(), 0, size); + if (contentType != NULL) + { + ret = RegGetValueW(This->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, contentType, &size); + if (ret == ERROR_SUCCESS) + hr = ASSOC_ReturnData(pszOut, pcchOut, contentType, strlenW(contentType) + 1); + else + hr = HRESULT_FROM_WIN32(ret); + HeapFree(GetProcessHeap(), 0, contentType); + } + else + hr = E_OUTOFMEMORY; + return hr; + } + default: FIXME("assocstr %d unimplemented!\n", str); return E_NOTIMPL;

1 0

Michael Stefaniuc : winemine: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 409fb90ab847899d4dcd6966f3e8a51380d3cf7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=409fb90ab847899d4dcd6966f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 17 22:56:57 2009 +0100 winemine: Remove superfluous pointer casts. --- programs/winemine/main.c | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index c757129..36e0fef 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -70,47 +70,46 @@ static void LoadBoard( BOARD *p_board ) 0, KEY_QUERY_VALUE, &hkey ); size = sizeof( p_board->pos.x ); - if( !RegQueryValueEx( hkey, "Xpos", NULL, (LPDWORD) &type, - (LPBYTE) &p_board->pos.x, (LPDWORD) &size ) == ERROR_SUCCESS ) + if( !RegQueryValueEx( hkey, "Xpos", NULL, &type, + (LPBYTE) &p_board->pos.x, &size ) == ERROR_SUCCESS ) p_board->pos.x = 0; size = sizeof( p_board->pos.y ); - if( !RegQueryValueEx( hkey, "Ypos", NULL, (LPDWORD) &type, - (LPBYTE) &p_board->pos.y, (LPDWORD) &size ) == ERROR_SUCCESS ) + if( !RegQueryValueEx( hkey, "Ypos", NULL, &type, + (LPBYTE) &p_board->pos.y, &size ) == ERROR_SUCCESS ) p_board->pos.y = 0; size = sizeof( p_board->rows ); - if( !RegQueryValueEx( hkey, "Height", NULL, (LPDWORD) &type, - (LPBYTE) &p_board->rows, (LPDWORD) &size ) == ERROR_SUCCESS ) + if( !RegQueryValueEx( hkey, "Height", NULL, &type, + (LPBYTE) &p_board->rows, &size ) == ERROR_SUCCESS ) p_board->rows = BEGINNER_ROWS; size = sizeof( p_board->cols ); - if( !RegQueryValueEx( hkey, "Width", NULL, (LPDWORD) &type, - (LPBYTE) &p_board->cols, (LPDWORD) &size ) == ERROR_SUCCESS ) + if( !RegQueryValueEx( hkey, "Width", NULL, &type, + (LPBYTE) &p_board->cols, &size ) == ERROR_SUCCESS ) p_board->cols = BEGINNER_COLS; size = sizeof( p_board->mines ); - if( !RegQueryValueEx( hkey, "Mines", NULL, (LPDWORD) &type, - (LPBYTE) &p_board->mines, (LPDWORD) &size ) == ERROR_SUCCESS ) + if( !RegQueryValueEx( hkey, "Mines", NULL, &type, + (LPBYTE) &p_board->mines, &size ) == ERROR_SUCCESS ) p_board->mines = BEGINNER_MINES; size = sizeof( p_board->difficulty ); - if( !RegQueryValueEx( hkey, "Difficulty", NULL, (LPDWORD) &type, - (LPBYTE) &p_board->difficulty, (LPDWORD) &size ) == ERROR_SUCCESS ) + if( !RegQueryValueEx( hkey, "Difficulty", NULL, &type, + (LPBYTE) &p_board->difficulty, &size ) == ERROR_SUCCESS ) p_board->difficulty = BEGINNER; size = sizeof( p_board->IsMarkQ ); - if( !RegQueryValueEx( hkey, "Mark", NULL, (LPDWORD) &type, - (LPBYTE) &p_board->IsMarkQ, (LPDWORD) &size ) == ERROR_SUCCESS ) + if( !RegQueryValueEx( hkey, "Mark", NULL, &type, + (LPBYTE) &p_board->IsMarkQ, &size ) == ERROR_SUCCESS ) p_board->IsMarkQ = TRUE; for( i = 0; i < 3; i++ ) { wsprintf( key_name, "Name%d", i+1 ); size = sizeof( data ); - if( RegQueryValueEx( hkey, key_name, NULL, (LPDWORD) &type, - (LPBYTE) data, - (LPDWORD) &size ) == ERROR_SUCCESS ) - lstrcpynA( p_board->best_name[i], data, sizeof(p_board->best_name[i]) ); + if( RegQueryValueEx( hkey, key_name, NULL, &type, + (LPBYTE) data, &size ) == ERROR_SUCCESS ) + lstrcpynA( p_board->best_name[i], data, sizeof(p_board->best_name[i]) ); else LoadString( p_board->hInst, IDS_NOBODY, p_board->best_name[i], MAX_PLAYER_NAME_SIZE+1 ); } @@ -118,9 +117,8 @@ static void LoadBoard( BOARD *p_board ) for( i = 0; i < 3; i++ ) { wsprintf( key_name, "Time%d", i+1 ); size = sizeof( p_board->best_time[i] ); - if( !RegQueryValueEx( hkey, key_name, NULL, (LPDWORD) &type, - (LPBYTE) &p_board->best_time[i], - (LPDWORD) &size ) == ERROR_SUCCESS ) + if( !RegQueryValueEx( hkey, key_name, NULL, &type, + (LPBYTE) &p_board->best_time[i], &size ) == ERROR_SUCCESS ) p_board->best_time[i] = 999; } RegCloseKey( hkey ); @@ -1023,7 +1021,7 @@ int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmd wc.hInstance = hInst; wc.hIcon = LoadIcon( hInst, "WINEMINE" ); wc.hCursor = LoadCursor( 0, IDI_APPLICATION ); - wc.hbrBackground = (HBRUSH) GetStockObject( BLACK_BRUSH ); + wc.hbrBackground = GetStockObject( BLACK_BRUSH ); wc.lpszMenuName = "MENU_WINEMINE"; wc.lpszClassName = appname;

1 0

Michael Stefaniuc : wordpad: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 688bdb645f950e3520d33de8177d2715e8531b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=688bdb645f950e3520d33de81… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 17 22:56:19 2009 +0100 wordpad: Remove superfluous pointer casts. --- programs/wordpad/print.c | 8 ++++---- programs/wordpad/wordpad.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index ee35d4a..2aa642f 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -95,7 +95,7 @@ static void AddTextButton(HWND hRebarWnd, UINT string, UINT command, UINT id) LoadStringW(hInstance, string, text, MAX_STRING_LEN); hButton = CreateWindowW(WC_BUTTONW, text, WS_VISIBLE | WS_CHILD, 5, 5, 100, 15, - hRebarWnd, (HMENU)ULongToHandle(command), hInstance, NULL); + hRebarWnd, ULongToHandle(command), hInstance, NULL); rb.cbSize = sizeof(rb); rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID; @@ -226,12 +226,12 @@ static LPWSTR dialog_print_to_file(HWND hMainWnd) ofn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; ofn.hwndOwner = hMainWnd; ofn.lpstrFilter = file_filter; - ofn.lpstrFile = (LPWSTR)file; + ofn.lpstrFile = file; ofn.nMaxFile = MAX_PATH; - ofn.lpstrDefExt = (LPWSTR)defExt; + ofn.lpstrDefExt = defExt; if(GetSaveFileNameW(&ofn)) - return (LPWSTR)file; + return file; else return FALSE; } diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 251b6b4..0120d4e 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -301,7 +301,7 @@ static void on_sizelist_modified(HWND hwndSizeList, LPWSTR wszNewFontSize) if(lstrcmpW(sizeBuffer, wszNewFontSize)) { float size = 0; - if(number_from_string((LPCWSTR) wszNewFontSize, &size, FALSE) + if(number_from_string(wszNewFontSize, &size, FALSE) && size > 0) { set_size(size); @@ -322,7 +322,7 @@ static void add_size(HWND hSizeListWnd, unsigned size) cbItem.iItem = -1; wsprintfW(buffer, stringFormat, size); - cbItem.pszText = (LPWSTR)buffer; + cbItem.pszText = buffer; SendMessageW(hSizeListWnd, CBEM_INSERTITEMW, 0, (LPARAM)&cbItem); } @@ -494,7 +494,7 @@ static void on_fontlist_modified(LPWSTR wszNewFaceName) SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&format); if(lstrcmpW(format.szFaceName, wszNewFaceName)) - set_font((LPCWSTR) wszNewFaceName); + set_font(wszNewFaceName); } static void add_font(LPCWSTR fontName, DWORD fontType, HWND hListWnd, const NEWTEXTMETRICEXW *ntmc) @@ -1412,11 +1412,11 @@ static INT_PTR CALLBACK newfile_proc(HWND hWnd, UINT message, WPARAM wParam, LPA WCHAR buffer[MAX_STRING_LEN]; HWND hListWnd = GetDlgItem(hWnd, IDC_NEWFILE); - LoadStringW(hInstance, STRING_NEWFILE_RICHTEXT, (LPWSTR)buffer, MAX_STRING_LEN); + LoadStringW(hInstance, STRING_NEWFILE_RICHTEXT, buffer, MAX_STRING_LEN); SendMessageW(hListWnd, LB_ADDSTRING, 0, (LPARAM)&buffer); - LoadStringW(hInstance, STRING_NEWFILE_TXT, (LPWSTR)buffer, MAX_STRING_LEN); + LoadStringW(hInstance, STRING_NEWFILE_TXT, buffer, MAX_STRING_LEN); SendMessageW(hListWnd, LB_ADDSTRING, 0, (LPARAM)&buffer); - LoadStringW(hInstance, STRING_NEWFILE_TXT_UNICODE, (LPWSTR)buffer, MAX_STRING_LEN); + LoadStringW(hInstance, STRING_NEWFILE_TXT_UNICODE, buffer, MAX_STRING_LEN); SendMessageW(hListWnd, LB_ADDSTRING, 0, (LPARAM)&buffer); SendMessageW(hListWnd, LB_SETSEL, TRUE, 0);

1 0