May 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : wmc: Clean output files when aborting on an error or signal.
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: 22aad63775337f61ebed66e4f7c2696287c749fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22aad63775337f61ebed66e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 27 13:23:24 2006 +0200 wmc: Clean output files when aborting on an error or signal. --- tools/wmc/wmc.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index f852f2b..9a19654 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -116,6 +116,17 @@ time_t now; /* The time of start of wm int getopt (int argc, char *const *argv, const char *optstring); static void segvhandler(int sig); +static void cleanup_files(void) +{ + if (output_name) unlink( output_name ); + if (header_name) unlink( header_name ); +} + +static void exit_on_signal( int sig ) +{ + exit(1); /* this will call the atexit functions */ +} + int main(int argc,char *argv[]) { extern char* optarg; @@ -126,7 +137,13 @@ int main(int argc,char *argv[]) int i; int cmdlen; + atexit( cleanup_files ); signal(SIGSEGV, segvhandler); + signal( SIGTERM, exit_on_signal ); + signal( SIGINT, exit_on_signal ); +#ifdef SIGHUP + signal( SIGHUP, exit_on_signal ); +#endif now = time(NULL); @@ -269,7 +286,8 @@ int main(int argc,char *argv[]) write_rc_file(output_name); if(!rcinline) write_bin_files(); - + output_name = NULL; + header_name = NULL; return 0; }

1 0

Eric Pouech : ntdll: Free TLS pointers when exiting thread.
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: 201f46951286801cb0b73b92313c08a41b141889 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=201f46951286801cb0b73b9… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri May 26 12:10:41 2006 +0200 ntdll: Free TLS pointers when exiting thread. --- dlls/ntdll/loader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index eaf7cfa..f5022e1 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1908,6 +1908,7 @@ void WINAPI LdrShutdownThread(void) } RtlLeaveCriticalSection( &loader_section ); + RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->ThreadLocalStoragePointer ); }

1 0

