December 2010 - Wine-Commits

Rico Schüller : d3dcompiler: Add initial SHDR and SHEX parsing.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 127d07a3ccbb7ef9446e2eb1e78a514e644959d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=127d07a3ccbb7ef9446e2eb1e… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 28 11:50:13 2010 +0100 d3dcompiler: Add initial SHDR and SHEX parsing. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 +++ dlls/d3dcompiler_43/reflection.c | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 91cce9e..d69b88c 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -72,6 +72,7 @@ struct d3dcompiler_shader_reflection char *creator; UINT flags; + UINT version; UINT bound_resource_count; UINT constant_buffer_count; @@ -630,6 +631,8 @@ void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; #define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') #define TAG_RDEF MAKE_TAG('R', 'D', 'E', 'F') #define TAG_SDBG MAKE_TAG('S', 'D', 'B', 'G') +#define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') +#define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') #define TAG_STAT MAKE_TAG('S', 'T', 'A', 'T') #define TAG_XNAP MAKE_TAG('X', 'N', 'A', 'P') #define TAG_XNAS MAKE_TAG('X', 'N', 'A', 'S') diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index eb01db8..b3b7055 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -556,6 +556,18 @@ HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, cons return S_OK; } +static HRESULT d3dcompiler_parse_shdr(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) +{ + const char *ptr = data; + + read_dword(&ptr, &r->version); + TRACE("Shader version: %u\n", r->version); + + /* todo: Check if anything else is needed from the shdr or shex blob. */ + + return S_OK; +} + HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection *reflection, const void *data, SIZE_T data_size) { @@ -588,6 +600,16 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection } break; + case TAG_SHEX: + case TAG_SHDR: + hr = d3dcompiler_parse_shdr(reflection, section->data, section->data_size); + if (FAILED(hr)) + { + WARN("Failed to parse SHDR section.\n"); + goto err_out; + } + break; + case TAG_RDEF: hr = d3dcompiler_parse_rdef(reflection, section->data, section->data_size); if (FAILED(hr))

1 0

Alexandre Julliard : configure: Add a generic mechanism for passing flags to dll and program rules.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 6cce7fa0ce3ef6a7884008080e84dd5e7fc3831d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cce7fa0ce3ef6a7884008080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 28 15:42:43 2010 +0100 configure: Add a generic mechanism for passing flags to dll and program rules. --- aclocal.m4 | 29 ++-- configure | 339 ++++++++++++++++++++-------------------- configure.ac | 428 +++++++++++++++++++++++++------------------------- tools/make_makefiles | 18 ++- 4 files changed, 413 insertions(+), 401 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cce7fa0ce3ef6a788400…

1 0

