April 2006 - Wine-Commits - list.winehq.org

Robert Shearman : server: Handle possible mem_alloc failure in create_token .
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 9e0d0563c118f1388e2b5bb08720178951215e79 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e0d0563c118f1388e2b5bb… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Apr 7 11:16:28 2006 +0100 server: Handle possible mem_alloc failure in create_token. --- server/token.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/server/token.c b/server/token.c index c350fc9..a0df935 100644 --- a/server/token.c +++ b/server/token.c @@ -438,6 +438,12 @@ static struct token *create_token( unsig { size_t size = FIELD_OFFSET( struct sid_and_attributes, sid.SubAuthority[((const SID *)groups[i].Sid)->SubAuthorityCount] ); struct sid_and_attributes *group = mem_alloc( size ); + + if (!group) + { + release_object( token ); + return NULL; + } memcpy( &group->sid, groups[i].Sid, FIELD_OFFSET( SID, SubAuthority[((const SID *)groups[i].Sid)->SubAuthorityCount] ) ); group->enabled = TRUE; group->def = TRUE;

1 0

Robert Shearman : server: Should use release_object on an object instead of free.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: d8058fbe8cbd6fd8c30baa1d3b9688dfe8b47ddf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8058fbe8cbd6fd8c30baa1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Apr 7 11:15:19 2006 +0100 server: Should use release_object on an object instead of free. --- server/queue.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server/queue.c b/server/queue.c index 2b3f89c..f26197d 100644 --- a/server/queue.c +++ b/server/queue.c @@ -205,11 +205,6 @@ static struct thread_input *create_threa if ((input = alloc_object( &thread_input_ops ))) { - if (!(input->desktop = get_thread_desktop( thread, 0 /* FIXME: access rights */ ))) - { - free( input ); - return NULL; - } input->focus = 0; input->capture = 0; input->active = 0; @@ -218,6 +213,12 @@ static struct thread_input *create_threa list_init( &input->msg_list ); set_caret_window( input, 0 ); memset( input->keystate, 0, sizeof(input->keystate) ); + + if (!(input->desktop = get_thread_desktop( thread, 0 /* FIXME: access rights */ ))) + { + release_object( input ); + return NULL; + } } return input; } @@ -855,7 +856,7 @@ static void thread_input_destroy( struct if (foreground_input == input) foreground_input = NULL; empty_msg_list( &input->msg_list ); - release_object( input->desktop ); + if (input->desktop) release_object( input->desktop ); } /* fix the thread input data when a window is destroyed */

1 0

Mike McCormack : msi: Remove broken volume management code.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 604cdff911ed26112d277cc68f3ebaa9bfb7d5eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=604cdff911ed26112d277cc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 7 18:45:15 2006 +0900 msi: Remove broken volume management code. --- dlls/msi/files.c | 113 +----------------------------------------------------- 1 files changed, 3 insertions(+), 110 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e191fe6..b2ddfc9 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -343,88 +343,6 @@ static VOID set_file_source(MSIPACKAGE* file->SourcePath = build_directory_name(2, path, file->File); } -static BOOL check_volume(LPCWSTR path, LPCWSTR want_volume, LPWSTR volume, - UINT *intype) -{ - WCHAR drive[4]; - WCHAR name[MAX_PATH]; - UINT type; - - if (!want_volume) - return TRUE; - - if (!(path[0] && path[1] == ':')) - { - if (intype) - *intype = DRIVE_NO_ROOT_DIR; - return TRUE; - } - - drive[0] = path[0]; - drive[1] = path[1]; - drive[2] = '\\'; - drive[3] = 0; - TRACE("Checking volume %s .. (%s)\n",debugstr_w(drive), debugstr_w(want_volume)); - type = GetDriveTypeW(drive); - TRACE("drive is of type %x\n",type); - - if (intype) - *intype=type; - - if (type == DRIVE_UNKNOWN || type == DRIVE_NO_ROOT_DIR || - type == DRIVE_FIXED || type == DRIVE_RAMDISK) - return TRUE; - - GetVolumeInformationW(drive, name, MAX_PATH, NULL, NULL, NULL, NULL, 0); - TRACE("Drive contains %s\n", debugstr_w(name)); - return (strcmpiW(want_volume,name)==0); -} - -static BOOL check_for_sourcefile(LPCWSTR source) -{ - DWORD attrib = GetFileAttributesW(source); - return (!(attrib == INVALID_FILE_ATTRIBUTES)); -} - -static UINT ready_volume(MSIPACKAGE* package, LPCWSTR path, LPWSTR last_volume, - MSIRECORD *row,UINT *type ) -{ - LPWSTR volume = NULL; - LPCWSTR want_volume = MSI_RecordGetString(row, 5); - BOOL ok = check_volume(path, want_volume, volume, type); - - TRACE("Readying Volume for %s (%s, %s)\n", debugstr_w(path), - debugstr_w(want_volume), debugstr_w(last_volume)); - - if (check_for_sourcefile(path) && !ok) - { - FIXME("Found the Sourcefile but not on the correct volume.(%s,%s,%s)\n", - debugstr_w(path),debugstr_w(want_volume), debugstr_w(volume)); - return ERROR_SUCCESS; - } - - while (!ok) - { - INT rc; - LPCWSTR prompt; - LPWSTR msg; - - prompt = MSI_RecordGetString(row,3); - msg = generate_error_string(package, 1302, 1, prompt); - rc = MessageBoxW(NULL,msg,NULL,MB_OKCANCEL); - msi_free(volume); - msi_free(msg); - if (rc == IDOK) - ok = check_for_sourcefile(path); - else - return ERROR_INSTALL_USEREXIT; - } - - msi_free(last_volume); - last_volume = strdupW(volume); - return ERROR_SUCCESS; -} - struct media_info { UINT last_sequence; LPWSTR last_volume; @@ -470,7 +388,6 @@ static UINT ready_media_for_file( MSIPAC LPCWSTR cab, volume; DWORD sz; INT seq; - UINT type; LPCWSTR prompt; MSICOMPONENT *comp = file->Component; @@ -502,23 +419,15 @@ static UINT ready_media_for_file( MSIPAC { mi->last_path = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); set_file_source(package,file,comp,mi->last_path); - rc = ready_volume(package, file->SourcePath, mi->last_volume, row,&type); MsiSourceListAddMediaDiskW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->count, volume, prompt); - if (type == DRIVE_REMOVABLE || type == DRIVE_CDROM || - type == DRIVE_RAMDISK) - MsiSourceListSetInfoW(package->ProductCode, NULL, + MsiSourceListSetInfoW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); - else - MsiSourceListSetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, - MSICODE_PRODUCT|MSISOURCETYPE_NETWORK, - INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); msiobj_release(&row->hdr); return rc; } @@ -563,18 +472,10 @@ static UINT ready_media_for_file( MSIPAC strcpyW(mi->last_path,mi->source); strcatW(mi->source,cab); - rc = ready_volume(package, mi->source, mi->last_volume, row, &type); - if (type == DRIVE_REMOVABLE || type == DRIVE_CDROM || - type == DRIVE_RAMDISK) - MsiSourceListSetInfoW(package->ProductCode, NULL, + MsiSourceListSetInfoW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); - else - MsiSourceListSetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, - MSICODE_PRODUCT|MSISOURCETYPE_NETWORK, - INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); /* extract the cab file into a folder in the temp folder */ sz = MAX_PATH; @@ -591,19 +492,11 @@ static UINT ready_media_for_file( MSIPAC mi->last_path = msi_alloc(MAX_PATH*sizeof(WCHAR)); MSI_GetPropertyW(package,cszSourceDir,mi->source,&sz); strcpyW(mi->last_path,mi->source); - rc = ready_volume(package, mi->last_path, mi->last_volume, row, &type); - if (type == DRIVE_REMOVABLE || type == DRIVE_CDROM || - type == DRIVE_RAMDISK) - MsiSourceListSetInfoW(package->ProductCode, NULL, + MsiSourceListSetInfoW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); - else - MsiSourceListSetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, - MSICODE_PRODUCT|MSISOURCETYPE_NETWORK, - INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); } set_file_source(package, file, comp, mi->last_path);