Eric Pouech : ntdll/kernel32: Moved GetThreadSelectorEntry to ntdll.
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: 2d3504c309c53ae06f2e57dee6cd18bc0cdbbe25 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d3504c309c53ae06f2e57d… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri May 26 12:10:57 2006 +0200 ntdll/kernel32: Moved GetThreadSelectorEntry to ntdll. - implemented NtQueryInformationThread's ThreadDescriptorTableEntry information class - used it to implement the kernel32's equivalent (GetThreadSelectorEntry) --- dlls/kernel/selector.c | 66 +++++++----------------------------------------- dlls/ntdll/thread.c | 62 ++++++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 6 ++++ 3 files changed, 77 insertions(+), 57 deletions(-) diff --git a/dlls/kernel/selector.c b/dlls/kernel/selector.c index 7cd159c..86d150c 100644 --- a/dlls/kernel/selector.c +++ b/dlls/kernel/selector.c @@ -573,67 +573,21 @@ #endif /*********************************************************************** * GetThreadSelectorEntry (KERNEL32.@) */ -BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldtent) +BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldtent ) { -#ifdef __i386__ - BOOL ret; + THREAD_DESCRIPTOR_INFORMATION tdi; + NTSTATUS status; - if (!(sel & 4)) /* GDT selector */ + tdi.Selector = sel; + status = NtQueryInformationThread( hthread, ThreadDescriptorTableEntry, + &tdi, sizeof(tdi), NULL); + if (status) { - sel &= ~3; /* ignore RPL */ - if (!sel) /* null selector */ - { - memset( ldtent, 0, sizeof(*ldtent) ); - return TRUE; - } - ldtent->BaseLow = 0; - ldtent->HighWord.Bits.BaseMid = 0; - ldtent->HighWord.Bits.BaseHi = 0; - ldtent->LimitLow = 0xffff; - ldtent->HighWord.Bits.LimitHi = 0xf; - ldtent->HighWord.Bits.Dpl = 3; - ldtent->HighWord.Bits.Sys = 0; - ldtent->HighWord.Bits.Pres = 1; - ldtent->HighWord.Bits.Granularity = 1; - ldtent->HighWord.Bits.Default_Big = 1; - ldtent->HighWord.Bits.Type = 0x12; - /* it has to be one of the system GDT selectors */ - if (sel == (wine_get_ds() & ~3)) return TRUE; - if (sel == (wine_get_ss() & ~3)) return TRUE; - if (sel == (wine_get_cs() & ~3)) - { - ldtent->HighWord.Bits.Type |= 8; /* code segment */ - return TRUE; - } - SetLastError( ERROR_NOACCESS ); + SetLastError( RtlNtStatusToDosError(status) ); return FALSE; } - - SERVER_START_REQ( get_selector_entry ) - { - req->handle = hthread; - req->entry = sel >> __AHSHIFT; - if ((ret = !wine_server_call_err( req ))) - { - if (!(reply->flags & WINE_LDT_FLAGS_ALLOCATED)) - { - SetLastError( ERROR_MR_MID_NOT_FOUND ); /* sic */ - ret = FALSE; - } - else - { - wine_ldt_set_base( ldtent, (void *)reply->base ); - wine_ldt_set_limit( ldtent, reply->limit ); - wine_ldt_set_flags( ldtent, reply->flags ); - } - } - } - SERVER_END_REQ; - return ret; -#else - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -#endif + *ldtent = tdi.Entry; + return TRUE; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 5d25096..b2d0c55 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1073,11 +1073,71 @@ NTSTATUS WINAPI NtQueryInformationThread } } return status; + case ThreadDescriptorTableEntry: + { +#ifdef __i386__ + THREAD_DESCRIPTOR_INFORMATION* tdi = data; + if (length < sizeof(*tdi)) + status = STATUS_INFO_LENGTH_MISMATCH; + else if (!(tdi->Selector & 4)) /* GDT selector */ + { + unsigned sel = tdi->Selector & ~3; /* ignore RPL */ + status = STATUS_SUCCESS; + if (!sel) /* null selector */ + memset( &tdi->Entry, 0, sizeof(tdi->Entry) ); + else + { + tdi->Entry.BaseLow = 0; + tdi->Entry.HighWord.Bits.BaseMid = 0; + tdi->Entry.HighWord.Bits.BaseHi = 0; + tdi->Entry.LimitLow = 0xffff; + tdi->Entry.HighWord.Bits.LimitHi = 0xf; + tdi->Entry.HighWord.Bits.Dpl = 3; + tdi->Entry.HighWord.Bits.Sys = 0; + tdi->Entry.HighWord.Bits.Pres = 1; + tdi->Entry.HighWord.Bits.Granularity = 1; + tdi->Entry.HighWord.Bits.Default_Big = 1; + tdi->Entry.HighWord.Bits.Type = 0x12; + /* it has to be one of the system GDT selectors */ + if (sel != (wine_get_ds() & ~3) && sel != (wine_get_ss() & ~3)) + { + if (sel == (wine_get_cs() & ~3)) + tdi->Entry.HighWord.Bits.Type |= 8; /* code segment */ + else status = STATUS_ACCESS_DENIED; + } + } + } + else + { + SERVER_START_REQ( get_selector_entry ) + { + req->handle = handle; + req->entry = tdi->Selector >> 3; + status = wine_server_call( req ); + if (!status) + { + if (!(reply->flags & WINE_LDT_FLAGS_ALLOCATED)) + status = STATUS_INVALID_LDT_OFFSET; + else + { + wine_ldt_set_base ( &tdi->Entry, (void *)reply->base ); + wine_ldt_set_limit( &tdi->Entry, reply->limit ); + wine_ldt_set_flags( &tdi->Entry, reply->flags ); + } + } + } + SERVER_END_REQ; + } +#else + status = STATUS_NOT_IMPLEMENTED; +#endif + if (status == STATUS_SUCCESS && ret_len) *ret_len = sizeof(*tdi); + return status; + } case ThreadPriority: case ThreadBasePriority: case ThreadAffinityMask: case ThreadImpersonationToken: - case ThreadDescriptorTableEntry: case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: case ThreadQuerySetWin32StartAddress: diff --git a/include/winternl.h b/include/winternl.h index 71f03a0..2f85171 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -728,6 +728,12 @@ typedef struct _THREAD_BASIC_INFORMATION LONG BasePriority; } THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION; +typedef struct _THREAD_DESCRIPTOR_INFORMATION +{ + DWORD Selector; + LDT_ENTRY Entry; +} THREAD_DESCRIPTOR_INFORMATION, *PTHREAD_DESCRIPTOR_INFORMATION; + typedef struct _KERNEL_USER_TIMES { LARGE_INTEGER CreateTime; LARGE_INTEGER ExitTime;