Rico Schüller : d3dcompiler: Add initial RDEF parsing.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: a2a7000eeb8180468f189d8b5d3c0b13abd2e8db URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a7000eeb8180468f189d8b5… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 28 11:50:05 2010 +0100 d3dcompiler: Add initial RDEF parsing. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 5 ++ dlls/d3dcompiler_43/reflection.c | 77 +++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 9355c44..91cce9e 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -70,6 +70,11 @@ struct d3dcompiler_shader_reflection ID3D11ShaderReflection ID3D11ShaderReflection_iface; LONG refcount; + char *creator; + UINT flags; + UINT bound_resource_count; + UINT constant_buffer_count; + UINT mov_instruction_count; UINT conversion_instruction_count; UINT instruction_count; diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index d50e18c..eb01db8 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -25,6 +25,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); +static BOOL copy_name(const char *ptr, char **name) +{ + size_t name_len; + + if (!ptr) return TRUE; + + name_len = strlen(ptr) + 1; + if (name_len == 1) + { + return TRUE; + } + + *name = HeapAlloc(GetProcessHeap(), 0, name_len); + if (!*name) + { + ERR("Failed to allocate name memory.\n"); + return FALSE; + } + + memcpy(*name, ptr, name_len); + + return TRUE; +} + static void free_signature(struct d3dcompiler_shader_signature *sig) { TRACE("Free signature %p\n", sig); @@ -54,6 +78,8 @@ static void reflection_cleanup(struct d3dcompiler_shader_reflection *ref) free_signature(ref->pcsg); HeapFree(GetProcessHeap(), 0, ref->pcsg); } + + HeapFree(GetProcessHeap(), 0, ref->creator); } static inline struct d3dcompiler_shader_reflection *impl_from_ID3D11ShaderReflection(ID3D11ShaderReflection *iface) @@ -423,6 +449,48 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c return E_FAIL; } +static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) +{ + const char *ptr = data; + DWORD size = data_size >> 2; + DWORD offset; + + TRACE("Size %u\n", size); + + read_dword(&ptr, &r->constant_buffer_count); + TRACE("Constant buffer count: %u\n", r->constant_buffer_count); + + read_dword(&ptr, &offset); + TRACE("Constant buffer offset: %x\n", offset); + + read_dword(&ptr, &r->bound_resource_count); + TRACE("Bound resource count: %u\n", r->bound_resource_count); + + read_dword(&ptr, &offset); + TRACE("Bound resource offset: %x\n", offset); + + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &r->flags); + TRACE("Flags: %u\n", r->flags); + + read_dword(&ptr, &offset); + TRACE("Creator at offset %#x.\n", offset); + + if (!copy_name(data + offset, &r->creator)) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + TRACE("Creator: %s.\n", debugstr_a(r->creator)); + + /* todo: Parse D3D11_SHADER_INPUT_BIND_DESC Structure */ + + /* todo: Parse Constant buffers */ + + return S_OK; +} + HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, const char *data, DWORD data_size) { D3D11_SIGNATURE_PARAMETER_DESC *d; @@ -520,6 +588,15 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection } break; + case TAG_RDEF: + hr = d3dcompiler_parse_rdef(reflection, section->data, section->data_size); + if (FAILED(hr)) + { + WARN("Failed to parse RDEF section.\n"); + goto err_out; + } + break; + case TAG_ISGN: reflection->isgn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*reflection->isgn)); if (!reflection->isgn)

1 0

