wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Matteo Bruni : d3dcompiler: Parse vector and matrix declarations.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: de11f800fd9fc7e320ebeb75278e9b61174728fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=de11f800fd9fc7e320ebeb752… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:31 2012 +0200 d3dcompiler: Parse vector and matrix declarations. --- dlls/d3dcompiler_43/hlsl.l | 2 -- dlls/d3dcompiler_43/hlsl.y | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l index ef12ab9..84cf573 100644 --- a/dlls/d3dcompiler_43/hlsl.l +++ b/dlls/d3dcompiler_43/hlsl.l @@ -148,8 +148,6 @@ while {return KW_WHILE; } \.\.\. {return OP_ELLIPSIS; } \<= {return OP_LE; } \>= {return OP_GE; } -\< {return OP_LT; } -\> {return OP_GT; } != {return OP_NE; } \+= {return OP_ADDASSIGN; } \-= {return OP_SUBASSIGN; } diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index ae1599f..cc13e25 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -213,8 +213,6 @@ static DWORD add_modifier(DWORD modifiers, DWORD mod) %token OP_ELLIPSIS %token OP_LE %token OP_GE -%token OP_LT -%token OP_GT %token OP_NE %token OP_ADDASSIGN %token OP_SUBASSIGN @@ -302,6 +300,44 @@ type: base_type { $$ = $1; } + | KW_VECTOR '<' base_type ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_message("Line %u: vectors of non-scalar types are not allowed.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + if ($5 < 1 || $5 > 4) + { + hlsl_message("Line %u: vector size must be between 1 and 4.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + + $$ = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); + } + | KW_MATRIX '<' base_type ',' C_INTEGER ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_message("Line %u: matrices of non-scalar types are not allowed.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + if ($5 < 1 || $5 > 4 || $7 < 1 || $7 > 4) + { + hlsl_message("Line %u: matrix dimensions must be between 1 and 4.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + + $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $5, $7); + } base_type: KW_VOID {

1 0

Bruno Jesus : ws2_32: Fix hostent memory allocation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: b2af5e1d311d409e725c67c731bf83c9fd8fdea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2af5e1d311d409e725c67c73… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jun 9 14:34:59 2012 -0300 ws2_32: Fix hostent memory allocation. --- dlls/ws2_32/socket.c | 75 +++++++++++++++++++++++++-------------------- dlls/ws2_32/tests/sock.c | 8 ++-- 2 files changed, 46 insertions(+), 37 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fd19ab2..b2bed09 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -326,7 +326,7 @@ static INT num_startup; /* reference counter */ static FARPROC blocking_hook = (FARPROC)WSA_DefaultBlockingHook; /* function prototypes */ -static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses, int fill_addresses); +static struct WS_hostent *WS_create_he(char *name, int aliases, int aliases_size, int addresses, int address_length); static struct WS_hostent *WS_dup_he(const struct hostent* p_he); static struct WS_protoent *WS_dup_pe(const struct protoent* p_pe); static struct WS_servent *WS_dup_se(const struct servent* p_se); @@ -4557,7 +4557,7 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) /* Allocate a hostent and enough memory for all the IPs, * including the NULL at the end of the list. */ - hostlist = WS_create_he(hostname, 1, numroutes+1, TRUE); + hostlist = WS_create_he(hostname, 1, 0, numroutes+1, sizeof(struct in_addr)); if (hostlist == NULL) goto cleanup; /* Failed to allocate a hostent for the list of IPs */ hostlist->h_addr_list[numroutes] = NULL; /* NULL-terminate the address list */ @@ -5581,54 +5581,51 @@ static int list_dup(char** l_src, char** l_to, int item_size) * * Creates the entry with enough memory for the name, aliases * addresses, and the address pointers. Also copies the name - * and sets up all the pointers. If "fill_addresses" is set then - * sufficient memory for the addresses is also allocated and the - * address pointers are set to this memory. + * and sets up all the pointers. * * NOTE: The alias and address lists must be allocated with room * for the NULL item terminating the list. This is true even if * the list has no items ("aliases" and "addresses" must be * at least "1", a truly empty list is invalid). */ -static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses, int fill_addresses) +static struct WS_hostent *WS_create_he(char *name, int aliases, int aliases_size, int addresses, int address_length) { struct WS_hostent *p_to; char *p; - int size = (sizeof(struct WS_hostent) + strlen(name) + 1 + - sizeof(char *)*aliases + - sizeof(char *)*addresses); - - /* Allocate enough memory for the addresses */ - if (fill_addresses) - size += sizeof(struct in_addr)*addresses; + sizeof(char *) * aliases + + aliases_size + + sizeof(char *) * addresses + + address_length * (addresses - 1)), i; if (!(p_to = check_buffer_he(size))) return NULL; memset(p_to, 0, size); + /* Use the memory in the same way winsock does. + * First set the pointer for aliases, second set the pointers for addressess. + * Third fill the addresses indexes, fourth jump aliases names size. + * Fifth fill the hostname. + * NOTE: This method is valid for OS version's >= XP. + */ p = (char *)(p_to + 1); - p_to->h_name = p; - strcpy(p, name); - p += strlen(p) + 1; - p_to->h_aliases = (char **)p; p += sizeof(char *)*aliases; + p_to->h_addr_list = (char **)p; p += sizeof(char *)*addresses; - if (fill_addresses) - { - int i; - /* NOTE: h_aliases must be filled in manually, leave these - * pointers NULL (already set to NULL by memset earlier). - */ + for (i = 0, addresses--; i < addresses; i++, p += address_length) + p_to->h_addr_list[i] = p; + + /* NOTE: h_aliases must be filled in manually because we don't know each string + * size, leave these pointers NULL (already set to NULL by memset earlier). + */ + p += aliases_size; + + p_to->h_name = p; + strcpy(p, name); - /* Fill in the list of address pointers */ - for (i = 0; i < addresses; i++) - p_to->h_addr_list[i] = (p += sizeof(struct in_addr)); - p += sizeof(struct in_addr); - } return p_to; } @@ -5638,18 +5635,30 @@ static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses, i */ static struct WS_hostent *WS_dup_he(const struct hostent* p_he) { - int addresses = list_size(p_he->h_addr_list, p_he->h_length); - int aliases = list_size(p_he->h_aliases, 0); + int i, addresses = 0, alias_size = 0; struct WS_hostent *p_to; + char *p; - p_to = WS_create_he(p_he->h_name, aliases, addresses, FALSE); + for( i = 0; p_he->h_aliases[i]; i++) alias_size += strlen(p_he->h_aliases[i]) + 1; + while (p_he->h_addr_list[addresses]) addresses++; + + p_to = WS_create_he(p_he->h_name, i + 1, alias_size, addresses + 1, p_he->h_length); if (!p_to) return NULL; p_to->h_addrtype = p_he->h_addrtype; p_to->h_length = p_he->h_length; - list_dup(p_he->h_aliases, p_to->h_aliases, 0); - list_dup(p_he->h_addr_list, p_to->h_addr_list, p_he->h_length); + for(i = 0, p = p_to->h_addr_list[0]; p_he->h_addr_list[i]; i++, p += p_to->h_length) + memcpy(p, p_he->h_addr_list[i], p_to->h_length); + + /* Fill the aliases after the IP data */ + for(i = 0; p_he->h_aliases[i]; i++) + { + p_to->h_aliases[i] = p; + strcpy(p, p_he->h_aliases[i]); + p += strlen(p) + 1; + } + return p_to; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 85d126b..2543873 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2759,22 +2759,22 @@ static void test_dns(void) addr.mem = h + 1; if(h->h_addr_list == addr.mem) /* <= W2K */ { - skip("Skipping hostent tests since this OS is unsupported\n"); + win_skip("Skipping hostent tests since this OS is unsupported\n"); return; } - todo_wine ok(h->h_aliases == addr.mem, + ok(h->h_aliases == addr.mem, "hostent->h_aliases should be in %p, it is in %p\n", addr.mem, h->h_aliases); for(ptr = h->h_aliases, acount = 1; *ptr; ptr++) acount++; addr.chr += sizeof(*ptr) * acount; - todo_wine ok(h->h_addr_list == addr.mem, + ok(h->h_addr_list == addr.mem, "hostent->h_addr_list should be in %p, it is in %p\n", addr.mem, h->h_addr_list); for(ptr = h->h_addr_list, acount = 1; *ptr; ptr++) acount++; addr.chr += sizeof(*ptr) * acount; - todo_wine ok(h->h_addr_list[0] == addr.mem, + ok(h->h_addr_list[0] == addr.mem, "hostent->h_addr_list[0] should be in %p, it is in %p\n", addr.mem, h->h_addr_list[0]); }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLParser Get/Set Flags.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 524a817195dbe147f632f9af533c155c2a731eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=524a817195dbe147f632f9af5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 29 14:30:30 2011 +1000 msxml3: Implement IXMLParser Get/Set Flags. --- .gitignore | 1 + dlls/msxml3/tests/Makefile.in | 2 + dlls/msxml3/tests/xmlparser.c | 23 ++- dlls/msxml3/tests/xmlparser.idl | 381 +++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/xmlview.c | 3 +- dlls/msxml3/xmlparser.c | 13 +- 6 files changed, 410 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=524a817195dbe147f632f…

1 0

Dmitry Timoshkov : gdi32: Do not normalize height of the default GUI font.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: e65b19cad34ed0c440e0d4ccb630a3cd497b1c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65b19cad34ed0c440e0d4ccb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Jun 9 13:08:42 2012 +0900 gdi32: Do not normalize height of the default GUI font. --- dlls/gdi32/gdiobj.c | 36 +----------------------------------- dlls/gdi32/tests/font.c | 3 --- 2 files changed, 1 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 4164d3a..d87515f 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -492,34 +492,6 @@ static UINT get_default_charset( void ) return csi.ciCharset; } -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'}; - -/****************************************************************************** - * get_dpi (internal) - * - * get the dpi from the registry - */ -static DWORD get_dpi( void ) -{ - DWORD dpi = 96; - HKEY hkey; - - if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS) - { - DWORD type, size, new_dpi; - - size = sizeof(new_dpi); - if(RegQueryValueExW(hkey, dpi_value_name, NULL, &type, (void *)&new_dpi, &size) == ERROR_SUCCESS) - { - if(type == REG_DWORD && new_dpi != 0) - dpi = new_dpi; - } - RegCloseKey(hkey); - } - return dpi; -} - /*********************************************************************** * GDI_inc_ref_count @@ -574,7 +546,6 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { - LOGFONTW default_gui_font; const struct DefaultFontInfo* deffonts; int i; @@ -609,12 +580,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) stock_objects[SYSTEM_FONT] = CreateFontIndirectW( &deffonts->SystemFont ); stock_objects[DEVICE_DEFAULT_FONT] = CreateFontIndirectW( &deffonts->DeviceDefaultFont ); stock_objects[SYSTEM_FIXED_FONT] = CreateFontIndirectW( &deffonts->SystemFixedFont ); - - /* For the default gui font, we use the lfHeight member in deffonts as a place-holder - for the point size so we must convert this into a true height */ - default_gui_font = deffonts->DefaultGuiFont; - default_gui_font.lfHeight = -MulDiv(default_gui_font.lfHeight, get_dpi(), 72); - stock_objects[DEFAULT_GUI_FONT] = CreateFontIndirectW( &default_gui_font ); + stock_objects[DEFAULT_GUI_FONT] = CreateFontIndirectW( &deffonts->DefaultGuiFont ); stock_objects[DC_BRUSH] = CreateBrushIndirect( &DCBrush ); stock_objects[DC_PEN] = CreatePenIndirect( &DCPen ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7390303..9e5602b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4422,9 +4422,6 @@ static void test_stock_fonts(void) } ok(td[i].weight == lf.lfWeight, "%d: expected lfWeight %d, got %d\n", i, td[i].weight, lf.lfWeight); - if (td[i].height < 0) /* FIXME: remove once Wine is fixed */ - todo_wine ok(td[i].height == lf.lfHeight, "%d: expected lfHeight %d, got %d\n", i, td[i].height, lf.lfHeight); - else ok(td[i].height == lf.lfHeight, "%d: expected lfHeight %d, got %d\n", i, td[i].height, lf.lfHeight); ok(!lstrcmp(td[i].face_name, lf.lfFaceName), "%d: expected lfFaceName %s, got %s\n", i, td[i].face_name, lf.lfFaceName); }

1 0

Lucas Fialho Zawacki : Added portuguese translation for release 1.5.6
by Jeremy Newman 12 Jun '12

12 Jun '12

Module: website Branch: master Commit: 5b0bde81d255da470c4a27932697bc71fcad8d5d URL: http://source.winehq.org/git/website.git/?a=commit;h=5b0bde81d255da470c4a27… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon Jun 11 13:11:35 2012 -0300 Added portuguese translation for release 1.5.6 --- news/pt/2012060801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pt/2012060801.xml b/news/pt/2012060801.xml new file mode 100644 index 0000000..b0e7dd9 --- /dev/null +++ b/news/pt/2012060801.xml @@ -0,0 +1,18 @@ +<news> +<date>8 de Junho de 2012</date> +<title>Wine 1.5.6 lançado</title> +<body> + A versão de desenvolvimento 1.5.6 já está disponível. + <a href="{$root}/announce/1.5.6">Novidades</a> desta versão: +<ul> + <li>Instalação automática do pacote adicional Mono.</li> + <li>Applet do painel de controle para configuração de joysticks.</li> + <li>Renderização de bitmaps em dispostivos agora feita através da engine DIB.</li> + <li>Suporte a renderização de video através do DirectX (VMR-9).</li> + <li>Primeiros passos na direção de um compilador de shaders D3D.</li> + <li>Correções no build para DragonFly BSD.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.6.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads.</a>. +</body></news>

1 0

André Hentschel : Wine 1.5.6 freigegeben
by Jeremy Newman 12 Jun '12

12 Jun '12

Module: website Branch: master Commit: 03d05699fc2b892fc45ede9b20647691bec15976 URL: http://source.winehq.org/git/website.git/?a=commit;h=03d05699fc2b892fc45ede… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 9 15:27:15 2012 +0200 Wine 1.5.6 freigegeben --- news/de/2012060801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2012060801.xml b/news/de/2012060801.xml new file mode 100644 index 0000000..dca71e8 --- /dev/null +++ b/news/de/2012060801.xml @@ -0,0 +1,18 @@ +<news> +<date>8. Juni 2012</date> +<title>Wine 1.5.6 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.6 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Automatische Installation des Mono Add-on Pakets.</li> + <li>Systemsteuerungsapplet für Joysticks.</li> + <li>Geräteabhängige Bitmaps werden nun durch die DIB Engine gerendert.</li> + <li>Unterstützung für Videowiedergabe mit DirectX (VMR-9).</li> + <li>Erste Schritte in Richtungg eines D3D Shader Compilers.</li> + <li>Fehlerbehebungen für den Build unter DragonFly BSD.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.6.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.6
by Jeremy Newman 12 Jun '12

12 Jun '12

Module: website Branch: master Commit: 7e4c1005af43f84e24ae19487e150c716e7ddc30 URL: http://source.winehq.org/git/website.git/?a=commit;h=7e4c1005af43f84e24ae19… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jun 9 10:52:21 2012 +0200 Polish translation for release 1.5.6 --- news/pl/2012060801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2012060801.xml b/news/pl/2012060801.xml new file mode 100644 index 0000000..5eaed3d --- /dev/null +++ b/news/pl/2012060801.xml @@ -0,0 +1,18 @@ +<news> +<date>Czerwiec 8, 2012</date> +<title>Wydano Wine 1.5.6</title> +<body> + Wydanie rozwojowe Wine 1.5.6 jest już dostępne. + <a href="{$root}/announce/1.5.6">Co nowego</a> w tym wydaniu: +<ul> + <li>Samoczynna instalacja dodatkowego pakietu Mono.</li> + <li>Aplet w panelu sterowania dla joysticków.</li> + <li>Renderowanie map bitowych zależnych od urządzenia od teraz jest wykonywane przez silnik DIB.</li> + <li>Wsparcie dla renderowania filmów przez DirectX (VMR-9).</li> + <li>Pierwsze kroki w kierunku utworzenia kompilatora cieniującego D3D.</li> + <li>Poprawki w budowaniu dla DragonFly BSD.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.6.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Nozomi Kodama : include: Remove useless todo's.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 00fb537a2df066107f0249f894664ea3a3b3d741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00fb537a2df066107f0249f89… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Sun Jun 10 17:00:05 2012 +0800 include: Remove useless todo's. --- include/d3dx9math.inl | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/include/d3dx9math.inl b/include/d3dx9math.inl index 0d80cf9..af6b456 100644 --- a/include/d3dx9math.inl +++ b/include/d3dx9math.inl @@ -557,13 +557,11 @@ inline D3DXQUATERNION& D3DXQUATERNION::operator -= (CONST D3DXQUATERNION& quat) return *this; } -/* TODO: uncomment this when D3DXQuaternionMultiply has been implemented inline D3DXQUATERNION& D3DXQUATERNION::operator *= (CONST D3DXQUATERNION& quat) { D3DXQuaternionMultiply(this, this, &quat); return *this; } -*/ inline D3DXQUATERNION& D3DXQUATERNION::operator *= (FLOAT f) { @@ -604,14 +602,12 @@ inline D3DXQUATERNION D3DXQUATERNION::operator - (CONST D3DXQUATERNION& quat) co return D3DXQUATERNION(x - quat.x, y - quat.y, z - quat.z, w - quat.w); } -/* TODO: uncomment this when D3DXQuaternionMultiply has been implemented inline D3DXQUATERNION D3DXQUATERNION::operator * (CONST D3DXQUATERNION& quat) const { D3DXQUATERNION buf; D3DXQuaternionMultiply(&buf, this, &quat); return buf; } -*/ inline D3DXQUATERNION D3DXQUATERNION::operator * (FLOAT f) const {

1 0

Hans Leidekker : msi: Support registry key names that exceed 255 characters .
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 0ed61000d3b7b7a94ab5e3455d0e97294d80442d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed61000d3b7b7a94ab5e3455… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 11 15:36:51 2012 +0200 msi: Support registry key names that exceed 255 characters. --- dlls/msi/action.c | 101 ++++++++++++++++++++++++++++++++++++----------- dlls/msi/tests/action.c | 75 ++++++++++++++++++++++++++++++++++- 2 files changed, 152 insertions(+), 24 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e7b2921..b256439 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2582,6 +2582,38 @@ static WCHAR *get_keypath( MSICOMPONENT *comp, HKEY root, const WCHAR *path ) return strdupW( path ); } +static HKEY open_key( HKEY root, const WCHAR *path, BOOL create ) +{ + REGSAM access = KEY_ALL_ACCESS; + WCHAR *subkey, *p, *q; + HKEY hkey, ret = NULL; + LONG res; + + if (is_wow64) access |= KEY_WOW64_64KEY; + + if (!(subkey = strdupW( path ))) return NULL; + p = subkey; + if ((q = strchrW( p, '\\' ))) *q = 0; + if (create) + res = RegCreateKeyExW( root, subkey, 0, NULL, 0, access, NULL, &hkey, NULL ); + else + res = RegOpenKeyExW( root, subkey, 0, access, &hkey ); + if (res) + { + TRACE("failed to open key %s (%d)\n", debugstr_w(subkey), res); + msi_free( subkey ); + return NULL; + } + if (q && q[1]) + { + ret = open_key( hkey, q + 1, create ); + RegCloseKey( hkey ); + } + else ret = hkey; + msi_free( subkey ); + return ret; +} + static BOOL is_special_entry( const WCHAR *name ) { return (name && (name[0] == '*' || name[0] == '+') && !name[1]); @@ -2640,7 +2672,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) keypath = get_keypath( comp, root_key, deformated ); msi_free( deformated ); - if (RegCreateKeyExW( root_key, keypath, 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, NULL, &hkey, NULL )) + if (!(hkey = open_key( root_key, keypath, TRUE ))) { ERR("Could not create key %s\n", debugstr_w(keypath)); msi_free(uikey); @@ -2711,44 +2743,67 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package) return rc; } -static void delete_reg_value( HKEY root, const WCHAR *keypath, const WCHAR *value ) +static void delete_key( HKEY root, const WCHAR *path ) +{ + REGSAM access = 0; + WCHAR *subkey, *p; + HKEY hkey; + LONG res; + + if (is_wow64) access |= KEY_WOW64_64KEY; + + if (!(subkey = strdupW( path ))) return; + for (;;) + { + if ((p = strrchrW( subkey, '\\' ))) *p = 0; + hkey = open_key( root, subkey, FALSE ); + if (!hkey) break; + if (p && p[1]) + res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); + else + res = RegDeleteKeyExW( root, subkey, access, 0 ); + if (res) + { + TRACE("failed to delete key %s (%d)\n", debugstr_w(subkey), res); + break; + } + if (p && p[1]) RegCloseKey( hkey ); + else break; + } + msi_free( subkey ); +} + +static void delete_value( HKEY root, const WCHAR *path, const WCHAR *value ) { LONG res; HKEY hkey; DWORD num_subkeys, num_values; - if (!(res = RegOpenKeyExW( root, keypath, 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey ))) + if ((hkey = open_key( root, path, FALSE ))) { if ((res = RegDeleteValueW( hkey, value ))) - { TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); - } + res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, &num_subkeys, NULL, NULL, &num_values, NULL, NULL, NULL, NULL ); RegCloseKey( hkey ); if (!res && !num_subkeys && !num_values) { - TRACE("removing empty key %s\n", debugstr_w(keypath)); - RegDeleteKeyExW( root, keypath, KEY_WOW64_64KEY, 0 ); + TRACE("removing empty key %s\n", debugstr_w(path)); + delete_key( root, path ); } - return; } - TRACE("failed to open key %s (%d)\n", debugstr_w(keypath), res); } -static void delete_reg_key( HKEY root, const WCHAR *keypath ) +static void delete_tree( HKEY root, const WCHAR *path ) { + LONG res; HKEY hkey; - LONG res = RegOpenKeyExW( root, keypath, 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey ); - if (res) - { - TRACE("failed to open key %s (%d)\n", debugstr_w(keypath), res); - return; - } + + if (!(hkey = open_key( root, path, FALSE ))) return; res = RegDeleteTreeW( hkey, NULL ); - if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(keypath), res); - res = RegDeleteKeyExW( root, keypath, KEY_WOW64_64KEY, 0 ); - if (res) TRACE("failed to delete key %s (%d)\n", debugstr_w(keypath), res); + if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res); + delete_key( root, path ); RegCloseKey( hkey ); } @@ -2807,8 +2862,8 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para keypath = get_keypath( comp, hkey_root, deformated_key ); msi_free( deformated_key ); - if (delete_key) delete_reg_key( hkey_root, keypath ); - else delete_reg_value( hkey_root, keypath, deformated_name ); + if (delete_key) delete_tree( hkey_root, keypath ); + else delete_value( hkey_root, keypath, deformated_name ); msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); @@ -2872,8 +2927,8 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param keypath = get_keypath( comp, hkey_root, deformated_key ); msi_free( deformated_key ); - if (delete_key) delete_reg_key( hkey_root, keypath ); - else delete_reg_value( hkey_root, keypath, deformated_name ); + if (delete_key) delete_tree( hkey_root, keypath ); + else delete_value( hkey_root, keypath, deformated_name ); msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 0bd65a0..82afd18 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -490,7 +490,8 @@ static const char wrv_registry_dat[] = "regdata\t2\tSOFTWARE\\Wine\\msitest\tValue\t[~]one[~]two[~]three\taugustus\n" "regdata1\t2\tSOFTWARE\\Wine\\msitest\t*\t\taugustus\n" "regdata2\t2\tSOFTWARE\\Wine\\msitest\t*\t#%\taugustus\n" - "regdata3\t2\tSOFTWARE\\Wine\\msitest\t*\t#x\taugustus\n"; + "regdata3\t2\tSOFTWARE\\Wine\\msitest\t*\t#x\taugustus\n" + "regdata4\t2\tSOFTWARE\\Wine\\msitest\\VisualStudio\\10.0\\AD7Metrics\\Exception\\{049EC4CC-30D2-4032-9256-EE18EB41B62B}\\Common Language Runtime Exceptions\\System.Workflow.ComponentModel.Serialization\\System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationException\tlong\tkey\taugustus\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -1818,6 +1819,75 @@ static const msi_table pa_tables[] = ADD_TABLE(property) }; +/* based on RegDeleteTreeW from dlls/advapi32/registry.c */ +static LSTATUS action_RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey, REGSAM access) +{ + LONG ret; + DWORD dwMaxSubkeyLen, dwMaxValueLen; + DWORD dwMaxLen, dwSize; + char szNameBuf[MAX_PATH], *lpszName = szNameBuf; + HKEY hSubKey = hKey; + + if(lpszSubKey) + { + ret = RegOpenKeyExA(hKey, lpszSubKey, 0, access, &hSubKey); + if (ret) return ret; + } + + ret = RegQueryInfoKeyA(hSubKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); + if (ret) goto cleanup; + + dwMaxSubkeyLen++; + dwMaxValueLen++; + dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); + if (dwMaxLen > sizeof(szNameBuf)) + { + /* Name too big: alloc a buffer for it */ + if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + } + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumKeyExA(hSubKey, 0, lpszName, &dwSize, NULL, + NULL, NULL, NULL)) break; + + ret = action_RegDeleteTreeA(hSubKey, lpszName, access); + if (ret) goto cleanup; + } + + if (lpszSubKey) + { + if (pRegDeleteKeyExA) + ret = pRegDeleteKeyExA(hKey, lpszSubKey, access, 0); + else + ret = RegDeleteKeyA(hKey, lpszSubKey); + } + else + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumValueA(hKey, 0, lpszName, &dwSize, + NULL, NULL, NULL, NULL)) break; + + ret = RegDeleteValueA(hKey, lpszName); + if (ret) goto cleanup; + } + +cleanup: + if (lpszName != szNameBuf) + HeapFree(GetProcessHeap(), 0, lpszName); + if(lpszSubKey) + RegCloseKey(hSubKey); + return ret; +} + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -4586,6 +4656,9 @@ static void test_write_registry_values(void) res = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + res = action_RegDeleteTreeA(hkey, "VisualStudio", KEY_ALL_ACCESS); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + RegDeleteValueA(hkey, "Value"); RegCloseKey(hkey); RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest");

1 0

Hans Leidekker : msi: Fail if a registry key cannot be created.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: fc2c8a215fd3ea70e1cabdca955818a62e85b2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2c8a215fd3ea70e1cabdca9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 11 15:36:35 2012 +0200 msi: Fail if a registry key cannot be created. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5ba7ec3..e7b2921 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2645,7 +2645,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) ERR("Could not create key %s\n", debugstr_w(keypath)); msi_free(uikey); msi_free(keypath); - return ERROR_SUCCESS; + return ERROR_FUNCTION_FAILED; } value = parse_value(package, MSI_RecordGetString(row, 5), &type, &size); deformat_string(package, name, &deformated);

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012