1 0

Eric Pouech : ntdll/kernel32: Pipe information.
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: 1d6e2590e0318c622726c8f4bde05466a0bef25d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d6e2590e0318c622726c8f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri May 26 12:10:11 2006 +0200 ntdll/kernel32: Pipe information. - implemented ntdll.NtQueryInformationFile's FilePipeLocalInformation control code - reimplemented kernel32.GetNamedPipeInfo on top of it - enhance current features to make this work both on client and server handles - now also returning the number of instances --- dlls/kernel/sync.c | 41 ++++++++++++++++++++-------------------- dlls/ntdll/file.c | 37 ++++++++++++++++++++++++++++++++---- include/winbase.h | 7 ++++--- include/wine/server_protocol.h | 5 +++-- include/winternl.h | 23 ++++++++++++++++++++-- server/named_pipe.c | 22 ++++++++++++++++++--- server/protocol.def | 3 ++- server/trace.c | 1 + 8 files changed, 102 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1d6e2590e0318c62272…

1 0

Jason Green : wined3d: Add ability to generate GLSL shader objects for vertex and pixel shaders.
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: 473ce80fa25a94121c08f1a2cc24c78ab4c37bd2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=473ce80fa25a94121c08f1a… Author: Jason Green <jave27(a)gmail.com> Date: Fri May 26 11:52:33 2006 -0400 wined3d: Add ability to generate GLSL shader objects for vertex and pixel shaders. --- dlls/wined3d/baseshader.c | 36 +++++++++++++++++++++++++++++++----- dlls/wined3d/pixelshader.c | 25 +++++++++++++++++++++++-- dlls/wined3d/vertexshader.c | 23 +++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 76 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 4e30421..7c24fa0 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -549,8 +549,34 @@ void generate_glsl_declarations( shader_reg_maps* reg_maps, SHADER_BUFFER* buffer) { + IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; + int i; + FIXME("GLSL not fully implemented yet.\n"); + /* Declare the constants (aka uniforms) */ + shader_addline(buffer, "uniform vec4 C[%u];\n", This->baseShader.limits.constant_float); + + /* Declare address variables */ + for (i = 0; i < This->baseShader.limits.address; i++) { + if (reg_maps->address & (1 << i)) + shader_addline(buffer, "ivec4 A%ld;\n", i); + } + + /* Declare all named attributes (TODO: Add this to the reg_maps + * and only declare those that are needed) */ + for (i = 0; i < This->baseShader.limits.attributes; i++) { + shader_addline(buffer, "attribute vec4 attrib%i;\n", i); + } + + /* Declare temporary variables */ + for(i = 0; i < This->baseShader.limits.temporary; i++) { + if (reg_maps->temporary & (1 << i)) + shader_addline(buffer, "vec4 R%lu;\n", i); + } + + /* Start the main program */ + shader_addline(buffer, "void main() {\n"); } /** Shared code in order to generate the bulk of the shader string. @@ -585,7 +611,6 @@ void generate_base_shader( /* Pre-declare registers */ if (wined3d_settings.shader_mode == SHADER_GLSL) { generate_glsl_declarations(iface, &reg_maps, buffer); - shader_addline(buffer, "void main() {\n"); } else { generate_arb_declarations(iface, &reg_maps, buffer); } @@ -680,8 +705,7 @@ void generate_base_shader( /** Prints the GLSL info log which will contain error messages if they exist */ void print_glsl_info_log( WineD3D_GL_Info *gl_info, - GLhandleARB obj) -{ + GLhandleARB obj) { int infologLength = 0; char *infoLog; @@ -689,11 +713,13 @@ void print_glsl_info_log( GL_OBJECT_INFO_LOG_LENGTH_ARB, &infologLength)); - if (infologLength > 0) + /* A size of 1 is just a null-terminated string, so the log should be bigger than + * that if there are errors. */ + if (infologLength > 1) { infoLog = (char *)HeapAlloc(GetProcessHeap(), 0, infologLength); GL_EXTCALL(glGetInfoLogARB(obj, infologLength, NULL, infoLog)); - FIXME("Error received from GLSL shader #%u: %s", obj, debugstr_a(infoLog)); + FIXME("Error received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog)); HeapFree(GetProcessHeap(), 0, infoLog); } } diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index be4fbb8..283d1f0 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -941,6 +941,7 @@ void pshader_set_version( This->baseShader.version = major * 10 + minor; TRACE("ps_%lu_%lu\n", major, minor); + This->baseShader.limits.attributes = 0; This->baseShader.limits.address = 0; switch (This->baseShader.version) { @@ -1298,8 +1299,28 @@ #endif buffer.bsize = 0; buffer.lineNo = 0; - /* TODO: Optionally, generate the GLSL shader instead */ - if (GL_SUPPORT(ARB_VERTEX_PROGRAM)) { + if (wined3d_settings.shader_mode == SHADER_GLSL) { + + /* Create the hw GLSL shader object and assign it as the baseShader.prgId */ + GLhandleARB shader_obj = GL_EXTCALL(glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB)); + + /* Generate the bulk of the shader code */ + generate_base_shader( (IWineD3DBaseShader*) This, &buffer, pFunction); + + /* Pixel shaders < 2.0 place the resulting color in R0 implicitly */ + if (This->baseShader.hex_version < D3DPS_VERSION(2,0)) + shader_addline(&buffer, "glFragColor = R0;\n"); + shader_addline(&buffer, "}\n\0"); + + TRACE("Compiling shader object %u\n", shader_obj); + GL_EXTCALL(glShaderSourceARB(shader_obj, 1, (const char**)&buffer.buffer, NULL)); + GL_EXTCALL(glCompileShaderARB(shader_obj)); + print_glsl_info_log(&GLINFO_LOCATION, shader_obj); + + /* Store the shader object */ + This->baseShader.prgId = shader_obj; + + } else if (wined3d_settings.shader_mode == SHADER_ARB) { /* Create the hw ARB shader */ shader_addline(&buffer, "!!ARBfp1.0\n"); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index cb8d973..d82546e 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -842,6 +842,7 @@ void vshader_set_version( TRACE("vs_%lu_%lu\n", major, minor); This->baseShader.limits.texture = 0; + This->baseShader.limits.attributes = 16; /* Must match D3DCAPS9.MaxVertexShaderConst: at least 256 for vs_2_0 */ This->baseShader.limits.constant_float = WINED3D_VSHADER_MAX_CONSTANTS; @@ -1063,8 +1064,26 @@ #endif buffer.bsize = 0; buffer.lineNo = 0; - /* TODO: Optionally, generate the GLSL shader instead */ - if (GL_SUPPORT(ARB_VERTEX_PROGRAM)) { + if (wined3d_settings.shader_mode == SHADER_GLSL) { + + /* Create the hw GLSL shader program and assign it as the baseShader.prgId */ + GLhandleARB shader_obj = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)); + + /* Generate the bulk of the shader code */ + generate_base_shader( (IWineD3DBaseShader*) This, &buffer, pFunction); + + shader_addline(&buffer, "}\n\0"); + + TRACE("Compiling shader object %u\n", shader_obj); + GL_EXTCALL(glShaderSourceARB(shader_obj, 1, (const char**)&buffer.buffer, NULL)); + GL_EXTCALL(glCompileShaderARB(shader_obj)); + print_glsl_info_log(&GLINFO_LOCATION, shader_obj); + + /* Store the shader object */ + This->baseShader.prgId = shader_obj; + + } else if (wined3d_settings.shader_mode == SHADER_ARB) { + /* Create the hw ARB shader */ shader_addline(&buffer, "!!ARBvp1.0\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3e3bf80..0552ee4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1282,6 +1282,7 @@ typedef struct SHADER_LIMITS { unsigned int constant_float; unsigned int constant_bool; unsigned int address; + unsigned int attributes; } SHADER_LIMITS; /** Keeps track of details for TEX_M#x# shader opcodes which need to

1 0

Jason Green : wined3d: Final move of the GLSL registry check (hopefully).
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: 0161d6b636ab07a603cd6c2f6509e1995e4e2811 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0161d6b636ab07a603cd6c2… Author: Jason Green <jave27(a)gmail.com> Date: Fri May 26 10:47:28 2006 -0400 wined3d: Final move of the GLSL registry check (hopefully). --- dlls/wined3d/device.c | 11 ----------- dlls/wined3d/directx.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index eff9504..4a22275 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1732,17 +1732,6 @@ #endif IWineD3DDevice_SetViewport((IWineD3DDevice *)This, &vp); } - - /* Determine shader mode to use based on GL caps */ - if (GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && wined3d_settings.glslRequested - && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW)) - wined3d_settings.shader_mode = SHADER_GLSL; - else if ((GL_SUPPORT(ARB_VERTEX_PROGRAM) && wined3d_settings.vs_mode == VS_HW) || - (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && wined3d_settings.ps_mode == PS_HW)) - wined3d_settings.shader_mode = SHADER_ARB; - else - wined3d_settings.shader_mode = SHADER_SW; - /* Initialize the current view state */ This->modelview_valid = 1; This->proj_valid = 0; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ec9c5d7..d699d83 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -746,6 +746,17 @@ #define USE_GL_FUNC(type, pfn) gl_info-> GLX_EXT_FUNCS_GEN; #undef USE_GL_FUNC + /* Determine shader mode to use based on GL caps */ + if (gl_info->supported[ARB_SHADING_LANGUAGE_100] && wined3d_settings.glslRequested + && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW)) + wined3d_settings.shader_mode = SHADER_GLSL; + else if ((gl_info->supported[ARB_VERTEX_PROGRAM] && wined3d_settings.vs_mode == VS_HW) || + (gl_info->supported[ARB_FRAGMENT_PROGRAM] && wined3d_settings.ps_mode == PS_HW)) + wined3d_settings.shader_mode = SHADER_ARB; + else + wined3d_settings.shader_mode = SHADER_SW; + + /* If we created a dummy context, throw it away */ if (NULL != fake_ctx) WineD3D_ReleaseFakeGLContext(fake_ctx);