Alexandre Julliard : winebuild: Allow duplicate resources with different versions and keep the highest version .
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 86395501551067a070cd9b2f2a7ca65680f2163b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86395501551067a070cd9b2f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 27 22:27:53 2010 +0100 winebuild: Allow duplicate resources with different versions and keep the highest version. --- tools/winebuild/res32.c | 45 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 36 insertions(+), 9 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 8a2ac3a..0c2bd09 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -53,6 +53,7 @@ struct resource unsigned int data_offset; unsigned short mem_options; unsigned short lang; + unsigned int version; }; /* name level of the resource tree */ @@ -232,7 +233,7 @@ static void load_next_resource( DLLSPEC *spec ) get_dword(); /* skip data version */ res->mem_options = get_word(); res->lang = get_word(); - get_dword(); /* skip version */ + res->version = get_dword(); get_dword(); /* skip characteristics */ input_buffer_pos = ((const unsigned char *)res->data - input_buffer) + ((res->data_size + 3) & ~3); @@ -277,7 +278,8 @@ static int cmp_res( const void *ptr1, const void *ptr2 ) if ((ret = cmp_string( &res1->type, &res2->type ))) return ret; if ((ret = cmp_string( &res1->name, &res2->name ))) return ret; - return res1->lang - res2->lang; + if ((ret = res1->lang - res2->lang)) return ret; + return res1->version - res2->version; } static char *format_res_string( const struct string_id *str ) @@ -290,6 +292,31 @@ static char *format_res_string( const struct string_id *str ) return ret; } +/* get rid of duplicate resources with different versions */ +static void remove_duplicate_resources( DLLSPEC *spec ) +{ + unsigned int i, n; + + for (i = n = 0; i < spec->nb_resources; i++, n++) + { + if (i && !cmp_string( &spec->resources[i].type, &spec->resources[i-1].type ) && + !cmp_string( &spec->resources[i].name, &spec->resources[i-1].name ) && + spec->resources[i].lang == spec->resources[i-1].lang) + { + if (spec->resources[i].version == spec->resources[i-1].version) + { + char *type_str = format_res_string( &spec->resources[i].type ); + char *name_str = format_res_string( &spec->resources[i].name ); + error( "winebuild: duplicate resource type %s name %s language %04x version %08x\n", + type_str, name_str, spec->resources[i].lang, spec->resources[i].version ); + } + else n--; /* replace the previous one */ + } + if (n < i) spec->resources[n] = spec->resources[i]; + } + spec->nb_resources = n; +} + /* build the 3-level (type,name,language) resource tree */ static struct res_tree *build_resource_tree( DLLSPEC *spec, unsigned int *dir_size ) { @@ -300,6 +327,7 @@ static struct res_tree *build_resource_tree( DLLSPEC *spec, unsigned int *dir_si struct resource *res; qsort( spec->resources, spec->nb_resources, sizeof(*spec->resources), cmp_res ); + remove_duplicate_resources( spec ); tree = xmalloc( sizeof(*tree) ); tree->types = NULL; @@ -316,14 +344,10 @@ static struct res_tree *build_resource_tree( DLLSPEC *spec, unsigned int *dir_si { name = add_name( type, &spec->resources[i] ); } - else if (spec->resources[i].lang == spec->resources[i-1].lang) + else { - char *type_str = format_res_string( &spec->resources[i].type ); - char *name_str = format_res_string( &spec->resources[i].name ); - error( "winebuild: duplicate resource type %s name %s language %04x\n", - type_str, name_str, spec->resources[i].lang ); + name->nb_languages++; } - else name->nb_languages++; } /* compute the offsets */ @@ -606,6 +630,9 @@ void output_res_o_file( DLLSPEC *spec ) if (!spec->nb_resources) fatal_error( "--resources mode needs at least one resource file as input\n" ); if (!output_file_name) fatal_error( "No output file name specified\n" ); + qsort( spec->resources, spec->nb_resources, sizeof(*spec->resources), cmp_res ); + remove_duplicate_resources( spec ); + byte_swapped = 0; init_output_buffer(); @@ -633,7 +660,7 @@ void output_res_o_file( DLLSPEC *spec ) put_dword( 0 ); put_word( spec->resources[i].mem_options ); put_word( spec->resources[i].lang ); - put_dword( 0 ); + put_dword( spec->resources[i].version ); put_dword( 0 ); put_data( spec->resources[i].data, spec->resources[i].data_size ); align_output( 4 );

1 0

Michael Stefaniuc : mshtml: COM cleanup for the remaining ifaces in NSContainer.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 6723b3c56c12eac31cc4db3d7e657b09e07eb3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6723b3c56c12eac31cc4db3d7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:30:53 2010 +0100 mshtml: COM cleanup for the remaining ifaces in NSContainer. --- dlls/mshtml/mshtml_private.h | 21 ++---- dlls/mshtml/nsembed.c | 172 ++++++++++++++++++++++-------------------- 2 files changed, 97 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6723b3c56c12eac31cc4d…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the nsIWebBrowserChrome iface.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 29944c7cafa573b5b00a656e2b3dd28274e5bc7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=29944c7cafa573b5b00a656e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:27:55 2010 +0100 mshtml: COM cleanup for the nsIWebBrowserChrome iface. --- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/nsembed.c | 97 +++++++++++++++++++++-------------------- dlls/mshtml/nsio.c | 8 ++-- 3 files changed, 55 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29944c7cafa573b5b00a6…

1 0

Michael Stefaniuc : avifil32: Use an iface instead of a vtbl pointer in IAVIStreamImpl.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: a45ae7ba889e0813e82c437a91d49ac6e6454f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45ae7ba889e0813e82c437a9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:12:14 2010 +0100 avifil32: Use an iface instead of a vtbl pointer in IAVIStreamImpl. --- dlls/avifil32/icmstream.c | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index dba120b..58d7790 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -72,8 +72,8 @@ static const struct IAVIStreamVtbl iicmst = { typedef struct _IAVIStreamImpl { /* IUnknown stuff */ - const IAVIStreamVtbl *lpVtbl; - LONG ref; + IAVIStream IAVIStream_iface; + LONG ref; /* IAVIStream stuff */ PAVISTREAM pStream; @@ -107,6 +107,11 @@ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This, LPBITMAPINFOHEADER lpbi, LPVOID lpBits); static HRESULT AVIFILE_OpenGetFrame(IAVIStreamImpl *This); +static inline IAVIStreamImpl *impl_from_IAVIStream(IAVIStream *iface) +{ + return CONTAINING_RECORD(iface, IAVIStreamImpl, IAVIStream_iface); +} + static inline void AVIFILE_Reset(IAVIStreamImpl *This) { This->lCurrent = -1; @@ -128,10 +133,10 @@ HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppv) if (pstream == NULL) return AVIERR_MEMORY; - pstream->lpVtbl = &iicmst; + pstream->IAVIStream_iface.lpVtbl = &iicmst; AVIFILE_Reset(pstream); - hr = IAVIStream_QueryInterface((IAVIStream*)pstream, riid, ppv); + hr = IAVIStream_QueryInterface(&pstream->IAVIStream_iface, riid, ppv); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, pstream); @@ -141,7 +146,7 @@ HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppv) static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream *iface, REFIID refiid, LPVOID *obj) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(refiid), obj); @@ -158,7 +163,7 @@ static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream *iface, static ULONG WINAPI ICMStream_fnAddRef(IAVIStream *iface) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) -> %d\n", iface, ref); @@ -172,7 +177,7 @@ static ULONG WINAPI ICMStream_fnAddRef(IAVIStream *iface) static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) -> %d\n", iface, ref); @@ -231,7 +236,7 @@ static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface) static HRESULT WINAPI ICMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, LPARAM lParam2) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); ICINFO icinfo; ICCOMPRESSFRAMES icFrames; @@ -320,7 +325,7 @@ static HRESULT WINAPI ICMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, static HRESULT WINAPI ICMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, LONG size) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%p,%d)\n", iface, psi, size); @@ -339,7 +344,7 @@ static HRESULT WINAPI ICMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos, LONG flags) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,0x%08X)\n",iface,pos,flags); @@ -376,7 +381,7 @@ static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos, static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos, LPVOID format, LONG *formatsize) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); LPBITMAPINFOHEADER lpbi; HRESULT hr; @@ -427,7 +432,7 @@ static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos, static HRESULT WINAPI ICMStream_fnSetFormat(IAVIStream *iface, LONG pos, LPVOID format, LONG formatsize) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize); @@ -579,7 +584,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start, LONG buffersize, LPLONG bytesread, LPLONG samplesread) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); LPBITMAPINFOHEADER lpbi; @@ -673,7 +678,7 @@ static HRESULT WINAPI ICMStream_fnWrite(IAVIStream *iface, LONG start, LPLONG sampwritten, LPLONG byteswritten) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); HRESULT hr; @@ -718,7 +723,7 @@ static HRESULT WINAPI ICMStream_fnWrite(IAVIStream *iface, LONG start, static HRESULT WINAPI ICMStream_fnDelete(IAVIStream *iface, LONG start, LONG samples) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,%d)\n", iface, start, samples); @@ -728,7 +733,7 @@ static HRESULT WINAPI ICMStream_fnDelete(IAVIStream *iface, LONG start, static HRESULT WINAPI ICMStream_fnReadData(IAVIStream *iface, DWORD fcc, LPVOID lp, LPLONG lpread) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,0x%08X,%p,%p)\n", iface, fcc, lp, lpread); @@ -740,7 +745,7 @@ static HRESULT WINAPI ICMStream_fnReadData(IAVIStream *iface, DWORD fcc, static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream *iface, DWORD fcc, LPVOID lp, LONG size) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,0x%08x,%p,%d)\n", iface, fcc, lp, size);

