August 2013 - Wine-Commits - list.winehq.org

Jacek Caban : widl: Generate names for imported nameless typedefs.
by Alexandre Julliard Aug. 29, 2013

Aug. 29, 2013

Module: wine Branch: master Commit: 7e4462e28e9f66b61891683b77180d04148b06f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4462e28e9f66b61891683b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 29 15:09:21 2013 +0200 widl: Generate names for imported nameless typedefs. --- tools/widl/parser.y | 4 ++-- tools/widl/widl.c | 5 +++-- tools/widl/widl.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5751598..97c3896 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1840,7 +1840,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at type_get_type_detect_alias(type) == TYPE_STRUCT || type_get_type_detect_alias(type) == TYPE_UNION || type_get_type_detect_alias(type) == TYPE_ENCAPSULATED_UNION) && - !type->name && !parse_only) + !type->name) { if (! is_attr(attrs, ATTR_PUBLIC) && ! is_attr (attrs, ATTR_HIDDEN)) attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); @@ -1980,7 +1980,7 @@ static char *gen_name(void) if (! file_id) { - char *dst = dup_basename(input_name, ".idl"); + char *dst = dup_basename(input_idl_name, ".idl"); file_id = dst; for (; *dst; ++dst) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 2ff1977..b37a0f8 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -118,6 +118,7 @@ int do_rt_extension = 0; static enum stub_mode stub_mode = MODE_Os; char *input_name; +char *input_idl_name; char *header_name; char *local_stubs_name; char *header_token; @@ -488,7 +489,7 @@ void write_id_data(const statement_list_t *stmts) } fprintf(idfile, "/*** Autogenerated by WIDL %s ", PACKAGE_VERSION); - fprintf(idfile, "from %s - Do not edit ***/\n\n", input_name); + fprintf(idfile, "from %s - Do not edit ***/\n\n", input_idl_name); fprintf(idfile, "#include <rpc.h>\n"); fprintf(idfile, "#include <rpcndr.h>\n\n"); fprintf(idfile, "#include <initguid.h>\n\n"); @@ -706,7 +707,7 @@ int main(int argc,char *argv[]) return 1; } else - input_name = xstrdup(argv[optind]); + input_idl_name = input_name = xstrdup(argv[optind]); } else { fprintf(stderr, "%s", usage); diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 91054ad..9e09f76 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -52,6 +52,7 @@ extern int win64_packing; extern int do_rt_extension; extern char *input_name; +extern char *input_idl_name; extern char *header_name; extern char *header_token; extern char *local_stubs_name;

1 0

Jacek Caban : widl: Include string info in tlb custom data.
by Alexandre Julliard Aug. 29, 2013

Aug. 29, 2013

Module: wine Branch: master Commit: 02775123509652d0d7d09003a070b7ce0f83f95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=02775123509652d0d7d09003a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 29 15:08:51 2013 +0200 widl: Include string info in tlb custom data. --- tools/widl/write_msft.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 53e1feb..d938d00 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1232,7 +1232,7 @@ static void write_value(msft_typelib_t* typelib, int *out, int vt, const void *v } static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, - int vt, int value, int *offset) + int vt, const void *value, int *offset) { MSFT_GuidEntry guidentry; int guidoffset; @@ -1246,7 +1246,7 @@ static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, guidentry.next_hash = -1; guidoffset = ctl2_alloc_guid(typelib, &guidentry); - write_value(typelib, &data_out, vt, &value); + write_value(typelib, &data_out, vt, value); custoffset = ctl2_alloc_segment(typelib, MSFT_SEG_CUSTDATAGUID, 12, 0); @@ -2567,8 +2567,10 @@ int create_msft_typelib(typelib_t *typelib) time_t cur_time; char *time_override; unsigned int version = 5 << 24 | 1 << 16 | 164; /* 5.01.0164 */ - GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; - GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + GUID midl_info_guid = {0xde77ba65,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + char info_string[128]; pointer_size = (typelib_kind == SYS_WIN64) ? 8 : 4; @@ -2615,8 +2617,10 @@ int create_msft_typelib(typelib_t *typelib) and midl's version number */ time_override = getenv( "WIDL_TIME_OVERRIDE"); cur_time = time_override ? atol( time_override) : time(NULL); - set_custdata(msft, &midl_time_guid, VT_UI4, cur_time, &msft->typelib_header.CustomDataOffset); - set_custdata(msft, &midl_version_guid, VT_UI4, version, &msft->typelib_header.CustomDataOffset); + sprintf(info_string, "Created by WIDL version %s at %s\n", PACKAGE_VERSION, ctime(&cur_time)); + set_custdata(msft, &midl_info_guid, VT_BSTR, info_string, &msft->typelib_header.CustomDataOffset); + set_custdata(msft, &midl_time_guid, VT_UI4, &cur_time, &msft->typelib_header.CustomDataOffset); + set_custdata(msft, &midl_version_guid, VT_UI4, &version, &msft->typelib_header.CustomDataOffset); if (typelib->stmts) LIST_FOR_EACH_ENTRY( stmt, typelib->stmts, const statement_t, entry )

1 0

Jacek Caban : widl: Increase version number stored in custom data.
by Alexandre Julliard Aug. 29, 2013

Aug. 29, 2013

Module: wine Branch: master Commit: 2510ec477bba134c753302795d55226a44f42df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2510ec477bba134c753302795… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 29 15:09:05 2013 +0200 widl: Increase version number stored in custom data. --- tools/widl/write_msft.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index d938d00..dd98486 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2566,7 +2566,7 @@ int create_msft_typelib(typelib_t *typelib) const statement_t *stmt; time_t cur_time; char *time_override; - unsigned int version = 5 << 24 | 1 << 16 | 164; /* 5.01.0164 */ + unsigned int version = 7 << 24 | 555; /* 7.00.0555 */ GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; GUID midl_info_guid = {0xde77ba65,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}};

1 0

Hans Leidekker : wininet: Replacing a header with an empty value deletes it .
by Alexandre Julliard Aug. 29, 2013

Aug. 29, 2013

Module: wine Branch: master Commit: 1bf936c900150618717ea3c7aed0bbbfb0d397bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf936c900150618717ea3c7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 29 15:26:18 2013 +0200 wininet: Replacing a header with an empty value deletes it. --- dlls/wininet/http.c | 2 +- dlls/wininet/tests/http.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b6ed7df..954c98b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -6062,7 +6062,7 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR { HTTP_DeleteCustomHeader( request, index ); - if (value) + if (value && value[0]) { HTTPHEADERW hdr; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f04fc7b..bf57223 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1759,6 +1759,27 @@ static void HttpHeaders_test(void) ok(index == 1, "Index was not incremented\n"); ok(strcmp(buffer,"value3")==0, "incorrect string was returned(%s)\n",buffer); + ok(HttpAddRequestHeaders(hRequest, "Authorization: Basic\r\n", -1, HTTP_ADDREQ_FLAG_ADD), + "unable to add header %u\n", GetLastError()); + + index = 0; + buffer[0] = 0; + len = sizeof(buffer); + ok(HttpQueryInfo(hRequest, HTTP_QUERY_AUTHORIZATION|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, &index), + "unable to query header %u\n", GetLastError()); + ok(index == 1, "index was not incremented\n"); + ok(!strcmp(buffer, "Basic"), "incorrect string was returned (%s)\n", buffer); + + ok(HttpAddRequestHeaders(hRequest, "Authorization:\r\n", -1, HTTP_ADDREQ_FLAG_REPLACE), + "unable to remove header %u\n", GetLastError()); + + index = 0; + len = sizeof(buffer); + SetLastError(0xdeadbeef); + ok(!HttpQueryInfo(hRequest, HTTP_QUERY_AUTHORIZATION|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, &index), + "header still present\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "got %u\n", GetLastError()); + ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: ok(InternetCloseHandle(hConnect), "Close connect handle failed\n");

1 0

Alexandre Julliard : winex11: Use a InitOnce function to initialize GDI device parameters.
by Alexandre Julliard Aug. 29, 2013

Aug. 29, 2013

Module: wine Branch: master Commit: cf380c9c67f677fb5d3b4005fb5007577a2f2cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf380c9c67f677fb5d3b4005f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 16:49:04 2013 +0200 winex11: Use a InitOnce function to initialize GDI device parameters. --- dlls/winex11.drv/init.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 8f8ff09..6e6ed17 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -39,10 +39,11 @@ static int log_pixels_y; /* pixels per logical inch in y direction */ static int horz_size; /* horz. size of screen in millimeters */ static int vert_size; /* vert. size of screen in millimeters */ static int palette_size; -static int device_init_done; static Pixmap stock_bitmap_pixmap; /* phys bitmap for the default stock bitmap */ +static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; @@ -79,10 +80,8 @@ static DWORD get_dpi( void ) * * Perform initializations needed upon creation of the first device. */ -static void device_init(void) +static BOOL WINAPI device_init( INIT_ONCE *once, void *param, void **context ) { - device_init_done = TRUE; - /* Initialize XRender */ xrender_funcs = X11DRV_XRender_Init(); @@ -97,6 +96,7 @@ static void device_init(void) log_pixels_x = log_pixels_y = get_dpi(); horz_size = MulDiv( screen_width, 254, log_pixels_x * 10 ); vert_size = MulDiv( screen_height, 254, log_pixels_y * 10 ); + return TRUE; } @@ -104,7 +104,7 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable ) { X11DRV_PDEVICE *physDev; - if (!device_init_done) device_init(); + InitOnceExecuteOnce( &init_once, device_init, NULL, NULL ); if (!(physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev) ))) return NULL;

1 0

Alexandre Julliard : ntdll: Use a RunOnce function to initialize relay debugging options.
by Alexandre Julliard Aug. 29, 2013

Aug. 29, 2013

Module: wine Branch: master Commit: 3d83da047a06a7a089acb50058255ecd026dd8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d83da047a06a7a089acb5005… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 16:49:43 2013 +0200 ntdll: Use a RunOnce function to initialize relay debugging options. --- dlls/ntdll/relay.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index b6790da..57ad2e1 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -81,7 +81,7 @@ static const WCHAR **debug_from_relay_includelist; static const WCHAR **debug_from_snoop_excludelist; static const WCHAR **debug_from_snoop_includelist; -static BOOL init_done; +static RTL_RUN_ONCE init_once = RTL_RUN_ONCE_INIT; /* compare an ASCII and a Unicode string without depending on the current codepage */ static inline int strcmpAW( const char *strA, const WCHAR *strW ) @@ -172,7 +172,7 @@ static const WCHAR **load_list( HKEY hkey, const WCHAR *value ) * * Build the relay include/exclude function lists. */ -static void init_debug_lists(void) +static DWORD WINAPI init_debug_lists( RTL_RUN_ONCE *once, void *param, void **context ) { OBJECT_ATTRIBUTES attr; UNICODE_STRING name; @@ -189,9 +189,6 @@ static void init_debug_lists(void) static const WCHAR SnoopFromIncludeW[] = {'S','n','o','o','p','F','r','o','m','I','n','c','l','u','d','e',0}; static const WCHAR SnoopFromExcludeW[] = {'S','n','o','o','p','F','r','o','m','E','x','c','l','u','d','e',0}; - if (init_done) return; - init_done = TRUE; - RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); attr.RootDirectory = root; @@ -204,7 +201,7 @@ static void init_debug_lists(void) /* @@ Wine registry key: HKCU\Software\Wine\Debug */ if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) hkey = 0; NtClose( root ); - if (!hkey) return; + if (!hkey) return TRUE; debug_relay_includelist = load_list( hkey, RelayIncludeW ); debug_relay_excludelist = load_list( hkey, RelayExcludeW ); @@ -216,6 +213,7 @@ static void init_debug_lists(void) debug_from_snoop_excludelist = load_list( hkey, SnoopFromExcludeW ); NtClose( hkey ); + return TRUE; } @@ -698,7 +696,7 @@ void RELAY_SetupDLL( HMODULE module ) struct relay_private_data *data; const WORD *ordptr; - if (!init_done) init_debug_lists(); + RtlRunOnceExecuteOnce( &init_once, init_debug_lists, NULL, NULL ); exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &size ); if (!exports) return; @@ -855,7 +853,7 @@ void SNOOP_SetupDLL(HMODULE hmod) ULONG size32; IMAGE_EXPORT_DIRECTORY *exports; - if (!init_done) init_debug_lists(); + RtlRunOnceExecuteOnce( &init_once, init_debug_lists, NULL, NULL ); exports = RtlImageDirectoryEntryToData( hmod, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &size32 ); if (!exports || !exports->NumberOfFunctions) return;

