November 2008 - Wine-Commits

Detlef Riekenberg : advapi32/tests: Fix tests on win9x ( GetFileSecurity not implemented).
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 21a70825bc0e84efac6ac31baf31bdd6fc4be82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a70825bc0e84efac6ac31ba… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 9 20:50:51 2008 +0100 advapi32/tests: Fix tests on win9x (GetFileSecurity not implemented). --- dlls/advapi32/tests/security.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 62c6ba8..af2c6df 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -746,6 +746,10 @@ static void test_FileSecurity(void) retSize = 0; SetLastError (NO_ERROR); rc = pGetFileSecurityA (file, request, NULL, 0, &retSize); + if (!rc && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { + win_skip("GetFileSecurityA is not implemented\n"); + goto cleanup; + } ok (!rc, "GetFileSecurityA " "was expected to fail for '%s'\n", file); ok (GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetFileSecurityA " @@ -812,19 +816,18 @@ static void test_FileSecurity(void) HeapFree (GetProcessHeap (), 0, sd); - /* Remove temporary file and directory */ - DeleteFileA (file); - RemoveDirectoryA (path); - /* Old test */ strcpy (wintmpdir, "\\Should not exist"); SetLastError (NO_ERROR); rc = pGetFileSecurityA (wintmpdir, OWNER_SECURITY_INFORMATION, NULL, 0, &sdSize); ok (!rc, "GetFileSecurityA should fail for not existing directories/files\n"); - ok ((GetLastError() == ERROR_FILE_NOT_FOUND ) || - (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), - "last error ERROR_FILE_NOT_FOUND / ERROR_CALL_NOT_IMPLEMENTED (98) " - "expected, got %d\n", GetLastError()); + ok (GetLastError() == ERROR_FILE_NOT_FOUND, + "last error ERROR_FILE_NOT_FOUND expected, got %d\n", GetLastError()); + +cleanup: + /* Remove temporary file and directory */ + DeleteFileA(file); + RemoveDirectoryA(path); } static void test_AccessCheck(void)

1 0

Alistair Leslie-Hughes : advapi32: Correct spelling of SE_CHANGE_NOTIFY_PRIVILEGE.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 8c57a6ef8bd2843be143df056ffcdf2ec4137e10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c57a6ef8bd2843be143df056… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 10 19:48:15 2008 +1100 advapi32: Correct spelling of SE_CHANGE_NOTIFY_PRIVILEGE. --- dlls/advapi32/tests/security.c | 4 ++-- include/winternl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f8cd6b8..62c6ba8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -504,7 +504,7 @@ static void test_trustee(void) #define SE_DEBUG_PRIVILEGE 20L #define SE_AUDIT_PRIVILEGE 21L #define SE_SYSTEM_ENVIRONMENT_PRIVILEGE 22L -#define SE_CHANGE_NOTIFY_PRIVILLEGE 23L +#define SE_CHANGE_NOTIFY_PRIVILEGE 23L #define SE_REMOTE_SHUTDOWN_PRIVILEGE 24L #define SE_UNDOCK_PRIVILEGE 25L #define SE_SYNC_AGENT_PRIVILEGE 26L @@ -634,7 +634,7 @@ static void test_lookupPrivilegeValue(void) { "SeDebugPrivilege", SE_DEBUG_PRIVILEGE }, { "SeAuditPrivilege", SE_AUDIT_PRIVILEGE }, { "SeSystemEnvironmentPrivilege", SE_SYSTEM_ENVIRONMENT_PRIVILEGE }, - { "SeChangeNotifyPrivilege", SE_CHANGE_NOTIFY_PRIVILLEGE }, + { "SeChangeNotifyPrivilege", SE_CHANGE_NOTIFY_PRIVILEGE }, { "SeRemoteShutdownPrivilege", SE_REMOTE_SHUTDOWN_PRIVILEGE }, { "SeUndockPrivilege", SE_UNDOCK_PRIVILEGE }, { "SeSyncAgentPrivilege", SE_SYNC_AGENT_PRIVILEGE }, diff --git a/include/winternl.h b/include/winternl.h index 1b1c8d1..25a205a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1535,7 +1535,7 @@ typedef void (NTAPI *RTL_WAITORTIMERCALLBACKFUNC)(PVOID,BOOLEAN); /* FIXME: not #define SE_DEBUG_PRIVILEGE 20L #define SE_AUDIT_PRIVILEGE 21L #define SE_SYSTEM_ENVIRONMENT_PRIVILEGE 22L -#define SE_CHANGE_NOTIFY_PRIVILLEGE 23L +#define SE_CHANGE_NOTIFY_PRIVILEGE 23L #define SE_REMOTE_SHUTDOWN_PRIVILEGE 24L #define SE_UNDOCK_PRIVILEGE 25L #define SE_SYNC_AGENT_PRIVILEGE 26L

1 0

Detlef Riekenberg : shlwapi/tests: Add more entries for PathIsURL.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 4621210b59c3698936b786997bd6d220980cc5dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4621210b59c3698936b786997… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 9 19:19:51 2008 +0100 shlwapi/tests: Add more entries for PathIsURL. --- dlls/shlwapi/tests/path.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index cc9ded5..3f9c9e6 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -82,7 +82,26 @@ static struct { {"foo.bar", FALSE}, {"bogusscheme:", TRUE}, {"http:partial", TRUE}, - {"www.winehq.org", FALSE} + {"www.winehq.org", FALSE}, + /* More examples that the user might enter as the browser start page */ + {"winehq.org", FALSE}, + {"ftp.winehq.org", FALSE}, + {"http://winehq.org", TRUE}, + {"http://www.winehq.org", TRUE}, + {"https://winehq.org", TRUE}, + {"https://www.winehq.org", TRUE}, + {"ftp://winehq.org", TRUE}, + {"ftp://ftp.winehq.org", TRUE}, + {"file://does_not_exist.txt", TRUE}, + {"about:blank", TRUE}, + {"about:home", TRUE}, + {"about:mozilla", TRUE}, + /* scheme is case independent */ + {"HTTP://www.winehq.org", TRUE}, + /* a space at the start is not allowed */ + {" http://www.winehq.org", FALSE}, + {"", FALSE}, + {NULL, FALSE} }; struct {

1 0

Ryan Schmidt : jscript: Fix build with bison 2.4.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 2827a74cb137001aff4ce440f7e11acd11d91c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2827a74cb137001aff4ce440f… Author: Ryan Schmidt <wine-2008d(a)ryandesign.com> Date: Mon Nov 10 01:04:47 2008 -0600 jscript: Fix build with bison 2.4. --- dlls/jscript/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 7a74e46..c96f8a3 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -317,7 +317,7 @@ StatementList_opt /* ECMA-262 3rd Edition 12.1 */ Block : '{' StatementList '}' { $$ = new_block_statement(ctx, $2); } - | '{' '}' { $$ = new_block_statement(ctx, NULL) } + | '{' '}' { $$ = new_block_statement(ctx, NULL); } /* ECMA-262 3rd Edition 12.2 */ VariableStatement

1 0

Christian Costa : d3dxof: Close source file when releasing EnumObject.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: b46b75170e2a43ba40da2feaee5061c5f6c3fe97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46b75170e2a43ba40da2feae… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 9 11:09:56 2008 +0100 d3dxof: Close source file when releasing EnumObject. --- dlls/d3dxof/d3dxof.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 058f831..1939482 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1740,7 +1740,10 @@ static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject* i TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); if (!ref) + { + CloseHandle(This->hFile); HeapFree(GetProcessHeap(), 0, This); + } return ref; }

1 0

Peter Dons Tychsen : winedos: Add support for decoding and displaying the 4 bit CGA framebuffer.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: e0b91a7aa78cdfe6b3fddb42d4d23a235ad977c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b91a7aa78cdfe6b3fddb42d… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Sat Nov 8 16:21:03 2008 +0100 winedos: Add support for decoding and displaying the 4 bit CGA framebuffer. --- dlls/winedos/int10.c | 2 +- dlls/winedos/vga.c | 80 +++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/winedos/int10.c b/dlls/winedos/int10.c index 952212f..c1ec98b 100644 --- a/dlls/winedos/int10.c +++ b/dlls/winedos/int10.c @@ -171,7 +171,7 @@ static const INT10_MODE INT10_modelist[] = {0x0001, TEXT, 40, 25, 9, 16, 360, 400, 0, 16, 8, TRUE}, /* VGA text mode 1 */ {0x0002, TEXT, 80, 25, 9, 16, 360, 400, 0, 16, 8, TRUE}, /* VGA text mode 2 */ {0x0003, TEXT, 80, 25, 9, 16, 360, 400, 0, 16, 8, TRUE}, /* VGA text mode 3 */ - {0x0004, GRAPHIC, 40, 25, 8, 8, 320, 200, 2, 4, 1, FALSE}, /* VGA graphics mode 4 */ + {0x0004, GRAPHIC, 40, 25, 8, 8, 320, 200, 2, 4, 1, TRUE}, /* VGA graphics mode 4 */ {0x0005, GRAPHIC, 40, 25, 8, 8, 320, 200, 2, 4, 1, FALSE}, /* VGA graphics mode 5 */ {0x0006, GRAPHIC, 80, 25, 8, 8, 640, 200, 1, 2, 1, FALSE}, /* VGA graphics mode 6 */ {0x0007, TEXT, 80, 25, 9, 16, 720, 400, 0, 0, 8, FALSE}, /* VGA text mode 7 - FIXME bad default address */ diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index a5298e0..6a94d32 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -54,6 +54,12 @@ static BOOL vga_retrace_horizontal; #define VGA_WINDOW_START ((char *)0xa0000) /* + * Size and location of CGA controller window to framebuffer. + */ +#define CGA_WINDOW_SIZE (32 * 1024) +#define CGA_WINDOW_START ((char *)0xb8000) + +/* * VGA controller memory is emulated using linear framebuffer. * This frambuffer also acts as an interface * between VGA controller emulation and DirectDraw. @@ -91,6 +97,8 @@ static int vga_fb_offset; static int vga_fb_size = 0; static char *vga_fb_data = 0; static int vga_fb_window = 0; +static int vga_fb_window_size; +static char *vga_fb_window_data; /* * VGA text mode data. @@ -159,6 +167,16 @@ static void CALLBACK VGA_Poll( LPVOID arg, DWORD low, DWORD high ); static HWND vga_hwnd = NULL; /* + * CGA palette 1 + */ +static PALETTEENTRY cga_palette1[] = { + {0x00, 0x00, 0x00}, /* 0 - Black */ + {0x00, 0x80, 0x80}, /* 1 - Cyan */ + {0x80, 0x00, 0x80}, /* 2 - Magenta */ + {0xFF, 0xFF, 0xFF} /* 3 - White */ +}; + +/* * VGA Palette Registers, in actual 18 bit color * port 3C0H - 6 bit rgbRGB format * @@ -627,20 +645,20 @@ typedef struct { */ static void VGA_SyncWindow( BOOL target_is_fb ) { - int size = VGA_WINDOW_SIZE; + int size = vga_fb_window_size; /* Window does not overlap framebuffer. */ if (vga_fb_window >= vga_fb_size) return; /* Check if window overlaps framebuffer only partially. */ - if (vga_fb_size - vga_fb_window < VGA_WINDOW_SIZE) + if (vga_fb_size - vga_fb_window < vga_fb_window_size) size = vga_fb_size - vga_fb_window; if (target_is_fb) - memmove( vga_fb_data + vga_fb_window, VGA_WINDOW_START, size ); + memmove( vga_fb_data + vga_fb_window, vga_fb_window_data, size ); else - memmove( VGA_WINDOW_START, vga_fb_data + vga_fb_window, size ); + memmove( vga_fb_window_data, vga_fb_data + vga_fb_window, size ); } @@ -712,9 +730,15 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) lpddraw=NULL; return; } - res=IDirectDrawPalette_SetEntries(lpddpal,0,0,256,vga_def_palette); + + if(vga_fb_depth == 2){ + res=IDirectDrawPalette_SetEntries(lpddpal,0,0,4,cga_palette1); + } + else{ + res=IDirectDrawPalette_SetEntries(lpddpal,0,0,256,vga_def_palette); + } if (res != S_OK) { - ERR("Could not set default palette entries (res = 0x%x)\n", res); + ERR("Could not set default palette entries (res = 0x%x)\n", res); } memset(&sdesc,0,sizeof(sdesc)); @@ -766,7 +790,23 @@ int VGA_SetMode(unsigned Xres,unsigned Yres,unsigned Depth) par.Yres = 480; } - VGA_SetWindowStart((Depth < 8) ? -1 : 0); + /* Setup window */ + if(vga_fb_depth >= 8) + { + vga_fb_window_data = VGA_WINDOW_START; + vga_fb_window_size = VGA_WINDOW_SIZE; + } + else + { + vga_fb_window_data = CGA_WINDOW_START; + vga_fb_window_size = CGA_WINDOW_SIZE; + } + + /* Clean the HW buffer */ + memset(vga_fb_window_data, 0x00, vga_fb_window_size); + + /* Reset window start */ + VGA_SetWindowStart(0); par.Depth = (Depth < 8) ? 8 : Depth; @@ -1252,9 +1292,33 @@ static void VGA_Poll_Graphics(void) VGA_SyncWindow( TRUE ); /* + * CGA framebuffer + */ + if(vga_fb_depth == 2 && vga_fb_width == 320 && vga_fb_height == 200){ + WORD off = 0; + BYTE bits = 6; + BYTE value; + /* Go thru rows */ + for(Y=0; Y<vga_fb_height; Y++, surf+=(Pitch*2)){ + for(X=0; X<vga_fb_width; X++){ + off = Y & 1 ? (8 * 1024) : 0; + off += (80 * (Y/2)); + off += X/4; + value = (dat[off] >> bits) & 0x3; + surf[(X*2)] = value; + surf[(X*2)+1] = value; + surf[(X*2)+Pitch] = value; + surf[(X*2)+Pitch+1] = value; + bits -= 2; + bits &= 7; + } + } + } + + /* * Double VGA framebuffer (320x200 -> 640x400), if needed. */ - if(Height >= 2 * vga_fb_height && Width >= 2 * vga_fb_width && bpp == 1) + else if(Height >= 2 * vga_fb_height && Width >= 2 * vga_fb_width && bpp == 1) for (Y=0; Y<vga_fb_height; Y++,surf+=Pitch*2,dat+=vga_fb_pitch) for (X=0; X<vga_fb_width; X++) { BYTE value = dat[X];

1 0

Christian Costa : d3dxof: Finish strings support.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 48c4248d3aefa413e818821e7211227ed3b58a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c4248d3aefa413e818821e7… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 9 11:11:40 2008 +0100 d3dxof: Finish strings support. --- dlls/d3dxof/d3dxof.c | 37 +++++++++++++++++++++++++++---------- dlls/d3dxof/d3dxof_private.h | 4 ++++ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index d55d2be..20993f5 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -668,22 +668,21 @@ static BOOL is_integer(parse_buffer* buf) static BOOL is_string(parse_buffer* buf) { char tmp[32]; - DWORD pos = 1; + DWORD pos = 0; char c; BOOL ok = 0; if (*buf->buffer != '"') return FALSE; - tmp[0] = '"'; - while (!is_separator(c = *(buf->buffer+pos)) && (pos < 32)) + while (!is_separator(c = *(buf->buffer+pos+1)) && (pos < 31)) { - tmp[pos++] = c; if (c == '"') { ok = 1; break; } + tmp[pos++] = c; } tmp[pos] = 0; @@ -693,8 +692,8 @@ static BOOL is_string(parse_buffer* buf) return FALSE; } - buf->buffer += pos; - buf->rem_bytes -= pos; + buf->buffer += pos + 2; + buf->rem_bytes -= pos + 2; TRACE("Found string %s\n", tmp); strcpy((char*)buf->value, tmp); @@ -1884,7 +1883,6 @@ static BOOL parse_object_members_list(parse_buffer * buf) } else if (token == TOKEN_LPSTR) { - static char fake_string[] = "Fake string"; get_TOKEN(buf); TRACE("%s = %s\n", pt->members[i].name, (char*)buf->value); /* Assume larger size */ @@ -1895,8 +1893,15 @@ static BOOL parse_object_members_list(parse_buffer * buf) } if (pt->members[i].type == TOKEN_LPSTR) { - /* Use a fake string for now */ - *(((LPCSTR*)(buf->cur_pdata))) = fake_string; + int len = strlen((char*)buf->value) + 1; + if ((buf->cur_pstrings - buf->pstrings + len) > MAX_STRINGS_BUFFER) + { + WARN("Buffer too small %p %p %d\n", buf->cur_pstrings, buf->pstrings, len); + return FALSE; + } + strcpy((char*)buf->cur_pstrings, (char*)buf->value); + *(((LPCSTR*)(buf->cur_pdata))) = (char*)buf->cur_pstrings; + buf->cur_pstrings += len; buf->cur_pdata += 4; } else @@ -2067,6 +2072,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE IDirectXFileDataImpl* object; HRESULT hr; LPBYTE pdata; + LPBYTE pstrings; TRACE("(%p/%p)->(%p)\n", This, iface, ppDataObj); @@ -2082,6 +2088,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE This->buf.pxo_tab = &This->xobjects[This->nb_xobjects][0]; This->buf.cur_subobject = 0; This->buf.pxo = &This->buf.pxo_tab[This->buf.cur_subobject++]; + This->buf.level = 0; pdata = HeapAlloc(GetProcessHeap(), 0, MAX_DATA_SIZE); if (!pdata) @@ -2090,12 +2097,21 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE return DXFILEERR_BADALLOC; } This->buf.cur_pdata = pdata; - This->buf.level = 0; + + pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER); + if (!pstrings) + { + WARN("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, This->buf.pxo->pdata); + return DXFILEERR_BADALLOC; + } + This->buf.cur_pstrings = This->buf.pstrings = pstrings; if (!parse_object(&This->buf)) { TRACE("Object is not correct\n"); HeapFree(GetProcessHeap(), 0, This->buf.pxo->pdata); + HeapFree(GetProcessHeap(), 0, This->buf.pstrings); return DXFILEERR_PARSEERROR; } @@ -2106,6 +2122,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE return DXFILEERR_BADALLOC; } + object->pstrings = pstrings; object->pobj = This->buf.pxo; object->cur_enum_object = 0; object->level = 0; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 4d8716c..f70eb67 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -40,6 +40,7 @@ #define MAX_TEMPLATES 200 #define MAX_OBJECTS 200 #define MAX_SUBOBJECTS 120 +#define MAX_STRINGS_BUFFER 200 typedef struct { DWORD type; @@ -101,6 +102,7 @@ typedef struct { int cur_enum_object; BOOL from_ref; ULONG level; + LPBYTE pstrings; } IDirectXFileDataImpl; typedef struct { @@ -124,6 +126,7 @@ typedef struct { BOOL txt; ULONG cur_subobject; LPBYTE cur_pdata; + LPBYTE cur_pstrings; BYTE value[100]; xobject* pxo_globals; ULONG nb_pxo_globals; @@ -132,6 +135,7 @@ typedef struct { xobject* pxo; xtemplate* pxt[MAX_SUBOBJECTS]; ULONG level; + LPBYTE pstrings; } parse_buffer; typedef struct {

1 0

Christian Costa : d3dxof: Allow template definitions in objects file.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 35cc5504eb3c26b15e6fab69586b3888b803bcf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35cc5504eb3c26b15e6fab695… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 9 11:09:07 2008 +0100 d3dxof: Allow template definitions in objects file. --- dlls/d3dxof/d3dxof.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index ca4eb73..058f831 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -93,6 +93,8 @@ static const struct IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl; static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional); static BOOL parse_object(parse_buffer * buf); static const char* get_primitive_string(WORD token); +static WORD check_TOKEN(parse_buffer * buf); +static BOOL parse_template(parse_buffer * buf); static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) { @@ -318,6 +320,30 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV *ppEnumObj = (LPDIRECTXFILEENUMOBJECT)object; + while (object->buf.rem_bytes && (check_TOKEN(&object->buf) == TOKEN_TEMPLATE)) + { + if (!parse_template(&object->buf)) + { + TRACE("Template is not correct\n"); + hr = DXFILEERR_BADVALUE; + goto error; + } + else + { + TRACE("Template successfully parsed:\n"); + if (TRACE_ON(d3dxof)) + dump_template(This->xtemplates, &This->xtemplates[This->nb_xtemplates - 1]); + } + } + + if (TRACE_ON(d3dxof)) + { + int i; + TRACE("Registered templates (%d):\n", This->nb_xtemplates); + for (i = 0; i < This->nb_xtemplates; i++) + DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); + } + return DXFILE_OK; error:

