November 2008 - Wine-Commits

Aric Stewart : ntdll: Fix parsing of proc file. Also correct memory deallocation on the Mac.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 1865c47ff8b39b475271866bed832c78e6ba4e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1865c47ff8b39b475271866be… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 31 15:17:17 2008 -0500 ntdll: Fix parsing of proc file. Also correct memory deallocation on the Mac. --- dlls/ntdll/nt.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a8365dc..5b0c0bf 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -938,7 +938,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( sppi[i].liKernelTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_SYSTEM]; sppi[i].liUserTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_USER]; } - vm_deallocate (mach_task_self (), (vm_address_t) pinfo, info_count); + vm_deallocate (mach_task_self (), (vm_address_t) pinfo, info_count * sizeof(natural_t)); } } #else @@ -950,10 +950,14 @@ NTSTATUS WINAPI NtQuerySystemInformation( unsigned long idle; int count; char name[10]; + char line[255]; /* first line is combined usage */ - count = fscanf(cpuinfo,"%s %u %u %u %lu",name, &usr, &nice, + if (fgets(line,255,cpuinfo)) + count = sscanf(line,"%s %u %u %u %lu",name, &usr, &nice, &sys, &idle); + else + count = 0; /* we set this up in the for older non-smp enabled kernels */ if (count == 5 && strcmp(name,"cpu")==0) { @@ -968,8 +972,11 @@ NTSTATUS WINAPI NtQuerySystemInformation( do { - count = fscanf(cpuinfo,"%s %u %u %u %lu",name, &usr, + if (fgets(line,255,cpuinfo)) + count = sscanf(line,"%s %u %u %u %lu",name, &usr, &nice, &sys, &idle); + else + count = 0; if (count == 5 && strncmp(name,"cpu",3)==0) { out_cpus --;

1 0

Alexandre Julliard : ntdll: Initialize the large address space before attaching dlls.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 4ee2d9d8eb7414ac20457e84bf91ccf52e102288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee2d9d8eb7414ac20457e84b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 3 13:23:27 2008 +0100 ntdll: Initialize the large address space before attaching dlls. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5d47b19..84dd18f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2419,12 +2419,12 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; if ((status = alloc_process_tls()) != STATUS_SUCCESS) goto error; if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error; + if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) VIRTUAL_UseLargeAddressSpace(); status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); if (status != STATUS_SUCCESS) goto error; virtual_clear_thread_stack(); - if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) VIRTUAL_UseLargeAddressSpace(); return; error:

1 0