1 0

Hwang YunSong : msvfw32: Update Korean resource.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: dd7dc1f8ec531586df598ed262f1cc6244d1c198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd7dc1f8ec531586df598ed26… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Dec 28 11:12:49 2010 +0900 msvfw32: Update Korean resource. --- dlls/msvfw32/msvfw32_Ko.rc | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Ko.rc b/dlls/msvfw32/msvfw32_Ko.rc index 0422749..98f2c9b 100644 --- a/dlls/msvfw32/msvfw32_Ko.rc +++ b/dlls/msvfw32/msvfw32_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2005 Dmitry Timoshkov - * Copyright 2005,2006 YunSong Hwang + * Copyright 2005,2006,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,36 +19,38 @@ #include "msvideo_private.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "비디오 압축" FONT 9, "MS Shell Dlg" { - DEFPUSHBUTTON "Ȯ��",IDOK,129,2,49,14 - PUSHBUTTON "��",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "확인",IDOK,129,2,49,14 + PUSHBUTTON "취소",IDCANCEL,129,18,49,14 - LTEXT "��(&C):",-1,9,6,105,8 + LTEXT "압축(&C):",-1,9,6,105,8 COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "��(&F)...",882,129,36,49,14 - PUSHBUTTON "��(&A)...",883,129,52,49,14 + PUSHBUTTON "설정(&F)...",882,129,36,49,14 + PUSHBUTTON "정보(&A)...",883,129,52,49,14 SCROLLBAR 884,9,44,111,9,WS_TABSTOP - LTEXT "�� ǰ��(&Q):",886,9,34,80,8 + LTEXT "압축 품질(&Q):",886,9,34,80,8 - CONTROL "�� Ű ��(&K)",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + CONTROL "모든 키 프레임(&K)",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 EDITTEXT 888,78,60,22,12 - LTEXT "��",889,103,62,26,10 + LTEXT "프레임",889,103,62,26,10 - CONTROL "��Ÿ ��(&D)",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + CONTROL "데이타 전송율(&D)",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 EDITTEXT 895,78,76,22,12 LTEXT "KB/sec",896,102,78,26,10 } STRINGTABLE { - IDS_FULLFRAMES "��ä ��(��)" + IDS_FULLFRAMES "전채 프레임(비압축)" }