1 0

Christian Costa : d3dxof: Increase max childs/ subobjects and check the limit is not overcome.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: e4748c3ca327079639daaa5962429fef4de6678d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4748c3ca327079639daaa596… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 9 11:10:56 2008 +0100 d3dxof: Increase max childs/subobjects and check the limit is not overcome. --- dlls/d3dxof/d3dxof.c | 11 +++++++++++ dlls/d3dxof/d3dxof_private.h | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 1939482..d55d2be 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1989,6 +1989,12 @@ _exit: } } + if (buf->pxo->nb_childs > MAX_CHILDS) + { + FIXME("Too many childs %d\n", buf->pxo->nb_childs); + return FALSE; + } + return TRUE; } @@ -2094,6 +2100,11 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE } This->buf.pxo->nb_subobjects = This->buf.cur_subobject; + if (This->buf.cur_subobject > MAX_SUBOBJECTS) + { + FIXME("Too many suobjects %d\n", This->buf.cur_subobject); + return DXFILEERR_BADALLOC; + } object->pobj = This->buf.pxo; object->cur_enum_object = 0; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index ba403df..4d8716c 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -36,10 +36,10 @@ #define MAX_NAME_LEN 32 #define MAX_ARRAY_DIM 1 #define MAX_MEMBERS 50 -#define MAX_CHILDS 10 +#define MAX_CHILDS 20 #define MAX_TEMPLATES 200 #define MAX_OBJECTS 200 -#define MAX_SUBOBJECTS 20 +#define MAX_SUBOBJECTS 120 typedef struct { DWORD type;