Alexandre Julliard : ntdll: Return more correct information for SystemBasicInformation and GetSystemInfo .
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 3d6313c9ce6bb1ebe10f61223ba42ddf99075370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6313c9ce6bb1ebe10f61223… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 3 13:23:48 2008 +0100 ntdll: Return more correct information for SystemBasicInformation and GetSystemInfo. --- dlls/kernel32/cpu.c | 15 ++++++++------- dlls/ntdll/nt.c | 12 +----------- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/virtual.c | 19 +++++++++++++++++++ 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index a49df99..6f50009 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -367,6 +367,7 @@ VOID WINAPI GetSystemInfo( { static int cache = 0; static SYSTEM_INFO cachedsi; + SYSTEM_BASIC_INFORMATION sbi; TRACE("si=0x%p\n", si); if (cache) { @@ -375,19 +376,19 @@ VOID WINAPI GetSystemInfo( } memset(PF,0,sizeof(PF)); + NtQuerySystemInformation( SystemBasicInformation, &sbi, sizeof(sbi), NULL ); + cachedsi.dwPageSize = sbi.uPageSize; + cachedsi.lpMinimumApplicationAddress = sbi.pLowestUserAddress; + cachedsi.lpMaximumApplicationAddress = sbi.pMmHighestUserAddress; + cachedsi.dwNumberOfProcessors = sbi.uKeActiveProcessors; + cachedsi.dwAllocationGranularity = sbi.uAllocationGranularity; + /* choose sensible defaults ... * FIXME: perhaps overridable with precompiler flags? */ cachedsi.u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; - cachedsi.dwPageSize = getpagesize(); - - /* FIXME: the two entries below should be computed somehow... */ - cachedsi.lpMinimumApplicationAddress = (void *)0x00010000; - cachedsi.lpMaximumApplicationAddress = (void *)0x7FFEFFFF; cachedsi.dwActiveProcessorMask = 0; - cachedsi.dwNumberOfProcessors = 1; cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM; - cachedsi.dwAllocationGranularity = 0x10000; cachedsi.wProcessorLevel = 5; /* 586 */ cachedsi.wProcessorRevision = 0; diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5b0c0bf..37e3ee9 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -708,17 +708,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( { SYSTEM_BASIC_INFORMATION sbi; - sbi.dwUnknown1 = 0; - sbi.uKeMaximumIncrement = 0; - sbi.uPageSize = 1024; /* FIXME */ - sbi.uMmNumberOfPhysicalPages = 12345; /* FIXME */ - sbi.uMmLowestPhysicalPage = 0; /* FIXME */ - sbi.uMmHighestPhysicalPage = 12345; /* FIXME */ - sbi.uAllocationGranularity = 65536; /* FIXME */ - sbi.pLowestUserAddress = 0; /* FIXME */ - sbi.pMmHighestUserAddress = (void*)~0; /* FIXME */ - sbi.uKeActiveProcessors = 1; /* FIXME */ - sbi.bKeNumberProcessors = 1; /* FIXME */ + virtual_get_system_info( &sbi ); len = sizeof(sbi); if ( Length == len) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a8fcf63..beffd77 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -135,6 +135,7 @@ extern NTSTATUS DIR_get_unix_cwd( char **cwd ); extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] ); /* virtual memory */ +extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ); extern NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T stack_size ); extern void virtual_clear_thread_stack(void); extern BOOL virtual_handle_stack_fault( void *addr ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 50b794c..1a27bd1 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1234,6 +1234,25 @@ void virtual_init_threading(void) /*********************************************************************** + * virtual_get_system_info + */ +void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) +{ + info->dwUnknown1 = 0; + info->uKeMaximumIncrement = 0; /* FIXME */ + info->uPageSize = page_size; + info->uMmLowestPhysicalPage = 1; + info->uMmHighestPhysicalPage = 0x7fffffff / page_size; + info->uMmNumberOfPhysicalPages = info->uMmHighestPhysicalPage - info->uMmLowestPhysicalPage; + info->uAllocationGranularity = get_mask(0) + 1; + info->pLowestUserAddress = (void *)0x10000; + info->pMmHighestUserAddress = (char *)user_space_limit - 1; + info->uKeActiveProcessors = NtCurrentTeb()->Peb->NumberOfProcessors; + info->bKeNumberProcessors = info->uKeActiveProcessors; +} + + +/*********************************************************************** * virtual_alloc_thread_stack */ NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T size )

1 0