1 0

Alexandre Julliard : ntdll: Use a RunOnce function to initialize directory lookup options.
by Alexandre Julliard Aug. 29, 2013

Aug. 29, 2013

Module: wine Branch: master Commit: d191d5bca01c8e517daf3f7c4019cce09ede62bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d191d5bca01c8e517daf3f7c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 16:48:23 2013 +0200 ntdll: Use a RunOnce function to initialize directory lookup options. --- dlls/ntdll/directory.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cf89879..f65cc9f 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -157,7 +157,8 @@ union file_directory_info FILE_ID_FULL_DIRECTORY_INFORMATION id_full; }; -static int show_dot_files = -1; +static BOOL show_dot_files; +static RTL_RUN_ONCE init_once = RTL_RUN_ONCE_INIT; /* at some point we may want to allow Winelib apps to set this */ static const int is_case_sensitive = FALSE; @@ -1036,7 +1037,7 @@ static BOOLEAN get_dir_case_sensitivity( const char *dir ) * * Initialize the show_dot_files options. */ -static void init_options(void) +static DWORD WINAPI init_options( RTL_RUN_ONCE *once, void *param, void **context ) { static const WCHAR WineW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; static const WCHAR ShowDotFilesW[] = {'S','h','o','w','D','o','t','F','i','l','e','s',0}; @@ -1046,8 +1047,6 @@ static void init_options(void) OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - show_dot_files = 0; - RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); attr.RootDirectory = root; @@ -1077,6 +1076,7 @@ static void init_options(void) #ifdef linux ignore_file( "/sys" ); #endif + return TRUE; } @@ -1089,7 +1089,8 @@ BOOL DIR_is_hidden_file( const UNICODE_STRING *name ) { WCHAR *p, *end; - if (show_dot_files == -1) init_options(); + RtlRunOnceExecuteOnce( &init_once, init_options, NULL, NULL ); + if (show_dot_files) return FALSE; end = p = name->Buffer + name->Length/sizeof(WCHAR); @@ -2053,9 +2054,9 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, io->Information = 0; - RtlEnterCriticalSection( &dir_section ); + RtlRunOnceExecuteOnce( &init_once, init_options, NULL, NULL ); - if (show_dot_files == -1) init_options(); + RtlEnterCriticalSection( &dir_section ); cwd = open( ".", O_RDONLY ); if (fchdir( fd ) != -1)