1 0

Mike McCormack : shdocvw: Implement IEWinMain using a simple window frame.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 5d0873a74c314088426ea3e57fd2496c2d9fa78d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d0873a74c314088426ea3e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 7 17:52:00 2006 +0900 shdocvw: Implement IEWinMain using a simple window frame. --- dlls/shdocvw/Makefile.in | 1 dlls/shdocvw/iexplore.c | 555 +++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/shdocvw.h | 3 dlls/shdocvw/shdocvw_main.c | 44 ++- 4 files changed, 591 insertions(+), 12 deletions(-) create mode 100644 dlls/shdocvw/iexplore.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5d0873a74c314088426…

1 0

Mike McCormack : x11drv: Cursors index used with WTI_DEVICES is zero based.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 11132d2cdfb03cd5a1640edad4c6906b6d7c96db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11132d2cdfb03cd5a1640ed… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 7 17:50:29 2006 +0900 x11drv: Cursors index used with WTI_DEVICES is zero based. --- dlls/x11drv/wintab.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/wintab.c b/dlls/x11drv/wintab.c index 5037f58..c74a96e 100644 --- a/dlls/x11drv/wintab.c +++ b/dlls/x11drv/wintab.c @@ -973,7 +973,6 @@ UINT X11DRV_WTInfoA(UINT wCategory, UINT case WTI_CURSORS+7: case WTI_CURSORS+8: case WTI_CURSORS+9: - case WTI_CURSORS+10: tgtcursor = &gSysCursor[wCategory - WTI_CURSORS]; switch (nIndex) {

1 0

Huw Davies : fonts: Add the Won sign in place of the backslash for Korean fonts.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 26dbcc0aeec58d1f0b6c03937aa2bd8e4399ff12 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26dbcc0aeec58d1f0b6c039… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 7 10:28:30 2006 +0100 fonts: Add the Won sign in place of the backslash for Korean fonts. --- fonts/system.sfd | 19 +++++++++++++------ tools/sfnt2fnt.c | 17 ++++++++++++++--- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/fonts/system.sfd b/fonts/system.sfd index 39aa2a2..2a0af85 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -39,13 +39,12 @@ ScriptLang: 2 LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" Encoding: UnicodeBmp UnicodeInterp: none -NameList: Adobe Glyph List DisplaySize: 16 AntiAlias: 0 FitToEm: 1 -WinInfo: 836 19 18 +WinInfo: 0 19 18 OnlyBitmaps: 1 -BeginChars: 65536 347 +BeginChars: 65536 348 StartChar: space Encoding: 32 32 0 Width: 4 @@ -1847,17 +1846,23 @@ EndChar StartChar: afii10023 Encoding: 1025 1025 345 Width: 9 -Flags: HW +Flags: W TeX: 97 0 0 0 EndChar StartChar: afii10071 Encoding: 1105 1105 346 Width: 8 -Flags: HW +Flags: W TeX: 97 0 0 0 EndChar +StartChar: uni20A9 +Encoding: 8361 8361 347 +Width: 9 +Flags: W +TeX: 117 0 0 0 +EndChar EndChars -BitmapFont: 16 347 13 3 1 +BitmapFont: 16 348 13 3 1 BDFChar: 0 32 4 14 14 0 0 z BDFChar: 1 33 4 1 2 0 9 @@ -2552,5 +2557,7 @@ BDFChar: 345 1025 9 1 7 0 12 bfg(d^qdb`^qdb$rVuou BDFChar: 346 1105 8 1 6 0 9 bfg'3bfojtb]j*f +BDFChar: 347 8361 9 0 8 0 9 +(a)fU9ECB/,Ms+"kbCB/haG5rfe EndBitmapFont EndSplineFont diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 921bb9a..51a0e41 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -179,6 +179,15 @@ static int lookup_charset(int enc) return OEM_CHARSET; } +static int get_char(const union cptable *cptable, int enc, int index) +{ + /* Korean has the Won sign in place of '\\' */ + if(enc == 949 && index == '\\') + return 0x20a9; + + return cptable->sbcs.cp2uni[index]; +} + static void fill_fontinfo(FT_Face face, int enc, FILE *fp, int dpi, unsigned char def_char, int avg_width) { int ascent = 0, il, ppem, descent = 0, width_bytes = 0, space_size, max_width = 0; @@ -282,10 +291,11 @@ static void fill_fontinfo(FT_Face face, os2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); for(i = first_char; i < 0x100; i++) { - gi = FT_Get_Char_Index(face, cptable->sbcs.cp2uni[i]); + int c = get_char(cptable, enc, i); + gi = FT_Get_Char_Index(face, c); if(gi == 0) fprintf(stderr, "Missing glyph for char %04x\n", cptable->sbcs.cp2uni[i]); - if(FT_Load_Char(face, cptable->sbcs.cp2uni[i], FT_LOAD_DEFAULT)) { + if(FT_Load_Char(face, c, FT_LOAD_DEFAULT)) { fprintf(stderr, "error loading char %d - bad news!\n", i); continue; } @@ -365,7 +375,8 @@ static void fill_fontinfo(FT_Face face, fwrite(dfCharTable + fi.dfFirstChar, sizeof(*dfCharTable), ((unsigned char)fi.dfLastChar - (unsigned char)fi.dfFirstChar) + 3, fp); for(i = first_char; i < 0x100; i++) { - if(FT_Load_Char(face, cptable->sbcs.cp2uni[i], FT_LOAD_DEFAULT)) { + int c = get_char(cptable, enc, i); + if(FT_Load_Char(face, c, FT_LOAD_DEFAULT)) { continue; } assert(dfCharTable[i].width == face->glyph->metrics.horiAdvance >> 6);

1 0

James Hawkins : advpack: Forward DelNodeRunDLL32A to its Unicode counterpart.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 12a9ed0ade5e993cd419315cdf1d95146e8e9523 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12a9ed0ade5e993cd419315… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 7 05:28:17 2006 -0500 advpack: Forward DelNodeRunDLL32A to its Unicode counterpart. --- dlls/advpack/advpack.spec | 2 +- dlls/advpack/files.c | 43 ++++++++++++++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index f94146c..2ba1057 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -9,7 +9,7 @@ @ stdcall DelNodeW(wstr long) @ stdcall DelNode(str long) DelNodeA @ stdcall DelNodeRunDLL32A(ptr ptr str long) -# stdcall DelNodeRunDLL32W(ptr ptr wstr long) +@ stdcall DelNodeRunDLL32W(ptr ptr wstr long) @ stdcall DelNodeRunDLL32(ptr ptr str long) DelNodeRunDLL32A @ stdcall -private DllMain(long long ptr) @ stdcall DoInfInstall(ptr) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 565c600..1ad531c 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -454,14 +454,14 @@ HRESULT WINAPI DelNodeW( LPCWSTR pszFile /* sequentially returns pointers to parameters in a parameter list * returns NULL if the parameter is empty, e.g. one,,three */ -static LPSTR get_parameter(LPSTR *params, char separator) +static LPWSTR get_parameter(LPWSTR *params, WCHAR separator) { - LPSTR token = *params; + LPWSTR token = *params; if (!*params) return NULL; - *params = strchr(*params, separator); + *params = strchrW(*params, separator); if (*params) *(*params)++ = '\0'; @@ -474,6 +474,27 @@ static LPSTR get_parameter(LPSTR *params /*********************************************************************** * DelNodeRunDLL32A (ADVPACK.@) * + * See DelNodeRunDLL32W. + */ +HRESULT WINAPI DelNodeRunDLL32A(HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show) +{ + UNICODE_STRING params; + HRESULT hr; + + TRACE("(%p, %p, %s, %i)\n", hWnd, hInst, debugstr_a(cmdline), show); + + RtlCreateUnicodeStringFromAsciiz(&params, cmdline); + + hr = DelNodeRunDLL32W(hWnd, hInst, params.Buffer, show); + + RtlFreeUnicodeString(&params); + + return hr; +} + +/*********************************************************************** + * DelNodeRunDLL32W (ADVPACK.@) + * * Deletes a file or directory, WinMain style. * * PARAMS @@ -486,27 +507,27 @@ static LPSTR get_parameter(LPSTR *params * Success: S_OK. * Failure: E_FAIL. */ -HRESULT WINAPI DelNodeRunDLL32A( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) +HRESULT WINAPI DelNodeRunDLL32W(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT show) { - LPSTR szFilename, szFlags; - LPSTR cmdline_copy, cmdline_ptr; + LPWSTR szFilename, szFlags; + LPWSTR cmdline_copy, cmdline_ptr; DWORD dwFlags = 0; HRESULT res; - TRACE("(%p, %p, %s, %i)\n", hWnd, hInst, debugstr_a(cmdline), show); + TRACE("(%p, %p, %s, %i)\n", hWnd, hInst, debugstr_w(cmdline), show); - cmdline_copy = HeapAlloc(GetProcessHeap(), 0, lstrlenA(cmdline) + 1); + cmdline_copy = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmdline) + 1) * sizeof(WCHAR)); cmdline_ptr = cmdline_copy; - lstrcpyA(cmdline_copy, cmdline); + lstrcpyW(cmdline_copy, cmdline); /* get the parameters at indexes 0 and 1 respectively */ szFilename = get_parameter(&cmdline_ptr, ','); szFlags = get_parameter(&cmdline_ptr, ','); if (szFlags) - dwFlags = atol(szFlags); + dwFlags = atolW(szFlags); - res = DelNodeA(szFilename, dwFlags); + res = DelNodeW(szFilename, dwFlags); HeapFree(GetProcessHeap(), 0, cmdline_copy);

1 0

James Hawkins : advpack: Rewrite get_parameter to be able to handle an empty parameter.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: cc4b01a0f1ed11211dfaeb616993256bc14324c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc4b01a0f1ed11211dfaeb6… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 7 05:20:58 2006 -0500 advpack: Rewrite get_parameter to be able to handle an empty parameter. --- dlls/advpack/files.c | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 072434f..565c600 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -452,29 +452,23 @@ HRESULT WINAPI DelNodeW( LPCWSTR pszFile return ret; } -/* returns the parameter at dwIndex in a list of parameters - * separated by the cSeparator character - */ -static LPSTR get_parameter(LPSTR szParameters, CHAR cSeparator, DWORD dwIndex) +/* sequentially returns pointers to parameters in a parameter list + * returns NULL if the parameter is empty, e.g. one,,three */ +static LPSTR get_parameter(LPSTR *params, char separator) { - LPSTR szParam = NULL; - DWORD i = 0; + LPSTR token = *params; - while (*szParameters && i < dwIndex) - { - if (*szParameters == cSeparator) - i++; + if (!*params) + return NULL; - szParameters++; - } + *params = strchr(*params, separator); + if (*params) + *(*params)++ = '\0'; - if (!*szParameters) + if (!*token) return NULL; - szParam = HeapAlloc(GetProcessHeap(), 0, lstrlenA(szParameters)); - lstrcpyA(szParam, szParameters); - - return szParam; + return token; } /*********************************************************************** @@ -495,21 +489,26 @@ static LPSTR get_parameter(LPSTR szParam HRESULT WINAPI DelNodeRunDLL32A( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) { LPSTR szFilename, szFlags; - DWORD dwFlags; + LPSTR cmdline_copy, cmdline_ptr; + DWORD dwFlags = 0; HRESULT res; - TRACE("(%s)\n", debugstr_a(cmdline)); + TRACE("(%p, %p, %s, %i)\n", hWnd, hInst, debugstr_a(cmdline), show); + + cmdline_copy = HeapAlloc(GetProcessHeap(), 0, lstrlenA(cmdline) + 1); + cmdline_ptr = cmdline_copy; + lstrcpyA(cmdline_copy, cmdline); /* get the parameters at indexes 0 and 1 respectively */ - szFilename = get_parameter(cmdline, ',', 0); - szFlags = get_parameter(cmdline, ',', 1); + szFilename = get_parameter(&cmdline_ptr, ','); + szFlags = get_parameter(&cmdline_ptr, ','); - dwFlags = atol(szFlags); + if (szFlags) + dwFlags = atol(szFlags); res = DelNodeA(szFilename, dwFlags); - HeapFree(GetProcessHeap(), 0, szFilename); - HeapFree(GetProcessHeap(), 0, szFlags); + HeapFree(GetProcessHeap(), 0, cmdline_copy); return res; }

1 0

Stefan Dösinger : wined3d: Add WINED3DPRESENT_INTERVAL_* definitions.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: e0898f5e0ecc5f42cf0bef87ddf4a3a0bba68f79 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0898f5e0ecc5f42cf0bef8… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Apr 7 01:20:33 2006 +0200 wined3d: Add WINED3DPRESENT_INTERVAL_* definitions. --- include/wine/wined3d_types.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index e28fbc7..fe88bd1 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1045,4 +1045,11 @@ typedef enum _WINED3DDECLUSAGE { #define WINED3DPRESENT_RATE_DEFAULT 0x000000000 +#define WINED3DPRESENT_INTERVAL_DEFAULT 0x00000000 +#define WINED3DPRESENT_INTERVAL_ONE 0x00000001 +#define WINED3DPRESENT_INTERVAL_TWO 0x00000002 +#define WINED3DPRESENT_INTERVAL_THREE 0x00000004 +#define WINED3DPRESENT_INTERVAL_FOUR 0x00000008 +#define WINED3DPRESENT_INTERVAL_IMMEDIATE 0x80000000 + #endif

1 0

Stefan Dösinger : wined3d: Add WINED3DPRESENTRATE_DEFAULT.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 51067e1e8b7af680288c683e4625920a290d9c4c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=51067e1e8b7af680288c683… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Apr 7 01:18:13 2006 +0200 wined3d: Add WINED3DPRESENTRATE_DEFAULT. --- include/wine/wined3d_types.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index d2704f2..e28fbc7 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1043,4 +1043,6 @@ typedef enum _WINED3DDECLUSAGE { #define WINED3DLOCK_DONOTWAIT 0x4000 #define WINED3DLOCK_NO_DIRTY_UPDATE 0x8000 +#define WINED3DPRESENT_RATE_DEFAULT 0x000000000 + #endif

1 0