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

Alexandre Julliard : server: Store a mapping instead of a file for process dlls.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 900352bc6bd32c6524658083339ba119620be9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=900352bc6bd32c65246580833… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 18 14:14:40 2011 +0200 server: Store a mapping instead of a file for process dlls. --- dlls/ntdll/loader.c | 20 +++++++++++++------- include/wine/server_protocol.h | 4 ++-- server/debugger.c | 8 +++++--- server/file.c | 6 ------ server/file.h | 3 ++- server/mapping.c | 6 ++++++ server/process.c | 18 +++++++++--------- server/process.h | 2 +- server/protocol.def | 2 +- server/request.h | 2 +- server/trace.c | 2 +- 11 files changed, 41 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=900352bc6bd32c6524658…

1 0

Rico Schüller : d3dx9: Fix d3dx9_parse_effect_typedef for D3DXPC_STRUCT.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 4482ca41d0466dcae8063345b9a71f5e4b905720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4482ca41d0466dcae8063345b… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:34 2011 +0200 d3dx9: Fix d3dx9_parse_effect_typedef for D3DXPC_STRUCT. --- dlls/d3dx9_36/effect.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 66b5a40..595baba 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2734,6 +2734,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch if (param->element_count) { unsigned int param_bytes = 0; + const char *save_ptr = *ptr; member_handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member_handles) * param->element_count); if (!member_handles) @@ -2746,6 +2747,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch for (i = 0; i < param->element_count; ++i) { struct d3dx_parameter *member; + *ptr = save_ptr; member = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member)); if (!member)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetTechniqueDesc().
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: d64eb4699f871a6bf002799194cea687ca0a8b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64eb4699f871a6bf00279919… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:39 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetTechniqueDesc(). --- dlls/d3dx9_36/effect.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 595baba..dc67864 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -156,6 +156,21 @@ static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) return (D3DXHANDLE) pass; } +struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique) +{ + unsigned int i; + + for (i = 0; i < base->technique_count; ++i) + { + if (base->technique_handles[i] == technique) + { + return get_technique_struct(technique); + } + } + + return NULL; +} + static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) { unsigned int i; @@ -394,10 +409,21 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetParameterDesc(ID3DXBaseEffect *ifac static HRESULT WINAPI ID3DXBaseEffectImpl_GetTechniqueDesc(ID3DXBaseEffect *iface, D3DXHANDLE technique, D3DXTECHNIQUE_DESC *desc) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_technique *tech = technique ? is_valid_technique(This, technique) : get_technique_struct(This->technique_handles[0]); - FIXME("iface %p, technique %p, desc %p stub\n", This, technique, desc); + TRACE("iface %p, technique %p, desc %p\n", This, technique, desc); - return E_NOTIMPL; + if (!desc || !tech) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + desc->Name = tech->name; + desc->Passes = tech->pass_count; + desc->Annotations = tech->annotation_count; + + return D3D_OK; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetPassDesc(ID3DXBaseEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetParameter().
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: e798d0016b2c5bc8c998ee32d37e839453ea99bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e798d0016b2c5bc8c998ee32d… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:44 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetParameter(). --- dlls/d3dx9_36/effect.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 106 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index dc67864..d35978c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -171,6 +171,90 @@ struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DX return NULL; } +struct d3dx_parameter *is_valid_sub_parameter(struct d3dx_parameter *param, D3DXHANDLE parameter) +{ + unsigned int i, count; + struct d3dx_parameter *p; + + for (i = 0; i < param->annotation_count; ++i) + { + if (param->annotation_handles[i] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(param->annotation_handles[i]), parameter); + if (p) return p; + } + + if (param->element_count) count = param->element_count; + else count = param->member_count; + + for (i = 0; i < count; ++i) + { + if (param->member_handles[i] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(param->member_handles[i]), parameter); + if (p) return p; + } + + return NULL; +} + +struct d3dx_parameter *is_valid_parameter(struct ID3DXBaseEffectImpl *base, D3DXHANDLE parameter) +{ + unsigned int i, k, m; + struct d3dx_parameter *p; + + for (i = 0; i < base->parameter_count; ++i) + { + if (base->parameter_handles[i] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(base->parameter_handles[i]), parameter); + if (p) return p; + } + + for (i = 0; i < base->technique_count; ++i) + { + struct d3dx_technique *technique = get_technique_struct(base->technique_handles[i]); + + for (k = 0; k < technique->pass_count; ++k) + { + struct d3dx_pass *pass = get_pass_struct(technique->pass_handles[k]); + + for (m = 0; m < pass->annotation_count; ++m) + { + if (pass->annotation_handles[i] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(pass->annotation_handles[m]), parameter); + if (p) return p; + } + } + + for (k = 0; k < technique->annotation_count; ++k) + { + if (technique->annotation_handles[k] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(technique->annotation_handles[k]), parameter); + if (p) return p; + } + } + + return NULL; +} + static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) { unsigned int i; @@ -448,7 +532,28 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetParameter(ID3DXBaseEffect *iface { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - FIXME("iface %p, parameter %p, index %u stub\n", This, parameter, index); + TRACE("iface %p, parameter %p, index %u\n", This, parameter, index); + + if (!parameter) + { + if (index < This->parameter_count) + { + TRACE("Returning parameter %p\n", This->parameter_handles[index]); + return This->parameter_handles[index]; + } + } + else + { + struct d3dx_parameter *param = is_valid_parameter(This, parameter); + + if (param && !param->element_count && index < param->member_count) + { + TRACE("Returning parameter %p\n", param->member_handles[index]); + return param->member_handles[index]; + } + } + + WARN("Invalid argument specified.\n"); return NULL; }

1 0

Andrew Nguyen : krnl386.exe: Fix size calculation in GetSystemDirectory16.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 43f283c0855d369690f1d747b051280f08b1c6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f283c0855d369690f1d747b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:37:29 2011 -0500 krnl386.exe: Fix size calculation in GetSystemDirectory16. --- dlls/krnl386.exe16/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 0a1098f..37c401a 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -628,11 +628,11 @@ UINT16 WINAPI GetWindowsDirectory16( LPSTR path, UINT16 count ) */ UINT16 WINAPI GetSystemDirectory16( LPSTR path, UINT16 count ) { - static const char * system16 = "\\SYSTEM"; + static const char system16[] = "\\SYSTEM"; char windir[MAX_PATH]; UINT16 len; - len = GetWindowsDirectory16(windir, sizeof(windir) - sizeof(system16)) + sizeof(system16); + len = GetWindowsDirectory16(windir, sizeof(windir) - sizeof(system16) + 1) + sizeof(system16); if (count >= len) { lstrcpyA(path, windir);

1 0

Andrew Nguyen : wine.inf: Add a fake 16-bit DLL for mmsystem.dll.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 2b92e554a831e197b8e9b560593ffa5b7a0fdf41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b92e554a831e197b8e9b5605… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:37:34 2011 -0500 wine.inf: Add a fake 16-bit DLL for mmsystem.dll. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index d4a457b..ee23bb3 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2576,6 +2576,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,winhlp32.exe 10,command,start.exe 10,system,ddeml.dll,ddeml.dll16 +10,system,mmsystem.dll,mmsystem.dll16 11,,ddhelp.exe 11,,dosx.exe 11,,dsound.vxd

1 0

Andrew Nguyen : wing32: Fix two typos in export names.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 6dab9cde4a89bfdf2b41565b88c164da9c69d73d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dab9cde4a89bfdf2b41565b8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 04:26:59 2011 -0500 wing32: Fix two typos in export names. --- dlls/wing32/wing32.c | 8 ++++---- dlls/wing32/wing32.spec | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index 3c6d3d9..ac74986 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -95,9 +95,9 @@ UINT WINAPI WinGGetDIBColorTable( HDC hdc, UINT start, UINT end, RGBQUAD *colors } /*********************************************************************** - * WinGCreateHalfTonePalette (WING32.@) + * WinGCreateHalftonePalette (WING32.@) */ -HPALETTE WINAPI WinGCreateHalfTonePalette( void ) +HPALETTE WINAPI WinGCreateHalftonePalette( void ) { HDC hdc; HPALETTE hpal; @@ -110,9 +110,9 @@ HPALETTE WINAPI WinGCreateHalfTonePalette( void ) } /*********************************************************************** - * WinGCreateHalfToneBrush (WING32.@) + * WinGCreateHalftoneBrush (WING32.@) */ -HBRUSH WINAPI WinGCreateHalfToneBrush( HDC hdc, COLORREF color, INT type ) +HBRUSH WINAPI WinGCreateHalftoneBrush( HDC hdc, COLORREF color, INT type ) { return CreateSolidBrush( color ); } diff --git a/dlls/wing32/wing32.spec b/dlls/wing32/wing32.spec index 67d3bb8..c2f361d 100644 --- a/dlls/wing32/wing32.spec +++ b/dlls/wing32/wing32.spec @@ -1,8 +1,8 @@ @ stdcall WinGBitBlt(long long long long long long long long) @ stdcall WinGCreateBitmap(long ptr ptr) @ stdcall WinGCreateDC() -@ stdcall WinGCreateHalfToneBrush(long long long) -@ stdcall WinGCreateHalfTonePalette() +@ stdcall WinGCreateHalftoneBrush(long long long) +@ stdcall WinGCreateHalftonePalette() @ stdcall WinGGetDIBColorTable(long long long ptr) @ stdcall WinGGetDIBPointer(long ptr) @ stdcall WinGRecommendDIBFormat(ptr)

1 0

Francois Gouget : setupapi: Fix the SetupDiGetActualSectionToInstallEx() definition.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 0fa223d7ec643e3f5cf89ba54763eccc88b78e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa223d7ec643e3f5cf89ba54… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 18 11:12:31 2011 +0200 setupapi: Fix the SetupDiGetActualSectionToInstallEx() definition. --- include/setupapi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index c15ec52..baa5787 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1516,7 +1516,7 @@ BOOL WINAPI SetupDiGetActualSectionToInstallW(HINF, PCWSTR, PWSTR, DWORD, PD #define SetupDiGetActualSectionToInstall WINELIB_NAME_AW(SetupDiGetActualSectionToInstall) BOOL WINAPI SetupDiGetActualSectionToInstallExA(HINF, PCSTR, PSTR, DWORD, PDWORD, PSTR *, PVOID); BOOL WINAPI SetupDiGetActualSectionToInstallExW(HINF, PCWSTR, PWSTR, DWORD, PDWORD, PWSTR *, PVOID); -#define SetupDiGetActualSectionToInstallEx WINELIB_NAME_AW(SetupDiGetActualSectionToInstalExl) +#define SetupDiGetActualSectionToInstallEx WINELIB_NAME_AW(SetupDiGetActualSectionToInstallEx) BOOL WINAPI SetupDiGetClassBitmapIndex(const GUID *, PINT); BOOL WINAPI SetupDiGetClassDescriptionA(const GUID*, PSTR, DWORD, PDWORD); BOOL WINAPI SetupDiGetClassDescriptionW(const GUID*, PWSTR, DWORD, PDWORD);

1 0

Francois Gouget : mshtml: get_channelbsc_mon() is unused so remove it.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: d69dd163ba262317c53ba72b9375f8a5832f344c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69dd163ba262317c53ba72b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 18 11:18:25 2011 +0200 mshtml: get_channelbsc_mon() is unused so remove it. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/navigate.c | 7 ------- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 084cd08..94dddad 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -731,7 +731,6 @@ HRESULT bind_mon_to_buffer(HTMLDocumentNode*,IMoniker*,void**,DWORD*); HRESULT create_channelbsc(IMoniker*,WCHAR*,BYTE*,DWORD,nsChannelBSC**); HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*); void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*); -IMoniker *get_channelbsc_mon(nsChannelBSC*); void set_ready_state(HTMLWindow*,READYSTATE); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 990401a..78e747a 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1589,13 +1589,6 @@ HRESULT create_channelbsc(IMoniker *mon, WCHAR *headers, BYTE *post_data, DWORD return S_OK; } -IMoniker *get_channelbsc_mon(nsChannelBSC *This) -{ - if(This->bsc.mon) - IMoniker_AddRef(This->bsc.mon); - return This->bsc.mon; -} - void set_window_bscallback(HTMLWindow *window, nsChannelBSC *callback) { if(window->bscallback) {

1 0

Francois Gouget : msi: Move msi_get_cabinet_stream() up and make it static.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: d685bfa548834db471aaaad9a938fe1ed1e40a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d685bfa548834db471aaaad9a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 18 11:19:31 2011 +0200 msi: Move msi_get_cabinet_stream() up and make it static. --- dlls/msi/media.c | 22 +++++++++++----------- dlls/msi/msipriv.h | 1 - 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index c261d7c..6675f2b 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -117,6 +117,17 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) return r; } +static MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id ) +{ + MSICABINETSTREAM *cab; + + LIST_FOR_EACH_ENTRY( cab, &package->cabinet_streams, MSICABINETSTREAM, entry ) + { + if (cab->disk_id == disk_id) return cab; + } + return NULL; +} + static void * CDECL cabinet_alloc(ULONG cb) { return msi_alloc(cb); @@ -919,14 +930,3 @@ UINT msi_add_cabinet_stream( MSIPACKAGE *package, UINT disk_id, IStorage *storag return ERROR_SUCCESS; } - -MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id ) -{ - MSICABINETSTREAM *cab; - - LIST_FOR_EACH_ENTRY( cab, &package->cabinet_streams, MSICABINETSTREAM, entry ) - { - if (cab->disk_id == disk_id) return cab; - } - return NULL; -} diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c132477..848fe01 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1018,7 +1018,6 @@ extern UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, M extern UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi); extern void msi_free_media_info(MSIMEDIAINFO *mi); extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data); -extern MSICABINETSTREAM *msi_get_cabinet_stream(MSIPACKAGE *, UINT); extern UINT msi_add_cabinet_stream(MSIPACKAGE *, UINT, IStorage *, const WCHAR *); /* control event stuff */

1 0