1 0

Alexandre Julliard : kernel32: Partial implementation of GetModuleHandleExA /W.
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: ab2349daf0d57b8f2f68cfd2ca871b3d3d75a4f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab2349daf0d57b8f2f68cfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 27 10:57:17 2006 +0200 kernel32: Partial implementation of GetModuleHandleExA/W. --- dlls/kernel/kernel32.spec | 4 +-- dlls/kernel/module.c | 72 +++++++++++++++++++++++++++++++++++---------- include/winbase.h | 7 ++++ 3 files changed, 65 insertions(+), 18 deletions(-) diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 5bb79af..4de17a9 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -540,8 +540,8 @@ # @ stub GetFirmwareEnvironmentVariableW @ stdcall GetModuleFileNameA(long ptr long) @ stdcall GetModuleFileNameW(long ptr long) @ stdcall GetModuleHandleA(str) -# @ stub GetModuleHandleExA -# @ stub GetModuleHandleExW +@ stdcall GetModuleHandleExA(long ptr ptr) +@ stdcall GetModuleHandleExW(long ptr ptr) @ stdcall GetModuleHandleW(wstr) @ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) @ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) diff --git a/dlls/kernel/module.c b/dlls/kernel/module.c index a909bbf..291e817 100644 --- a/dlls/kernel/module.c +++ b/dlls/kernel/module.c @@ -480,6 +480,57 @@ BOOL WINAPI GetBinaryTypeA( LPCSTR lpApp return FALSE; } +/*********************************************************************** + * GetModuleHandleExA (KERNEL32.@) + */ +BOOL WINAPI GetModuleHandleExA( DWORD flags, LPCSTR name, HMODULE *module ) +{ + WCHAR *nameW; + + if (!name || (flags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) + return GetModuleHandleExW( flags, (LPCWSTR)name, module ); + + if (!(nameW = FILE_name_AtoW( name, FALSE ))) return FALSE; + return GetModuleHandleExW( flags, nameW, module ); +} + +/*********************************************************************** + * GetModuleHandleExW (KERNEL32.@) + */ +BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) +{ + NTSTATUS status = STATUS_SUCCESS; + HMODULE ret; + + if (!name) + { + ret = NtCurrentTeb()->Peb->ImageBaseAddress; + } + else if (flags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) + { + void *dummy; + if (!(ret = RtlPcToFileHeader( (void *)name, &dummy ))) status = STATUS_DLL_NOT_FOUND; + } + else + { + UNICODE_STRING wstr; + RtlInitUnicodeString( &wstr, name ); + status = LdrGetDllHandle( 0, 0, &wstr, &ret ); + } + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + + if ((flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || + !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + FIXME( "should update refcount, flags %lx\n", flags ); + + if (module) *module = ret; + return TRUE; +} /*********************************************************************** * GetModuleHandleA (KERNEL32.@) @@ -496,11 +547,10 @@ BOOL WINAPI GetBinaryTypeA( LPCSTR lpApp */ HMODULE WINAPI GetModuleHandleA(LPCSTR module) { - WCHAR *moduleW; + HMODULE ret; - if (!module) return NtCurrentTeb()->Peb->ImageBaseAddress; - if (!(moduleW = FILE_name_AtoW( module, FALSE ))) return 0; - return GetModuleHandleW( moduleW ); + if (!GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret )) ret = 0; + return ret; } /*********************************************************************** @@ -510,19 +560,9 @@ HMODULE WINAPI GetModuleHandleA(LPCSTR m */ HMODULE WINAPI GetModuleHandleW(LPCWSTR module) { - NTSTATUS nts; - HMODULE ret; - UNICODE_STRING wstr; - - if (!module) return NtCurrentTeb()->Peb->ImageBaseAddress; + HMODULE ret; - RtlInitUnicodeString( &wstr, module ); - nts = LdrGetDllHandle( 0, 0, &wstr, &ret); - if (nts != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError( nts ) ); - ret = 0; - } + if (!GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret )) ret = 0; return ret; } diff --git a/include/winbase.h b/include/winbase.h index 39db999..549e36e 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -750,6 +750,10 @@ #define DONT_RESOLVE_DLL_REFERENCES 0x00 #define LOAD_LIBRARY_AS_DATAFILE 0x00000002 #define LOAD_WITH_ALTERED_SEARCH_PATH 0x00000008 +#define GET_MODULE_HANDLE_EX_FLAG_PIN 1 +#define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 2 +#define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 4 + typedef PLDT_ENTRY LPLDT_ENTRY; typedef enum _GET_FILEEX_INFO_LEVELS { @@ -1568,6 +1572,9 @@ #define GetModuleFileName WINELIB_NA HMODULE WINAPI GetModuleHandleA(LPCSTR); HMODULE WINAPI GetModuleHandleW(LPCWSTR); #define GetModuleHandle WINELIB_NAME_AW(GetModuleHandle) +BOOL WINAPI GetModuleHandleExA(DWORD,LPCSTR,HMODULE*); +BOOL WINAPI GetModuleHandleExW(DWORD,LPCWSTR,HMODULE*); +#define GetModuleHandleEx WINELIB_NAME_AW(GetModuleHandleEx) BOOL WINAPI GetNamedPipeHandleStateA(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPSTR,DWORD); BOOL WINAPI GetNamedPipeHandleStateW(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPWSTR,DWORD); #define GetNamedPipeHandleState WINELIB_NAME_AW(GetNamedPipeHandleState)