1 0

Michael Stefaniuc : avifil32: Reorder some code to avoid forward declarations for the IGetFrameVtbl methods .
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 6994317b05a554f0e7ab5956c0f95ebd90a14388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6994317b05a554f0e7ab5956c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:26:23 2010 +0100 avifil32: Reorder some code to avoid forward declarations for the IGetFrameVtbl methods. --- dlls/avifil32/getframe.c | 73 +++++++++++++++++++--------------------------- 1 files changed, 30 insertions(+), 43 deletions(-) diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index 6f3e6ba..c24009c 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -37,29 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); /***********************************************************************/ -static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface, - REFIID refiid, LPVOID *obj); -static ULONG WINAPI IGetFrame_fnAddRef(IGetFrame *iface); -static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface); -static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos); -static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart, - LONG lEnd, LONG lRate); -static HRESULT WINAPI IGetFrame_fnEnd(IGetFrame *iface); -static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, - LPBITMAPINFOHEADER lpbi, - LPVOID lpBits, INT x, INT y, - INT dx, INT dy); - -static const struct IGetFrameVtbl igetframeVtbl = { - IGetFrame_fnQueryInterface, - IGetFrame_fnAddRef, - IGetFrame_fnRelease, - IGetFrame_fnGetFrame, - IGetFrame_fnBegin, - IGetFrame_fnEnd, - IGetFrame_fnSetFormat -}; - typedef struct _IGetFrameImpl { /* IUnknown stuff */ IGetFrame IGetFrame_iface; @@ -115,26 +92,6 @@ static void AVIFILE_CloseCompressor(IGetFrameImpl *This) } } -PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream) -{ - IGetFrameImpl *pg; - - /* check parameter */ - if (pStream == NULL) - return NULL; - - pg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IGetFrameImpl)); - if (pg != NULL) { - pg->IGetFrame_iface.lpVtbl = &igetframeVtbl; - pg->ref = 1; - pg->lCurrentFrame = -1; - pg->pStream = pStream; - IAVIStream_AddRef(pStream); - } - - return (PGETFRAME)pg; -} - static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface, REFIID refiid, LPVOID *obj) { @@ -521,4 +478,34 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, } } +static const struct IGetFrameVtbl igetframeVtbl = { + IGetFrame_fnQueryInterface, + IGetFrame_fnAddRef, + IGetFrame_fnRelease, + IGetFrame_fnGetFrame, + IGetFrame_fnBegin, + IGetFrame_fnEnd, + IGetFrame_fnSetFormat +}; + +PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream) +{ + IGetFrameImpl *pg; + + /* check parameter */ + if (pStream == NULL) + return NULL; + + pg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IGetFrameImpl)); + if (pg != NULL) { + pg->IGetFrame_iface.lpVtbl = &igetframeVtbl; + pg->ref = 1; + pg->lCurrentFrame = -1; + pg->pStream = pStream; + IAVIStream_AddRef(pStream); + } + + return (PGETFRAME)pg; +} + /***********************************************************************/