1 0

Damjan Jovanovic : winemenubuilder: Generate desktop files instead of wineshelllink.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: f5b8bad2aafb14b7b47746edbe670a0235d4524e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5b8bad2aafb14b7b47746edb… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Nov 8 11:03:39 2008 +0200 winemenubuilder: Generate desktop files instead of wineshelllink. --- programs/winemenubuilder/winemenubuilder.c | 59 +++++++++++++++++++++++++--- 1 files changed, 53 insertions(+), 6 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 90c613a..4e7cb1d 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -786,6 +786,37 @@ static char *extract_icon( LPCWSTR path, int index, BOOL bWait ) return xpm_path; } +static BOOL write_desktop_entry(const char *location, const char *linkname, const char *path, + const char *args, const char *descr, const char *workdir, + const char *icon) +{ + FILE *file; + + WINE_TRACE("(%s,%s,%s,%s,%s,%s,%s)\n", wine_dbgstr_a(location), + wine_dbgstr_a(linkname), wine_dbgstr_a(path), wine_dbgstr_a(args), + wine_dbgstr_a(descr), wine_dbgstr_a(workdir), wine_dbgstr_a(icon)); + + file = fopen(location, "w"); + if (file == NULL) + return FALSE; + + fprintf(file, "[Desktop Entry]\n"); + fprintf(file, "Name=%s\n", linkname); + fprintf(file, "Exec=env WINEPREFIX=\"%s\" wine \"%s\" %s\n", + wine_get_config_dir(), path, args); + fprintf(file, "Type=Application\n"); + fprintf(file, "StartupWMClass=Wine\n"); + if (descr && lstrlenA(descr)) + fprintf(file, "Comment=%s\n", descr); + if (workdir && lstrlenA(workdir)) + fprintf(file, "Path=%s\n", workdir); + if (icon && lstrlenA(icon)) + fprintf(file, "Icon=%s\n", icon); + + fclose(file); + return TRUE; +} + /* This escapes \ in filenames */ static LPSTR escape(LPCWSTR arg) { @@ -1204,8 +1235,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) escaped_args = escape(szArgs); escaped_description = escape(szDescription); - /* running multiple instances of wineshelllink - at the same time may be dangerous */ + /* building multiple menus concurrently has race conditions */ hsem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); if( WAIT_OBJECT_0 != MsgWaitForMultipleObjects( 1, &hsem, FALSE, INFINITE, QS_ALLINPUT ) ) { @@ -1213,9 +1243,26 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) goto cleanup; } - r = fork_and_wait("wineshelllink", link_name, escaped_path, - in_desktop_dir(csidl), escaped_args, icon_name, - work_dir ? work_dir : "", escaped_description); + if (in_desktop_dir(csidl)) + { + char *location; + const char *lastEntry; + lastEntry = strrchr(link_name, '/'); + if (lastEntry == NULL) + lastEntry = link_name; + else + ++lastEntry; + location = heap_printf("%s/Desktop/%s.desktop", getenv("HOME"), lastEntry); + if (location) + { + r = !write_desktop_entry(location, lastEntry, escaped_path, escaped_args, escaped_description, work_dir, icon_name); + HeapFree(GetProcessHeap(), 0, location); + } + } + else + r = fork_and_wait("wineshelllink", link_name, escaped_path, + 0, escaped_args, icon_name, + work_dir ? work_dir : "", escaped_description); ReleaseSemaphore( hsem, 1, NULL ); @@ -1229,7 +1276,7 @@ cleanup: HeapFree( GetProcessHeap(), 0, escaped_description ); if (r && !bWait) - WINE_ERR("failed to fork and exec wineshelllink\n" ); + WINE_ERR("failed to build the menu\n" ); return ( r == 0 ); }

1 0