1 0

Piotr Caban : msvcrt: Add _wsetlocale implementation.
by Alexandre Julliard Aug. 29, 2013

Aug. 29, 2013

Module: wine Branch: master Commit: 33d697c001049b6c20203d3332299dfc4c5af6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d697c001049b6c20203d333… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 29 12:07:03 2013 +0200 msvcrt: Add _wsetlocale implementation. --- dlls/msvcrt/locale.c | 48 ++++++++++++++++++++++++++++++++++-------------- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 14ccd0a..4e8467a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -407,20 +407,6 @@ static inline char* construct_lc_all(MSVCRT_pthreadlocinfo locinfo) { /********************************************************************* - * wsetlocale (MSVCRT.@) - */ -MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* locale) -{ - static MSVCRT_wchar_t fake[] = { - 'E','n','g','l','i','s','h','_','U','n','i','t','e','d',' ', - 'S','t','a','t','e','s','.','1','2','5','2',0 }; - - FIXME("%d %s\n", category, debugstr_w(locale)); - - return fake; -} - -/********************************************************************* * _Getdays (MSVCRT.@) */ char* CDECL _Getdays(void) @@ -1435,6 +1421,40 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) return locinfo->lc_category[category].locale; } +/********************************************************************* + * _wsetlocale (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* wlocale) +{ + static MSVCRT_wchar_t current_lc_all[MAX_LOCALE_LENGTH]; + + char *locale = NULL; + const char *ret; + MSVCRT_size_t len; + + if(wlocale) { + len = MSVCRT_wcstombs(NULL, wlocale, 0); + if(len == -1) + return NULL; + + locale = MSVCRT_malloc(++len); + if(!locale) + return NULL; + + MSVCRT_wcstombs(locale, wlocale, len); + } + + LOCK_LOCALE; + ret = MSVCRT_setlocale(category, locale); + MSVCRT_free(locale); + + if(ret && MSVCRT_mbstowcs(current_lc_all, ret, MAX_LOCALE_LENGTH)==-1) + ret = NULL; + + UNLOCK_LOCALE; + return ret ? current_lc_all : NULL; +} + /* _configthreadlocale - not exported in native msvcrt */ int CDECL _configthreadlocale(int type) { diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 35e9c7d..98922af 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -953,6 +953,7 @@ int __cdecl _ismbclegal(unsigned int c); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); int __cdecl MSVCRT_mbtowc(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_size_t __cdecl MSVCRT_mbstowcs(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); +MSVCRT_size_t __cdecl MSVCRT_wcstombs(char*,const MSVCRT_wchar_t*,MSVCRT_size_t); MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t __cdecl MSVRT__spawnvpe(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t __cdecl MSVCRT__wspawnve(int,const MSVCRT_wchar_t*,const MSVCRT_wchar_t* const *,const MSVCRT_wchar_t* const *);

1 0

Henri Verbeet : wined3d: Get rid of the unused WINED3D_BUFFER_OPTIMIZED flag.
by Alexandre Julliard Aug. 29, 2013

Aug. 29, 2013

Module: wine Branch: master Commit: 805fc6419830240dfcac6c460efd0922c112d7e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805fc6419830240dfcac6c460… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 29 10:26:25 2013 +0200 wined3d: Get rid of the unused WINED3D_BUFFER_OPTIMIZED flag. --- dlls/wined3d/wined3d_private.h | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76f6888..17c0a0a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2491,14 +2491,13 @@ struct wined3d_map_range UINT size; }; -#define WINED3D_BUFFER_OPTIMIZED 0x01 /* Optimize has been called for the buffer */ -#define WINED3D_BUFFER_HASDESC 0x02 /* A vertex description has been found */ -#define WINED3D_BUFFER_CREATEBO 0x04 /* Attempt to create a buffer object next PreLoad */ -#define WINED3D_BUFFER_DOUBLEBUFFER 0x08 /* Use a vbo and local allocated memory */ -#define WINED3D_BUFFER_FLUSH 0x10 /* Manual unmap flushing */ -#define WINED3D_BUFFER_DISCARD 0x20 /* A DISCARD lock has occurred since the last PreLoad */ -#define WINED3D_BUFFER_NOSYNC 0x40 /* All locks since the last PreLoad had NOOVERWRITE set */ -#define WINED3D_BUFFER_APPLESYNC 0x80 /* Using sync as in GL_APPLE_flush_buffer_range */ +#define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ +#define WINED3D_BUFFER_CREATEBO 0x02 /* Create a buffer object for this buffer. */ +#define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ +#define WINED3D_BUFFER_FLUSH 0x08 /* Manual unmap flushing. */ +#define WINED3D_BUFFER_DISCARD 0x10 /* A DISCARD lock has occurred since the last preload. */ +#define WINED3D_BUFFER_NOSYNC 0x20 /* All locks since the last preload had NOOVERWRITE set. */ +#define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */ struct wined3d_buffer {

1 0

Henri Verbeet : wined3d: Get rid of the DDRAW_PITCH_ALIGNMENT and D3D8_PITCH_ALIGNMENT constants.
by Alexandre Julliard Aug. 29, 2013

Aug. 29, 2013

Module: wine Branch: master Commit: 43ecaf29c39b71eb3f7d3a13a8eb6d0138bb84b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ecaf29c39b71eb3f7d3a13a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 29 10:26:24 2013 +0200 wined3d: Get rid of the DDRAW_PITCH_ALIGNMENT and D3D8_PITCH_ALIGNMENT constants. --- dlls/ddraw/ddraw.c | 12 ++++-------- dlls/ddraw/ddraw_private.h | 2 ++ dlls/wined3d/directx.c | 1 - dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 1 - 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index aac1b5a..420c400 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1228,11 +1228,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD caps.dwSSBCKeyCaps = winecaps.ddraw_caps.ssb_color_key_caps; caps.dwSSBFXCaps = winecaps.ddraw_caps.ssb_fx_caps; - if (winecaps.ddraw_caps.stride_align) - { - caps.dwCaps |= DDCAPS_ALIGNSTRIDE; - caps.dwAlignStrideAlign = winecaps.ddraw_caps.stride_align; - } + caps.dwCaps |= DDCAPS_ALIGNSTRIDE; + caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT; if(DriverCaps) { @@ -5276,9 +5273,8 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->flags |= DDRAW_NO3D; } - hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, - NULL, 0, 8, &ddraw->device_parent, &ddraw->wined3d_device); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, + NULL, 0, DDRAW_STRIDE_ALIGNMENT, &ddraw->device_parent, &ddraw->wined3d_device))) { WARN("Failed to create a wined3d device, hr %#x.\n", hr); wined3d_decref(ddraw->wined3d); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 84f90c4..299d6ca 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -55,6 +55,8 @@ struct FvfToDecl #define DDRAW_NO3D 0x00000008 #define DDRAW_SCL_DDRAW1 0x00000010 +#define DDRAW_STRIDE_ALIGNMENT 8 + struct ddraw { /* Interfaces */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1e4dc6d..e235043 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4657,7 +4657,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDSCAPS_SYSTEMMEMORY | WINEDDSCAPS_VIDEOMEMORY | WINEDDSCAPS_VISIBLE; - caps->ddraw_caps.stride_align = DDRAW_PITCH_ALIGNMENT; if (!(wined3d->flags & WINED3D_NO3D)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ee90b67..76f6888 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1886,8 +1886,6 @@ struct wined3d_device BYTE fixed_function_usage_map; /* MAX_TEXTURES, 8 */ -#define DDRAW_PITCH_ALIGNMENT 8 -#define D3D8_PITCH_ALIGNMENT 4 unsigned char surface_alignment; /* Line Alignment of surfaces */ struct wined3d_state state; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ff6cfbe..bf4b392 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1748,7 +1748,6 @@ struct wined3d_ddraw_caps DWORD ssb_color_key_caps; DWORD ssb_fx_caps; DWORD dds_caps; - DWORD stride_align; }; typedef struct _WINED3DCAPS

1 0