Michael Stefaniuc : winedump: Remove casts of void pointers to other pointer types.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 922a3360635fb3455552819d046d79118039a58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=922a3360635fb3455552819d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:20:49 2008 +0100 winedump: Remove casts of void pointers to other pointer types. --- tools/winedump/debug.c | 4 ++-- tools/winedump/emf.c | 8 ++++---- tools/winedump/minidump.c | 2 +- tools/winedump/misc.c | 6 +++--- tools/winedump/pe.c | 5 ++--- tools/winedump/search.c | 4 ++-- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 86ffd14..0920786 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -514,7 +514,7 @@ static const char *get_coff_name( const IMAGE_SYMBOL *coff_sym, const char *coff void dump_coff(unsigned long coffbase, unsigned long len, const void* pmt) { - const IMAGE_COFF_SYMBOLS_HEADER *coff = (const IMAGE_COFF_SYMBOLS_HEADER *)PRD(coffbase, len); + const IMAGE_COFF_SYMBOLS_HEADER *coff = PRD(coffbase, len); const IMAGE_SYMBOL *coff_sym; const IMAGE_SYMBOL *coff_symbols = (const IMAGE_SYMBOL *) ((const char *)coff + coff->LvaToFirstSymbol); @@ -592,7 +592,7 @@ void dump_frame_pointer_omission(unsigned long base, unsigned long len) printf("Range #loc #pmt Prlg #reg Info\n" "-----------------+----+----+----+----+------------\n"); - fpo = (const FPO_DATA*)PRD(base, len); + fpo = PRD(base, len); if (!fpo) {printf("Couldn't get FPO blob\n"); return;} last = (const FPO_DATA*)((const char*)fpo + len); diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index f3b6f50..a2ea1c7 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -115,7 +115,7 @@ static int dump_emfrecord(void) case EMR_INTERSECTCLIPRECT: { - const EMRINTERSECTCLIPRECT *clip = (const EMRINTERSECTCLIPRECT *)PRD(offset, sizeof(*clip)); + const EMRINTERSECTCLIPRECT *clip = PRD(offset, sizeof(*clip)); printf("%-20s %08x\n", "EMR_INTERSECTCLIPRECT", length); printf("rect %d,%d - %d, %d\n", @@ -170,7 +170,7 @@ static int dump_emfrecord(void) case EMR_EXTSELECTCLIPRGN: { - const EMREXTSELECTCLIPRGN *clip = (const EMREXTSELECTCLIPRGN *)PRD(offset, sizeof(*clip)); + const EMREXTSELECTCLIPRGN *clip = PRD(offset, sizeof(*clip)); const RGNDATA *data = (RGNDATA *)clip->RgnData; DWORD i, rc_count = 0; RECT *rc; @@ -195,7 +195,7 @@ static int dump_emfrecord(void) case EMR_EXTCREATEFONTINDIRECTW: { - const EMREXTCREATEFONTINDIRECTW *pf = (const EMREXTCREATEFONTINDIRECTW *)PRD(offset, sizeof(*pf)); + const EMREXTCREATEFONTINDIRECTW *pf = PRD(offset, sizeof(*pf)); const LOGFONTW *plf = &pf->elfw.elfLogFont; printf("%-20s %08x\n", "EMR_EXTCREATEFONTINDIRECTW", length); @@ -216,7 +216,7 @@ static int dump_emfrecord(void) case EMR_EXTTEXTOUTW: { - const EMREXTTEXTOUTW *etoW = (const EMREXTTEXTOUTW *)PRD(offset, sizeof(*etoW)); + const EMREXTTEXTOUTW *etoW = PRD(offset, sizeof(*etoW)); printf("%-20s %08x\n", "EMR_EXTTEXTOUTW", length); printf("pt (%d,%d) rect (%d,%d - %d,%d) flags %#x, %s\n", diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index b411c36..76aaa58 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -72,7 +72,7 @@ enum FileSig get_kind_mdmp(void) void mdmp_dump(void) { - const MINIDUMP_HEADER* hdr = (const MINIDUMP_HEADER*)PRD(0, sizeof(MINIDUMP_HEADER)); + const MINIDUMP_HEADER* hdr = PRD(0, sizeof(MINIDUMP_HEADER)); ULONG idx, ndir = 0; const MINIDUMP_DIRECTORY* dir; const void* stream; diff --git a/tools/winedump/misc.c b/tools/winedump/misc.c index 82e0bd8..17c35cc 100644 --- a/tools/winedump/misc.c +++ b/tools/winedump/misc.c @@ -41,7 +41,7 @@ char *str_create(size_t num_str, ...) len += strlen (t); va_end (args); - if (!(tmp = (char *) malloc (len))) + if (!(tmp = malloc (len))) fatal ("Out of memory"); tmp[0] = '\0'; @@ -72,7 +72,7 @@ char *str_create_num(size_t num_str, int num, ...) len += strlen (t); va_end (args); - if (!(tmp = (char *) malloc (len))) + if (!(tmp = malloc (len))) fatal ("Out of memory"); tmp[0] = '\0'; @@ -98,7 +98,7 @@ char *str_substring(const char *start, const char *end) assert (start && end && end > start); - if (!(newstr = (char *) malloc (end - start + 1))) + if (!(newstr = malloc (end - start + 1))) fatal ("Out of memory"); memcpy (newstr, start, end - start); diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 955d627..31a744e 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -664,7 +664,7 @@ static void dump_dir_delay_imported_functions(void) printf(" Ordn Name\n"); - il = (const IMAGE_THUNK_DATA32 *)RVA(importDesc->pINT - offset, sizeof(DWORD)); + il = RVA(importDesc->pINT - offset, sizeof(DWORD)); if (!il) printf("Can't grab thunk data, going to next imported DLL\n"); @@ -1321,8 +1321,7 @@ static void do_grab_sym( void ) /* dll_close(); */ - if (!(dll_symbols = (dll_symbol *) malloc((exportDir->NumberOfFunctions + 1) * - sizeof (dll_symbol)))) + if (!(dll_symbols = malloc((exportDir->NumberOfFunctions + 1) * sizeof(dll_symbol)))) fatal ("Out of memory"); if (exportDir->AddressOfFunctions != exportDir->NumberOfNames || exportDir->Base > 1) globals.do_ordinals = 1; diff --git a/tools/winedump/search.c b/tools/winedump/search.c index aa89fc9..2893697 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -50,10 +50,10 @@ int symbol_search (parsed_symbol *sym) return - 1; if (!grep_buff) - grep_buff = (char *) malloc (MAX_RESULT_LEN); + grep_buff = malloc (MAX_RESULT_LEN); if (!fgrep_buff) - fgrep_buff = (char *) malloc (MAX_RESULT_LEN); + fgrep_buff = malloc (MAX_RESULT_LEN); if (!grep_buff || !fgrep_buff) fatal ("Out of Memory");

1 0

Stefan Dösinger : d3d9: Test the effect of lighting on the result alpha.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 561ebb355fa549ec0d8982260c51cbb1a40cf73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=561ebb355fa549ec0d8982260… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 31 22:21:18 2008 +0100 d3d9: Test the effect of lighting on the result alpha. --- dlls/d3d9/tests/visual.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a622d56..dd59ef4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -222,6 +222,8 @@ static void lighting_test(IDirect3DDevice9 *device) DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; DWORD color; + D3DMATERIAL9 material, old_material; + DWORD cop, carg; float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, @@ -337,8 +339,77 @@ static void lighting_test(IDirect3DDevice9 *device) color = getPixelColor(device, 480, 120); /* upper left quad - lit with normals */ ok(color == 0x00000000, "Lit quad with normals has color %08x\n", color); + hr = IDirect3DDevice9_GetMaterial(device, &old_material); + ok(hr == D3D_OK, "IDirect3DDevice9_GetMaterial returned %08x\n", hr); + memset(&material, 0, sizeof(material)); + material.Diffuse.r = 0.0; + material.Diffuse.g = 0.0; + material.Diffuse.b = 0.0; + material.Diffuse.a = 1.0; + material.Ambient.r = 0.0; + material.Ambient.g = 0.0; + material.Ambient.b = 0.0; + material.Ambient.a = 0.0; + material.Specular.r = 0.0; + material.Specular.g = 0.0; + material.Specular.b = 0.0; + material.Specular.a = 0.0; + material.Emissive.r = 0.0; + material.Emissive.g = 0.0; + material.Emissive.b = 0.0; + material.Emissive.a = 0.0; + material.Power = 0.0; + IDirect3DDevice9_SetMaterial(device, &material); + ok(hr == D3D_OK, "IDirect3DDevice9_SetMaterial returned %08x\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_MATERIAL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SPECULARMATERIALSOURCE, D3DMCS_MATERIAL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + + hr = IDirect3DDevice9_GetTextureStageState(device, 0, D3DTSS_COLOROP, &cop); + ok(hr == D3D_OK, "IDirect3DDevice9_GetTextureStageState returned %08x\n", hr); + hr = IDirect3DDevice9_GetTextureStageState(device, 0, D3DTSS_COLORARG1, &carg); + ok(hr == D3D_OK, "IDirect3DDevice9_GetTextureStageState returned %08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState returned %08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE | D3DTA_ALPHAREPLICATE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState returned %08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); + if(SUCCEEDED(hr)) { + struct vertex lighting_test[] = { + {-1.0, -1.0, 0.1, 0x8000ff00}, + { 1.0, -1.0, 0.1, 0x80000000}, + {-1.0, 1.0, 0.1, 0x8000ff00}, + { 1.0, 1.0, 0.1, 0x80000000} + }; + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, lighting_test, sizeof(lighting_test[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%08x\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); + } + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 320, 240); + ok(color == 0x00ffffff, "Lit vertex alpha test returned color %08x, expected 0x00ffffff\n", color); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, cop); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState returned %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_COLOR1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SPECULARMATERIALSOURCE, D3DMCS_COLOR2); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, carg); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState returned %08x\n", hr); + hr = IDirect3DDevice9_SetMaterial(device, &old_material); + ok(hr == D3D_OK, "IDirect3DDevice9_SetMaterial returned %08x\n", hr); } static void clear_test(IDirect3DDevice9 *device)

1 0

Michael Stefaniuc : cabinet: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: bfe6fe678aa39199f590ed92f9f8f9deae2ef1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe6fe678aa39199f590ed92f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:21:28 2008 +0100 cabinet: Do not cast NULL. --- dlls/cabinet/fdi.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 35ad540..0825162 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -925,7 +925,7 @@ static void fdi_Ziphuft_free(HFDI hfdi, struct Ziphuft *t) /* Go through linked list, freeing from the allocated (t[-1]) address. */ p = t; - while (p != (struct Ziphuft *)NULL) + while (p != NULL) { q = (--p)->v.t; PFDI_FREE(hfdi, p); @@ -970,7 +970,7 @@ struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) } while (--i); if (ZIP(c)[0] == n) /* null input--all zero length codes */ { - *t = (struct Ziphuft *)NULL; + *t = NULL; *m = 0; return 0; } @@ -1018,8 +1018,8 @@ struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) p = ZIP(v); /* grab values in bit order */ h = -1; /* no tables yet--level -1 */ w = l[-1] = 0; /* no bits decoded yet */ - ZIP(u)[0] = (struct Ziphuft *)NULL; /* just to keep compilers happy */ - q = (struct Ziphuft *)NULL; /* ditto */ + ZIP(u)[0] = NULL; /* just to keep compilers happy */ + q = NULL; /* ditto */ z = 0; /* ditto */ /* go through the bit lengths (k already is bits in shortest code) */ @@ -1061,7 +1061,7 @@ struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) return 3; /* not enough memory */ } *t = q + 1; /* link to list for Ziphuft_free() */ - *(t = &(q->v.t)) = (struct Ziphuft *)NULL; + *(t = &(q->v.t)) = NULL; ZIP(u)[h] = ++q; /* table starts after link */ /* connect to last table, if there is one */

1 0

Michael Stefaniuc : winex11.drv: ImmLockIMCC() returns a void pointer; no need to cast that.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 66006129afaf30c7ca7d9f098a30128c63b6637c URL: http://source.winehq.org/git/wine.git/?a=commit;h=66006129afaf30c7ca7d9f098… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:21:05 2008 +0100 winex11.drv: ImmLockIMCC() returns a void pointer; no need to cast that. --- dlls/winex11.drv/ime.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index b934035..e07321e 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -164,7 +164,7 @@ static HIMCC ImeCreateBlankCompStr(void) HIMCC rc; LPCOMPOSITIONSTRING ptr; rc = ImmCreateIMCC(sizeof(COMPOSITIONSTRING)); - ptr = (LPCOMPOSITIONSTRING)ImmLockIMCC(rc); + ptr = ImmLockIMCC(rc); memset(ptr,0,sizeof(COMPOSITIONSTRING)); ptr->dwSize = sizeof(COMPOSITIONSTRING); ImmUnlockIMCC(rc); @@ -485,7 +485,7 @@ static void GenerateIMEMessage(HIMC hIMC, UINT msg, WPARAM wParam, if (!lpIMC->hMsgBuf) return; - lpTransMsg = (LPTRANSMSG)ImmLockIMCC(lpIMC->hMsgBuf); + lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf); if (!lpTransMsg) return; @@ -520,7 +520,7 @@ static void GenerateIMECHARMessages(HIMC hIMC, LPWSTR String, DWORD length) if (!lpIMC->hMsgBuf) return; - lpTransMsg = (LPTRANSMSG)ImmLockIMCC(lpIMC->hMsgBuf); + lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf); if (!lpTransMsg) return; @@ -649,7 +649,7 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) if (lpIMC != NULL) { LPIMEPRIVATE myPrivate; - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); myPrivate->bInComposition = FALSE; myPrivate->bInternalState = FALSE; myPrivate->textfont = NULL; @@ -707,7 +707,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) LPIMEPRIVATE myPrivate; TRACE("IMC_SETCOMPOSITIONFONT\n"); - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (myPrivate->textfont) { DeleteObject(myPrivate->textfont); @@ -722,7 +722,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) LPIMEPRIVATE myPrivate; TRACE("IMC_SETOPENSTATUS\n"); - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (lpIMC->fOpen != myPrivate->bInternalState && myPrivate->bInComposition) { @@ -793,7 +793,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION, 0, 0); - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); @@ -814,7 +814,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = ImeCreateBlankCompStr(); - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (myPrivate->bInComposition) { GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); @@ -902,7 +902,7 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, if (lpIMC == NULL) return FALSE; - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (dwIndex == SCS_SETSTR) { @@ -963,7 +963,7 @@ void IME_SetOpenStatus(BOOL fOpen) if (lpIMC == NULL) return; - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (myPrivate->bInternalState && fOpen == FALSE) { @@ -1013,7 +1013,7 @@ INT IME_GetCursorPos(void) lpIMC = LockRealIMC(FROM_X11); if (lpIMC) { - compstr = (LPCOMPOSITIONSTRING)ImmLockIMCC(lpIMC->hCompStr); + compstr = ImmLockIMCC(lpIMC->hCompStr); rc = compstr->dwCursorPos; ImmUnlockIMCC(lpIMC->hCompStr); } @@ -1033,7 +1033,7 @@ void IME_SetCursorPos(DWORD pos) if (!lpIMC) return; - compstr = (LPCOMPOSITIONSTRING)ImmLockIMCC(lpIMC->hCompStr); + compstr = ImmLockIMCC(lpIMC->hCompStr); if (!compstr) { UnlockRealIMC(FROM_X11); @@ -1106,7 +1106,7 @@ static void PaintDefaultIMEWnd(HIMC hIMC, HWND hwnd) LPIMEPRIVATE myPrivate; CompString = (LPWSTR)(compdata + compstr->dwCompStrOffset); - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (myPrivate->textfont) oldfont = SelectObject(hdc,myPrivate->textfont); @@ -1376,7 +1376,7 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, lpIMC = LockRealIMC(hIMC); if (lpIMC) { - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); myPrivate->hwndDefault = hwnd; ImmUnlockIMCC(lpIMC->hPrivate); }

1 0

Vitaliy Margolen : dxdiagn: Add service pack version.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 59815fc205b9f2e06212afaa3df37bd786651557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59815fc205b9f2e06212afaa3… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 2 21:26:40 2008 -0700 dxdiagn: Add service pack version. --- dlls/dxdiagn/provider.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 2bf44e6..e3bb044 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -275,6 +275,7 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) static const WCHAR dwOSMinorVersion[] = {'d','w','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR dwOSBuildNumber[] = {'d','w','O','S','B','u','i','l','d','N','u','m','b','e','r',0}; static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0}; + static const WCHAR szCSDVersion[] = {'s','z','C','S','D','V','e','r','s','i','o','n',0}; MEMORYSTATUSEX msex; OSVERSIONINFOW info; WCHAR buffer[MAX_PATH]; @@ -298,6 +299,7 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) add_prop_ui4(pSubCont, dwOSMinorVersion, info.dwMinorVersion); add_prop_ui4(pSubCont, dwOSBuildNumber, info.dwBuildNumber); add_prop_ui4(pSubCont, dwOSPlatformID, info.dwPlatformId); + add_prop_str(pSubCont, szCSDVersion, info.szCSDVersion); GetWindowsDirectoryW(buffer, MAX_PATH); add_prop_str(pSubCont, szWindowsDir, buffer);

1 0

Alexandre Julliard : winecfg: Display an nicer error when the mount manager cannot be accessed.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 6ccf01fe8ab89c436c0ba557795aa6080bc5dee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ccf01fe8ab89c436c0ba5577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 3 12:00:42 2008 +0100 winecfg: Display an nicer error when the mount manager cannot be accessed. --- programs/winecfg/Bg.rc | 3 ++- programs/winecfg/Cs.rc | 3 ++- programs/winecfg/Da.rc | 3 ++- programs/winecfg/De.rc | 3 ++- programs/winecfg/En.rc | 3 ++- programs/winecfg/Es.rc | 3 ++- programs/winecfg/Fi.rc | 3 ++- programs/winecfg/Fr.rc | 3 ++- programs/winecfg/Hu.rc | 3 ++- programs/winecfg/It.rc | 3 ++- programs/winecfg/Ja.rc | 3 ++- programs/winecfg/Ko.rc | 3 ++- programs/winecfg/Nl.rc | 3 ++- programs/winecfg/No.rc | 3 ++- programs/winecfg/Pl.rc | 3 ++- programs/winecfg/Pt.rc | 3 ++- programs/winecfg/Ro.rc | 3 ++- programs/winecfg/Ru.rc | 3 ++- programs/winecfg/Si.rc | 3 ++- programs/winecfg/Sv.rc | 3 ++- programs/winecfg/Tr.rc | 3 ++- programs/winecfg/Zh.rc | 3 ++- programs/winecfg/driveui.c | 17 ++++++++++++++++- programs/winecfg/resource.h | 2 ++ 24 files changed, 62 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ccf01fe8ab89c436c0ba…

1 0

Vitaliy Margolen : dxdiagn: Add pagefile size info.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: eea4849fded41f5143e16efc27bc0dc4279f7fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eea4849fded41f5143e16efc2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 2 21:26:20 2008 -0700 dxdiagn: Add pagefile size info. --- dlls/dxdiagn/provider.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index d22f756..b15ee96 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -172,6 +172,20 @@ static inline HRESULT add_prop_bool( IDxDiagContainer* cont, LPCWSTR prop, BOOL return IDxDiagContainerImpl_AddProp( cont, prop, &var ); } +static inline HRESULT add_prop_ull_as_str( IDxDiagContainer* cont, LPCWSTR prop, ULONGLONG data ) +{ + HRESULT hr; + VARIANT var; + + V_VT( &var ) = VT_UI8; + V_UI8( &var ) = data; + VariantChangeType( &var, &var, 0, VT_BSTR ); + hr = IDxDiagContainerImpl_AddProp( cont, prop, &var ); + VariantClear( &var ); + + return hr; +} + /** * @param szFilePath: usually GetSystemDirectoryW * @param szFileName: name of the dll without path @@ -253,6 +267,8 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) static const WCHAR szDirectXVersionLongEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','o','n','g','E','n','g','l','i','s','h',0}; static const WCHAR szDirectXVersionLongEnglish_v[] = {'=',' ','"','D','i','r','e','c','t','X',' ','9','.','0','c',' ','(','4','.','0','9','.','0','0','0','0','.','0','9','0','4',')',0}; static const WCHAR ullPhysicalMemory[] = {'u','l','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; + static const WCHAR ullUsedPageFile[] = {'u','l','l','U','s','e','d','P','a','g','e','F','i','l','e',0}; + static const WCHAR ullAvailPageFile[] = {'u','l','l','A','v','a','i','l','P','a','g','e','F','i','l','e',0}; /*static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};*/ /*szWindowsDir*/ /*szWindowsDir*/ @@ -262,7 +278,6 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0}; MEMORYSTATUSEX msex; OSVERSIONINFOW info; - VARIANT v; add_prop_ui4(pSubCont, dwDirectXVersionMajor, 9); add_prop_ui4(pSubCont, dwDirectXVersionMinor, 0); @@ -273,11 +288,9 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) msex.dwLength = sizeof(msex); GlobalMemoryStatusEx( &msex ); - V_VT(&v) = VT_UI8; - V_UI8(&v) = msex.ullTotalPhys; - VariantChangeType(&v, &v, 0, VT_BSTR); - IDxDiagContainerImpl_AddProp(pSubCont, ullPhysicalMemory, &v); - VariantClear(&v); + add_prop_ull_as_str(pSubCont, ullPhysicalMemory, msex.ullTotalPhys); + add_prop_ull_as_str(pSubCont, ullUsedPageFile, msex.ullTotalPageFile - msex.ullAvailPageFile); + add_prop_ull_as_str(pSubCont, ullAvailPageFile, msex.ullAvailPageFile); info.dwOSVersionInfoSize = sizeof(info); GetVersionExW( &info );

1 0