1 0

Michael Stefaniuc : avifil32: Reorder some code to avoid forward declarations for the IAVIStreamVtbl methods .
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 61d84d68bbd170a6ab459386547fe1dfb0acb372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d84d68bbd170a6ab4593865… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:16:22 2010 +0100 avifil32: Reorder some code to avoid forward declarations for the IAVIStreamVtbl methods. --- dlls/avifil32/icmstream.c | 95 +++++++++++++++++++-------------------------- 1 files changed, 40 insertions(+), 55 deletions(-) diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index 58d7790..31dd2be 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -38,38 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); /***********************************************************************/ -static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI ICMStream_fnAddRef(IAVIStream*iface); -static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface); -static HRESULT WINAPI ICMStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2); -static HRESULT WINAPI ICMStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size); -static LONG WINAPI ICMStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags); -static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize); -static HRESULT WINAPI ICMStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize); -static HRESULT WINAPI ICMStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread); -static HRESULT WINAPI ICMStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten); -static HRESULT WINAPI ICMStream_fnDelete(IAVIStream*iface,LONG start,LONG samples); -static HRESULT WINAPI ICMStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread); -static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); -static HRESULT WINAPI ICMStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); - -static const struct IAVIStreamVtbl iicmst = { - ICMStream_fnQueryInterface, - ICMStream_fnAddRef, - ICMStream_fnRelease, - ICMStream_fnCreate, - ICMStream_fnInfo, - ICMStream_fnFindSample, - ICMStream_fnReadFormat, - ICMStream_fnSetFormat, - ICMStream_fnRead, - ICMStream_fnWrite, - ICMStream_fnDelete, - ICMStream_fnReadData, - ICMStream_fnWriteData, - ICMStream_fnSetInfo -}; - typedef struct _IAVIStreamImpl { /* IUnknown stuff */ IAVIStream IAVIStream_iface; @@ -120,29 +88,6 @@ static inline void AVIFILE_Reset(IAVIStreamImpl *This) This->dwUnusedBytes = 0; } -HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppv) -{ - IAVIStreamImpl *pstream; - HRESULT hr; - - assert(riid != NULL && ppv != NULL); - - *ppv = NULL; - - pstream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAVIStreamImpl)); - if (pstream == NULL) - return AVIERR_MEMORY; - - pstream->IAVIStream_iface.lpVtbl = &iicmst; - AVIFILE_Reset(pstream); - - hr = IAVIStream_QueryInterface(&pstream->IAVIStream_iface, riid, ppv); - if (FAILED(hr)) - HeapFree(GetProcessHeap(), 0, pstream); - - return hr; -} - static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream *iface, REFIID refiid, LPVOID *obj) { @@ -762,6 +707,46 @@ static HRESULT WINAPI ICMStream_fnSetInfo(IAVIStream *iface, return E_FAIL; } +static const struct IAVIStreamVtbl iicmst = { + ICMStream_fnQueryInterface, + ICMStream_fnAddRef, + ICMStream_fnRelease, + ICMStream_fnCreate, + ICMStream_fnInfo, + ICMStream_fnFindSample, + ICMStream_fnReadFormat, + ICMStream_fnSetFormat, + ICMStream_fnRead, + ICMStream_fnWrite, + ICMStream_fnDelete, + ICMStream_fnReadData, + ICMStream_fnWriteData, + ICMStream_fnSetInfo +}; + +HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppv) +{ + IAVIStreamImpl *pstream; + HRESULT hr; + + assert(riid != NULL && ppv != NULL); + + *ppv = NULL; + + pstream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAVIStreamImpl)); + if (pstream == NULL) + return AVIERR_MEMORY; + + pstream->IAVIStream_iface.lpVtbl = &iicmst; + AVIFILE_Reset(pstream); + + hr = IAVIStream_QueryInterface(&pstream->IAVIStream_iface, riid, ppv); + if (FAILED(hr)) + HeapFree(GetProcessHeap(), 0, pstream); + + return hr; +} + /***********************************************************************/ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This,

1 0