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

Robert Reif : dsound: Remove unnecessary NULL pointer check.
by Alexandre Julliard April 8, 2006

April 8, 2006

Module: wine Branch: refs/heads/master Commit: 2c4c204371232d7d93f390e6a0e46f31531935af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c4c204371232d7d93f390e… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Apr 7 23:08:52 2006 -0400 dsound: Remove unnecessary NULL pointer check. --- dlls/dsound/capture.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 8b42582..969a079 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -793,10 +793,7 @@ IDirectSoundCaptureBufferImpl_Release( L IDsCaptureDriverBuffer_Release(This->device->hwbuf); /* remove from DirectSoundCaptureDevice */ - if (This->device) - This->device->capture_buffer = NULL; - else - ERR("does not reference dsound\n"); + This->device->capture_buffer = NULL; if (This->notify) IDirectSoundNotify_Release((LPDIRECTSOUNDNOTIFY)This->notify);

1 0

Troy Rollo : ntdll: Fix DVD_ReadStructure's layout of layer information.
by Alexandre Julliard April 8, 2006

April 8, 2006

Module: wine Branch: refs/heads/master Commit: 90df5a967f5057336781d3edb7416227fc82cd73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90df5a967f5057336781d3e… Author: Troy Rollo <wine(a)troy.rollo.name> Date: Sat Apr 8 10:05:01 2006 +1000 ntdll: Fix DVD_ReadStructure's layout of layer information. Fix DVD_ReadStructure to reflect what Windows actually does, not what Microsoft (incorrectly) documents it to do and not what the DDK headers (incorrectly) suggest it does. --- dlls/ntdll/cdrom.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 8838949..a94613a 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -176,6 +176,32 @@ static const char *iocodex(DWORD code) #define FRAME_OF_TOC(toc, idx) FRAME_OF_ADDR((toc).TrackData[idx - (toc).FirstTrack].Address) #define MSF_OF_FRAME(m,fr) {int f=(fr); ((UCHAR *)&(m))[2]=f%CD_FRAMES;f/=CD_FRAMES;((UCHAR *)&(m))[1]=f%CD_SECS;((UCHAR *)&(m))[0]=f/CD_SECS;} +/* The documented format of DVD_LAYER_DESCRIPTOR is wrong. Even the format in the + * DDK's header is wrong. There are four bytes at the start which always seem to + * follow the sequence "02 08 00 00". + */ +typedef struct +{ + UCHAR MagicHeader[4]; + UCHAR BookVersion : 4; + UCHAR BookType : 4; + UCHAR MinimumRate : 4; + UCHAR DiskSize : 4; + UCHAR LayerType : 4; + UCHAR TrackPath : 1; + UCHAR NumberOfLayers : 2; + UCHAR Reserved1 : 1; + UCHAR TrackDensity : 4; + UCHAR LinearDensity : 4; + ULONG StartingDataSector; + ULONG EndDataSector; + ULONG EndLayerZeroSector; + UCHAR Reserved5 : 7; + UCHAR BCAFlag : 1; + UCHAR Reserved6; +} internal_dvd_layer_descriptor; + + static NTSTATUS CDROM_ReadTOC(int, int, CDROM_TOC*); static NTSTATUS CDROM_GetStatusCode(int); @@ -1844,9 +1870,13 @@ static NTSTATUS DVD_ReadStructure(int de { case DvdPhysicalDescriptor: { - DVD_LAYER_DESCRIPTOR *p = layer; + internal_dvd_layer_descriptor *p = (internal_dvd_layer_descriptor *) layer; struct dvd_layer *l = &s.physical.layer[s.physical.layer_num]; + p->MagicHeader[0] = 2; + p->MagicHeader[1] = 8; + p->MagicHeader[2] = 0; + p->MagicHeader[3] = 0; p->BookVersion = l->book_version; p->BookType = l->book_type; p->MinimumRate = l->min_rate;

1 0

Detlef Riekenberg : ntdll: Added ARM architecture.
by Alexandre Julliard April 8, 2006

April 8, 2006

Module: wine Branch: refs/heads/master Commit: 44aab2e23f78b06dc9713cac7c0067b547ee6d73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44aab2e23f78b06dc9713ca… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 7 23:00:03 2006 +0200 ntdll: Added ARM architecture. --- dlls/ntdll/virtual.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ace9abf..1723070 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -899,6 +899,7 @@ static NTSTATUS map_image( HANDLE hmappi case IMAGE_FILE_MACHINE_IA64: MESSAGE("IA-64"); break; case IMAGE_FILE_MACHINE_ALPHA64: MESSAGE("Alpha-64"); break; case IMAGE_FILE_MACHINE_AMD64: MESSAGE("AMD-64"); break; + case IMAGE_FILE_MACHINE_ARM: MESSAGE("ARM"); break; default: MESSAGE("Unknown-%04x", nt->FileHeader.Machine); break; } MESSAGE(")\n");

1 0

Robert Reif : winecfg: Add default dsound sample rate and bits per sample.
by Alexandre Julliard April 8, 2006

April 8, 2006

Module: wine Branch: refs/heads/master Commit: a76023f02a7b1e01824b54c9fb902fdb5e1e53dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a76023f02a7b1e01824b54c… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Apr 5 20:53:02 2006 -0400 winecfg: Add default dsound sample rate and bits per sample. --- programs/winecfg/En.rc | 6 ++++- programs/winecfg/audio.c | 56 +++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/resource.h | 2 ++ 3 files changed, 63 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 243913b..f759aaf 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -168,7 +168,11 @@ BEGIN GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Hardware Acceleration: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 + LTEXT "Default Sample Rate:",IDC_STATIC,15,232,70,8 + COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Default Bits Per Sample:",IDC_STATIC,137,232,80,8 + COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index ba82e54..3ad7f24 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -60,6 +60,22 @@ static const char* DSound_HW_Accels[] = NULL }; +static const char* DSound_Rates[] = { + "48000", + "44100", + "22050", + "16000", + "11025", + "8000", + NULL +}; + +static const char* DSound_Bits[] = { + "8", + "16", + NULL +}; + static const AUDIO_DRIVER sAudioDrivers[] = { {"ALSA", "alsa"}, {"aRts", "arts"}, @@ -635,6 +651,30 @@ static void initAudioDlg (HWND hDlg) } HeapFree(GetProcessHeap(), 0, buf); + SendDlgItemMessage(hDlg, IDC_DSOUND_RATES, CB_RESETCONTENT, 0, 0); + for (i = 0; NULL != DSound_Rates[i]; ++i) { + SendDlgItemMessage(hDlg, IDC_DSOUND_RATES, CB_ADDSTRING, 0, (LPARAM) DSound_Rates[i]); + } + buf = get_reg_key(config_key, keypath("DirectSound"), "DefaultSampleRate", "22050"); + for (i = 0; NULL != DSound_Rates[i]; ++i) { + if (strcmp(buf, DSound_Rates[i]) == 0) { + SendDlgItemMessage(hDlg, IDC_DSOUND_RATES, CB_SETCURSEL, i, 0); + break ; + } + } + + SendDlgItemMessage(hDlg, IDC_DSOUND_BITS, CB_RESETCONTENT, 0, 0); + for (i = 0; NULL != DSound_Bits[i]; ++i) { + SendDlgItemMessage(hDlg, IDC_DSOUND_BITS, CB_ADDSTRING, 0, (LPARAM) DSound_Bits[i]); + } + buf = get_reg_key(config_key, keypath("DirectSound"), "DefaultBitsPerSample", "8"); + for (i = 0; NULL != DSound_Bits[i]; ++i) { + if (strcmp(buf, DSound_Bits[i]) == 0) { + SendDlgItemMessage(hDlg, IDC_DSOUND_BITS, CB_SETCURSEL, i, 0); + break ; + } + } + buf = get_reg_key(config_key, keypath("DirectSound"), "EmulDriver", "N"); if (IS_OPTION_TRUE(*buf)) CheckDlgButton(hDlg, IDC_DSOUND_DRV_EMUL, BST_CHECKED); @@ -663,6 +703,22 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR set_reg_key(config_key, keypath("DirectSound"), "HardwareAcceleration", DSound_HW_Accels[selected_dsound_accel]); } break; + case IDC_DSOUND_RATES: + if (HIWORD(wParam) == CBN_SELCHANGE) { + int selected_dsound_rate; + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + selected_dsound_rate = SendDlgItemMessage(hDlg, IDC_DSOUND_RATES, CB_GETCURSEL, 0, 0); + set_reg_key(config_key, keypath("DirectSound"), "DefaultSampleRate", DSound_Rates[selected_dsound_rate]); + } + break; + case IDC_DSOUND_BITS: + if (HIWORD(wParam) == CBN_SELCHANGE) { + int selected_dsound_bits; + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + selected_dsound_bits = SendDlgItemMessage(hDlg, IDC_DSOUND_BITS, CB_GETCURSEL, 0, 0); + set_reg_key(config_key, keypath("DirectSound"), "DefaultBitsPerSample", DSound_Bits[selected_dsound_bits]); + } + break; case IDC_DSOUND_DRV_EMUL: if (HIWORD(wParam) == BN_CLICKED) { SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 52b239e..c2cc77f 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -151,6 +151,8 @@ #define IDB_CHECKBOX 1306 #define IDB_DEVICE 1307 #define IDS_AUDIO_MISSING 1308 +#define IDC_DSOUND_RATES 1309 +#define IDC_DSOUND_BITS 1310 /* desktop integration tab */ #define IDC_THEME_COLORCOMBO 1401

1 0

Robert Reif : dsound: Set default primary buffer sample rate and bits per sample.
by Alexandre Julliard April 8, 2006

April 8, 2006

Module: wine Branch: refs/heads/master Commit: 44b7760e6aba07680efc8c1120e793473677a5ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44b7760e6aba07680efc8c1… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Apr 5 20:48:44 2006 -0400 dsound: Set default primary buffer sample rate and bits per sample. Programs that are written specifically for 2000 and xp don't bother to set the primary buffer format because it's a noop. However wine is patterned after win9x and DirectX 7 or earlier which has a real primary buffer and expects the program to change the primary buffer format if necessary. --- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/dsound_main.c | 12 ++++++++++++ dlls/dsound/dsound_private.h | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 99400c2..a765fd0 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1141,8 +1141,8 @@ HRESULT DirectSoundDevice_Create(DirectS * WAVE_DIRECTSOUND flag. */ device->pwfx->wFormatTag = WAVE_FORMAT_PCM; - device->pwfx->nSamplesPerSec = 22050; - device->pwfx->wBitsPerSample = 8; + device->pwfx->nSamplesPerSec = ds_default_sample_rate; + device->pwfx->wBitsPerSample = ds_default_bits_per_sample; device->pwfx->nChannels = 2; device->pwfx->nBlockAlign = device->pwfx->wBitsPerSample * device->pwfx->nChannels / 8; device->pwfx->nAvgBytesPerSec = device->pwfx->nSamplesPerSec * device->pwfx->nBlockAlign; diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 9ea9ea2..a1e71c4 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -108,6 +108,8 @@ int ds_snd_queue_min = DS_SND_QUEUE_MIN; int ds_hw_accel = DS_HW_ACCEL_FULL; int ds_default_playback = 0; int ds_default_capture = 0; +int ds_default_sample_rate = 22050; +int ds_default_bits_per_sample = 8; /* * Get a config key from either the app-specific or the default config @@ -188,6 +190,12 @@ void setup_dsound_options(void) if (!get_config_key( hkey, appkey, "DefaultCapture", buffer, MAX_PATH )) ds_default_capture = atoi(buffer); + if (!get_config_key( hkey, appkey, "DefaultSampleRate", buffer, MAX_PATH )) + ds_default_sample_rate = atoi(buffer); + + if (!get_config_key( hkey, appkey, "DefaultBitsPerSample", buffer, MAX_PATH )) + ds_default_bits_per_sample = atoi(buffer); + if (appkey) RegCloseKey( appkey ); if (hkey) RegCloseKey( hkey ); @@ -212,6 +220,10 @@ void setup_dsound_options(void) WARN("ds_default_playback = %d (default=0)\n",ds_default_playback); if (ds_default_capture != 0) WARN("ds_default_capture = %d (default=0)\n",ds_default_playback); + if (ds_default_sample_rate != 22050) + WARN("ds_default_sample_rate = %d (default=22050)\n",ds_default_sample_rate); + if (ds_default_bits_per_sample != 8) + WARN("ds_default_bits_per_sample = %d (default=8)\n",ds_default_bits_per_sample); } const char * get_device_id(LPCGUID pGuid) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index c4db0eb..36931ac 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -40,6 +40,8 @@ extern int ds_snd_queue_min; extern int ds_hw_accel; extern int ds_default_playback; extern int ds_default_capture; +extern int ds_default_sample_rate; +extern int ds_default_bits_per_sample; /***************************************************************************** * Predeclare the interface implementation structures

1 0

Alexandre Julliard : explorer: Don't use ExitWindows on shutdown.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 2eb46bb464f2c899ad81ee0b3890d40eaa611e9b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2eb46bb464f2c899ad81ee0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 20:26:47 2006 +0200 explorer: Don't use ExitWindows on shutdown. ExitWindows kills all current processes and that creates a race with newly started processes. Instead, simply exit and let the new process create a new explorer. --- programs/explorer/desktop.c | 4 ++++ server/window.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 557a817..f2a019c 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -39,6 +39,10 @@ static LRESULT WINAPI desktop_wnd_proc( if ((wp & 0xfff0) == SC_CLOSE) ExitWindows( 0, 0 ); return 0; + case WM_CLOSE: + PostQuitMessage(0); + return 0; + case WM_SETCURSOR: return (LRESULT)SetCursor( LoadCursorA( 0, (LPSTR)IDC_ARROW ) ); diff --git a/server/window.c b/server/window.c index ca1be13..8254793 100644 --- a/server/window.c +++ b/server/window.c @@ -363,7 +363,7 @@ struct process *get_top_window_owner( st void close_desktop_window( struct desktop *desktop ) { struct window *win = desktop->top_window; - if (win && win->thread) post_message( win->handle, WM_SYSCOMMAND, SC_CLOSE, 0 ); + if (win && win->thread) post_message( win->handle, WM_CLOSE, 0, 0 ); } /* create a new window structure (note: the window is not linked in the window tree) */

1 0

Mike Hearn : kernel: Don't crash on NULL arg in GetShortPathNameW.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: ddd0e03e912f2cfc348c22830c9481f91694f8ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ddd0e03e912f2cfc348c228… Author: Mike Hearn <mike(a)plan99.net> Date: Thu Apr 6 21:46:33 2006 +0100 kernel: Don't crash on NULL arg in GetShortPathNameW. --- dlls/kernel/path.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/path.c b/dlls/kernel/path.c index d3fd764..dee6918 100644 --- a/dlls/kernel/path.c +++ b/dlls/kernel/path.c @@ -431,7 +431,6 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR LPCWSTR p; DWORD sp = 0, lp = 0; DWORD tmplen; - BOOL unixabsolute = (longpath[0] == '/'); WIN32_FIND_DATAW wfd; HANDLE goit; UNICODE_STRING ustr; @@ -451,7 +450,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR } /* check for drive letter */ - if (!unixabsolute && longpath[1] == ':' ) + if (longpath[0] != '/' && longpath[1] == ':' ) { tmpshortpath[0] = longpath[0]; tmpshortpath[1] = ':';

1 0

Mike Hearn : comctl32: Add OOM codepath in imagelist control.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 1740fe0fe65fb04d07396f544b4b6f13626d67ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1740fe0fe65fb04d07396f5… Author: Mike Hearn <mike(a)plan99.net> Date: Thu Apr 6 21:42:39 2006 +0100 comctl32: Add OOM codepath in imagelist control. --- dlls/comctl32/imagelist.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 551f91a..45a02be 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1833,6 +1833,7 @@ static HBITMAP _read_bitmap(LPSTREAM pst width = bmih.biWidth; height = bmih.biHeight; bmihc = (LPBITMAPINFOHEADER)LocalAlloc(LMEM_ZEROINIT,sizeof(bmih)+palspace); + if (!bmihc) goto ret1; memcpy(bmihc,&bmih,sizeof(bmih)); longsperline = ((width*bitsperpixel+31)&~0x1f)>>5; bmihc->biSizeImage = (longsperline*height)<<2; @@ -1962,8 +1963,10 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE #endif hbmColor = _read_bitmap(pstm,ilHead.flags & ~ILC_MASK,ilHead.cx,ilHead.cy); - if (!hbmColor) + if (!hbmColor) { + WARN("failed to read bitmap from stream\n"); return NULL; + } if (ilHead.flags & ILC_MASK) { hbmMask = _read_bitmap(pstm,0,ilHead.cx,ilHead.cy); if (!hbmMask) {

1 0

Mike Hearn : gdi: Protect GetEnhMetaFilePaletteEntries against bad handles.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 8122173abf0e8de34e87d10c549e1e1a7a16f896 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8122173abf0e8de34e87d10… Author: Mike Hearn <mike(a)plan99.net> Date: Fri Apr 7 17:37:06 2006 +0100 gdi: Protect GetEnhMetaFilePaletteEntries against bad handles. --- dlls/gdi/enhmetafile.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/enhmetafile.c b/dlls/gdi/enhmetafile.c index 8725f9b..7ac6a40 100644 --- a/dlls/gdi/enhmetafile.c +++ b/dlls/gdi/enhmetafile.c @@ -2571,6 +2571,8 @@ UINT WINAPI GetEnhMetaFilePaletteEntries TRACE( "(%p,%d,%p)\n", hEmf, cEntries, lpPe ); + if (!enhHeader) return 0; + /* First check if there are any palettes associated with this metafile. */ if ( enhHeader->nPalEntries == 0 ) return 0;

1 0

Mike Hearn : kernel: Correct SearchPathA argument validation.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 679df54b6c39bc3f87c96400d42c402d924eb434 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=679df54b6c39bc3f87c9640… Author: Mike Hearn <mike(a)plan99.net> Date: Fri Apr 7 17:15:44 2006 +0100 kernel: Correct SearchPathA argument validation. --- dlls/kernel/path.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel/path.c b/dlls/kernel/path.c index 66c1e84..d3fd764 100644 --- a/dlls/kernel/path.c +++ b/dlls/kernel/path.c @@ -722,7 +722,7 @@ inline static BOOL contains_pathW (LPCWS * Searches for a specified file in the search path. * * PARAMS - * path [I] Path to search + * path [I] Path to search (NULL means default) * name [I] Filename to search for. * ext [I] File extension to append to file name. The first * character must be a period. This parameter is @@ -818,12 +818,13 @@ DWORD WINAPI SearchPathW( LPCWSTR path, DWORD WINAPI SearchPathA( LPCSTR path, LPCSTR name, LPCSTR ext, DWORD buflen, LPSTR buffer, LPSTR *lastpart ) { - WCHAR *pathW, *nameW = NULL, *extW = NULL; + WCHAR *pathW = NULL, *nameW = NULL, *extW = NULL; WCHAR bufferW[MAX_PATH]; DWORD ret; - if (name && !(nameW = FILE_name_AtoW( name, FALSE ))) return 0; - if (!(pathW = FILE_name_AtoW( path, TRUE ))) return 0; + if (!name || !(nameW = FILE_name_AtoW( name, FALSE ))) return 0; + if (path && !(pathW = FILE_name_AtoW( path, TRUE ))) return 0; + if (ext && !(extW = FILE_name_AtoW( ext, TRUE ))) { HeapFree( GetProcessHeap(), 0, pathW );

1 0