1 0

Alexandre Julliard : ntdll: Implemented RtlPcToFileHeader.
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: 9769806c3a112dce4bd086b4ea7132160f4fc9ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9769806c3a112dce4bd086b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 27 10:55:48 2006 +0200 ntdll: Implemented RtlPcToFileHeader. --- dlls/ntdll/loader.c | 16 ++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index aac48dc..eaf7cfa 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2225,6 +2225,22 @@ PVOID WINAPI RtlImageRvaToVa( const IMAG /*********************************************************************** + * RtlPcToFileHeader (NTDLL.@) + */ +PVOID WINAPI RtlPcToFileHeader( PVOID pc, PVOID *address ) +{ + LDR_MODULE *module; + PVOID ret = NULL; + + RtlEnterCriticalSection( &loader_section ); + if (!LdrFindEntryForAddress( pc, &module )) ret = module->BaseAddress; + RtlLeaveCriticalSection( &loader_section ); + *address = ret; + return ret; +} + + +/*********************************************************************** * NtLoadDriver (NTDLL.@) * ZwLoadDriver (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 90afeb2..2950453 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -753,7 +753,7 @@ # @ stub RtlNumberGenericTableElementsAv @ stdcall RtlOemStringToUnicodeString(ptr ptr long) @ stdcall RtlOemToUnicodeN(ptr long ptr ptr long) @ stdcall RtlOpenCurrentUser(long ptr) -@ stub RtlPcToFileHeader +@ stdcall RtlPcToFileHeader(ptr ptr) @ stdcall RtlPinAtomInAtomTable(ptr long) # @ stub RtlPopFrame @ stdcall RtlPrefixString(ptr ptr long) diff --git a/include/winternl.h b/include/winternl.h index 38d13c6..9eb270a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2120,6 +2120,7 @@ NTSTATUS WINAPI RtlOemStringToUnicodeSt NTSTATUS WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); NTSTATUS WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE); +PVOID WINAPI RtlPcToFileHeader(PVOID,PVOID*); NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);

1 0

Kai Blin : secur32: Fix wrong bit shift in the base64 encoder.
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: f543aea5e38e97f37b9d6231ebffba9557c182ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f543aea5e38e97f37b9d623… Author: Kai Blin <kai.blin(a)gmail.com> Date: Fri May 26 21:37:07 2006 +0000 secur32: Fix wrong bit shift in the base64 encoder. Thanks to Juan Lang for catching this one. --- dlls/secur32/base64_codec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/base64_codec.c b/dlls/secur32/base64_codec.c index 4aab838..d09b24d 100644 --- a/dlls/secur32/base64_codec.c +++ b/dlls/secur32/base64_codec.c @@ -72,7 +72,7 @@ SECURITY_STATUS encodeBase64(PBYTE in_bu out_buf[i + 1] = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; /* third char is the last 4 bits of the second byte padded with * two zeroes */ - out_buf[i + 2] = b64[ ((d[1] >> 4) & 0x3c) ]; + out_buf[i + 2] = b64[ ((d[1] << 2) & 0x3c) ]; /* fourth char is a = to indicate one byte of padding */ out_buf[i + 3] = '='; out_buf[i + 4] = 0;

1 0

Robert Shearman : rpcrt4: Store the QueryType in the state table in NdrFullPointerQueryRefId.
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: 63307241dd1e9fdf486e89201f00658c34f6bef3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63307241dd1e9fdf486e892… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 26 19:56:35 2006 +0100 rpcrt4: Store the QueryType in the state table in NdrFullPointerQueryRefId. Implement NdrFullPointerFree. --- dlls/rpcrt4/ndr_fullpointer.c | 40 +++++++++++++++++++++++++++++++++++--- dlls/rpcrt4/tests/ndr_marshall.c | 4 ---- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index 983bd51..bd2f5a3 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -151,7 +151,11 @@ int WINAPI NdrFullPointerQueryRefId(PFUL { *ppPointer = pXlatTables->RefIdToPointer.XlatTable[RefId]; if (QueryType) - return pXlatTables->RefIdToPointer.StateTable[RefId]; + { + int ret = pXlatTables->RefIdToPointer.StateTable[RefId]; + pXlatTables->RefIdToPointer.StateTable[RefId] = QueryType; + return ret; + } else return 0; } @@ -187,7 +191,37 @@ void WINAPI NdrFullPointerInsertRefId(PF int WINAPI NdrFullPointerFree(PFULL_PTR_XLAT_TABLES pXlatTables, void *Pointer) { - FIXME("(%p, %p)\n", pXlatTables, Pointer); + unsigned long Hash = 0; + int i; + PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry; + unsigned long RefId = 0; + + TRACE("(%p, %p)\n", pXlatTables, Pointer); + + if (!Pointer) + return 1; + + /* simple hashing algorithm, don't know whether it matches native */ + for (i = 0; i < sizeof(Pointer); i++) + Hash = (Hash * 3) ^ ((unsigned char *)&Pointer)[i]; + + XlatTableEntry = pXlatTables->PointerToRefId.XlatTable[Hash & pXlatTables->PointerToRefId.HashMask]; + for (; XlatTableEntry; XlatTableEntry = XlatTableEntry->Next) + if (Pointer == XlatTableEntry->Pointer) + { + XlatTableEntry->State = 0x20; + RefId = XlatTableEntry->RefId; + break; + } + + if (!XlatTableEntry) + return 0; - return 10; + if (pXlatTables->RefIdToPointer.NumberOfEntries > RefId) + { + pXlatTables->RefIdToPointer.StateTable[RefId] = 0x20; + return 1; + } + + return 0; } diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index f9cf602..22dee82 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -753,9 +753,7 @@ static void test_fullpointer_xlat(void) ok(Pointer == (void *)0xcafebabe, "Pointer should be (void *)0xcafebabe instead of %p\n", Pointer); ret = NdrFullPointerQueryRefId(pXlatTables, 0x2, 1, &Pointer); - todo_wine { ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); - } ok(Pointer == (void *)0xcafebabe, "Pointer should be (void *)0xcafebabe instead of %p\n", Pointer); /* "marshaling" phase */ @@ -784,7 +782,6 @@ static void test_fullpointer_xlat(void) /* "freeing" phase */ - todo_wine { ret = NdrFullPointerFree(pXlatTables, (void *)0xcafebeef); ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); @@ -793,7 +790,6 @@ static void test_fullpointer_xlat(void) ret = NdrFullPointerFree(pXlatTables, (void *)0xdeadbeef); ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); - } NdrFullPointerXlatFree(pXlatTables); }

1 0