January 2007 - Wine-Commits

Hans Leidekker : kernel32: Add a stub implementation for TermsrvAppInstallMode.
by Alexandre Julliard Jan. 2, 2007

Jan. 2, 2007

Module: wine Branch: master Commit: a2705da37860d25b4946d9b686f7318815219ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2705da37860d25b4946d9b68… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 2 15:22:44 2007 +0100 kernel32: Add a stub implementation for TermsrvAppInstallMode. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/version.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9eba016..903557f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1057,7 +1057,7 @@ @ stub TerminateJobObject @ stdcall TerminateProcess(long long) @ stdcall TerminateThread(long long) -@ stub TermsrvAppInstallMode +@ stdcall TermsrvAppInstallMode() @ stdcall Thread32First(long ptr) @ stdcall Thread32Next(long ptr) @ stdcall ThunkConnect32(ptr str str str ptr ptr) diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 494e41d..811c426 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -363,3 +363,14 @@ void WINAPI DiagOutput16(LPCSTR str) /* FIXME */ TRACE("DIAGOUTPUT:%s\n", debugstr_a(str)); } + +/*********************************************************************** + * TermsrvAppInstallMode (KERNEL32.@) + * + * Find out whether the terminal server is in INSTALL or EXECUTE mode. + */ +BOOL WINAPI TermsrvAppInstallMode(void) +{ + FIXME("stub\n"); + return FALSE; +}

1 0

Hans Leidekker : gdi32: Implement GetCharWidthI.
by Alexandre Julliard Jan. 2, 2007

Jan. 2, 2007

Module: wine Branch: master Commit: 80e30f3d1b8ad9a96bd48668119b1f8978c99981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80e30f3d1b8ad9a96bd486681… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 2 14:18:31 2007 +0100 gdi32: Implement GetCharWidthI. --- dlls/gdi32/font.c | 39 ++++++++++++++++++++++++++++++++++++--- include/wingdi.h | 1 + 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b92ea82..527a0d9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3186,11 +3186,44 @@ BOOL WINAPI EnableEUDC(BOOL fEnableEUDC) /*********************************************************************** * GetCharWidthI (GDI32.@) + * + * Retrieve widths of characters. + * + * PARAMS + * hdc [I] Handle to a device context. + * first [I] First glyph in range to query. + * count [I] Number of glyph indices to query. + * glyphs [I] Array of glyphs to query. + * buffer [O] Buffer to receive character widths. + * + * NOTES + * Only works with TrueType fonts. + * + * RETURNS + * Success: TRUE + * Failure: FALSE */ -BOOL WINAPI GetCharWidthI(HDC hdc, UINT giFirst, UINT cgi, LPWORD pgi, LPINT lpBuffer) +BOOL WINAPI GetCharWidthI(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPINT buffer) { - FIXME("(%p, %d, %d, %p, %p): stub\n", hdc, giFirst, cgi, pgi, lpBuffer); - return FALSE; + ABC *abc; + unsigned int i; + + TRACE("(%p, %d, %d, %p, %p)\n", hdc, first, count, glyphs, buffer); + + if (!(abc = HeapAlloc(GetProcessHeap(), 0, count * sizeof(ABC)))) + return FALSE; + + if (!GetCharABCWidthsI(hdc, first, count, glyphs, abc)) + { + HeapFree(GetProcessHeap(), 0, abc); + return FALSE; + } + + for (i = 0; i < count; i++) + buffer[i] = abc->abcA + abc->abcB + abc->abcC; + + HeapFree(GetProcessHeap(), 0, abc); + return TRUE; } /*********************************************************************** diff --git a/include/wingdi.h b/include/wingdi.h index 34b54eb..a357c77 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3423,6 +3423,7 @@ BOOL WINAPI GetCharWidth32A(HDC,U BOOL WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT); #define GetCharWidth32 WINELIB_NAME_AW(GetCharWidth32) BOOL WINAPI GetCharWidthA(HDC,UINT,UINT,LPINT); +BOOL WINAPI GetCharWidthI(HDC,UINT,UINT,LPWORD,LPINT); BOOL WINAPI GetCharWidthW(HDC,UINT,UINT,LPINT); #define GetCharWidth WINELIB_NAME_AW(GetCharWidth) BOOL WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT);

1 0

Nick Burns : wined3d: Fix point handling.
by Alexandre Julliard Jan. 2, 2007

Jan. 2, 2007

Module: wine Branch: master Commit: d955715180c14b9f30a6124b6c86a244f0b82fd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d955715180c14b9f30a6124b6… Author: Nick Burns <adger44(a)hotmail.com> Date: Mon Jan 1 01:58:33 2007 -0800 wined3d: Fix point handling. --- dlls/wined3d/state.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fae9d6b..a8419a7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -919,7 +919,12 @@ static void state_psizemin(DWORD state, float f; } tmpvalue; - if (GL_SUPPORT(EXT_POINT_PARAMETERS)) { + if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN]; + GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MIN_ARB, tmpvalue.f); + checkGLcall("glPointParameterfARB(..."); + } + else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN]; GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, tmpvalue.f); checkGLcall("glPointParameterfEXT(...);"); @@ -934,7 +939,12 @@ static void state_psizemax(DWORD state, float f; } tmpvalue; - if (GL_SUPPORT(EXT_POINT_PARAMETERS)) { + if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX]; + GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MAX_ARB, tmpvalue.f); + checkGLcall("glPointParameterfARB(..."); + } + else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX]; GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, tmpvalue.f); checkGLcall("glPointParameterfEXT(...);");

1 0

Nick Burns : winecoreaudio: Fix race condition in drvclose.
by Alexandre Julliard Jan. 2, 2007

Jan. 2, 2007

Module: wine Branch: master Commit: 7aab8810e19caadd8e32abcbf1a017e115ea8877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aab8810e19caadd8e32abcbf… Author: Nick Burns <adger44(a)hotmail.com> Date: Mon Jan 1 02:22:58 2007 -0800 winecoreaudio: Fix race condition in drvclose. --- dlls/winmm/winecoreaudio/audio.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 455a365..4723928 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -207,6 +207,7 @@ typedef struct { static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV]; static WINE_WAVEIN WInDev [MAX_WAVEINDRV]; +static HANDLE hThread = NULL; /* Track the thread we create so we can clean it up later */ static CFMessagePortRef Port_SendToMessageThread; static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo); @@ -327,7 +328,7 @@ static DWORD WINAPI messageThread(LPVOID source = CFMessagePortCreateRunLoopSource(kCFAllocatorDefault, port_ReceiveInMessageThread, (CFIndex)0); CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopDefaultMode); - + CFRunLoopRun(); CFRunLoopSourceInvalidate(source); @@ -499,7 +500,6 @@ LONG CoreAudio_WaveInit(void) UInt32 propertySize; CHAR szPname[MAXPNAMELEN]; int i; - HANDLE hThread; CFStringRef messageThreadPortName; CFMessagePortRef port_ReceiveInMessageThread; int inputSampleRate; @@ -665,6 +665,13 @@ LONG CoreAudio_WaveInit(void) return 1; } + /* Cannot WAIT for any events because we are called from the loader (which has a lock on loading stuff) */ + /* We might want to wait for this thread to be created -- but we cannot -- not here at least */ + /* Instead track the thread so we can clean it up later */ + if ( hThread ) + { + ERR("Message thread already started -- expect problems\n"); + } hThread = CreateThread(NULL, 0, messageThread, (LPVOID)port_ReceiveInMessageThread, 0, NULL); if ( !hThread ) { @@ -688,6 +695,12 @@ void CoreAudio_WaveRelease(void) CFMessagePortSendRequest(Port_SendToMessageThread, kStopLoopMessage, NULL, 0.0, 0.0, NULL, NULL); CFRelease(Port_SendToMessageThread); Port_SendToMessageThread = NULL; + + /* Wait for the thread to finish and clean it up */ + /* This rids us of any quick start/shutdown driver crashes */ + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); + hThread = NULL; } /*======================================================================*

1 0

Alexandre Julliard : Use GetDC instead of CreateDC where possible.
by Alexandre Julliard Jan. 2, 2007

Jan. 2, 2007

Module: wine Branch: master Commit: 656fc938154ecbb3e1f13b7523d148f51a8feb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=656fc938154ecbb3e1f13b752… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 17:16:36 2007 +0100 Use GetDC instead of CreateDC where possible. --- dlls/comctl32/treeview.c | 5 ++--- dlls/ddraw/main.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index ff23a57..aefce78 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4823,7 +4823,6 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoP static LRESULT TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { - static const WCHAR szDisplayW[] = { 'D','I','S','P','L','A','Y','\0' }; RECT rcClient; TREEVIEW_INFO *infoPtr; LOGFONTW lf; @@ -4931,7 +4930,7 @@ TREEVIEW_Create(HWND hwnd, const CREATES infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); - hdcScreen = CreateDCW(szDisplayW, NULL, NULL, NULL); + hdcScreen = GetDC(0); /* Create a coloured bitmap compatible with the screen depth because checkboxes are not black&white */ @@ -4959,7 +4958,7 @@ TREEVIEW_Create(HWND hwnd, const CREATES DeleteObject(hbm); DeleteDC(hdc); - DeleteDC(hdcScreen); + ReleaseDC(0, hdcScreen); infoPtr->stateImageWidth = 16; infoPtr->stateImageHeight = 16; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 26aac5d..c754036 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -164,9 +164,9 @@ DDRAW_Create(GUID *guid, This->ImplType = DefaultSurfaceType; /* Get the current screen settings */ - hDC = CreateDCA("DISPLAY", NULL, NULL, NULL); + hDC = GetDC(0); This->orig_bpp = GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES); - DeleteDC(hDC); + ReleaseDC(0, hDC); This->orig_width = GetSystemMetrics(SM_CXSCREEN); This->orig_height = GetSystemMetrics(SM_CYSCREEN); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 58f512d..64335e7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1440,9 +1440,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl RECT clip_rc; /* Get info on the current display setup */ - hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + hdc = GetDC(0); bpp = GetDeviceCaps(hdc, BITSPIXEL); - DeleteDC(hdc); + ReleaseDC(0, hdc); /* Change the display settings */ memset(&devmode, 0, sizeof(DEVMODEW)); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9b1e5c2..fb76de5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2439,9 +2439,9 @@ static HRESULT WINAPI IWineD3DImpl_Crea /* Get the initial screen setup for ddraw */ object->ddraw_width = GetSystemMetrics(SM_CXSCREEN); object->ddraw_height = GetSystemMetrics(SM_CYSCREEN); - hDC = CreateDCA("DISPLAY", NULL, NULL, NULL); + hDC = GetDC(0); object->ddraw_format = pixelformat_for_depth(GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES)); - DeleteDC(hDC); + ReleaseDC(0, hDC); return WINED3D_OK; create_device_error: diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b3799da..031d320 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1370,7 +1370,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC break; } - ddc = CreateDCA("DISPLAY", NULL, NULL, NULL); + ddc = GetDC(0); if (ddc == 0) { HeapFree(GetProcessHeap(), 0, b_info); return HRESULT_FROM_WIN32(GetLastError()); @@ -1378,7 +1378,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC TRACE("Creating a DIB section with size %dx%dx%d, size=%d\n", b_info->bmiHeader.biWidth, b_info->bmiHeader.biHeight, b_info->bmiHeader.biBitCount, b_info->bmiHeader.biSizeImage); This->dib.DIBsection = CreateDIBSection(ddc, b_info, usage, &This->dib.bitmap_data, 0 /* Handle */, 0 /* Offset */); - DeleteDC(ddc); + ReleaseDC(0, ddc); if (!This->dib.DIBsection) { ERR("CreateDIBSection failed!\n"); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 784db56..6183718 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -489,9 +489,9 @@ static HRESULT WINAPI IWineD3DSwapChainI pMode->Height = GetSystemMetrics(SM_CYSCREEN); pMode->RefreshRate = 85; /* FIXME: How to identify? */ - hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + hdc = GetDC(0); bpp = GetDeviceCaps(hdc, BITSPIXEL); - DeleteDC(hdc); + ReleaseDC(0, hdc); switch (bpp) { case 8: pMode->Format = WINED3DFMT_R8G8B8; break;

1 0

Christoph Bumiller : wineded3: dirtyend set to more than resource size.
by Alexandre Julliard Jan. 2, 2007

Jan. 2, 2007

Module: wine Branch: master Commit: b3d018f99b907906c604a1924b2bbc909c91aff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d018f99b907906c604a1924… Author: Christoph Bumiller <e0425955(a)stud3.tuwien.ac.at> Date: Mon Jan 1 19:08:06 2007 +0100 wineded3: dirtyend set to more than resource size. --- dlls/wined3d/vertexbuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 820309f..4f350bb 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -439,7 +439,7 @@ static HRESULT WINAPI IWineD3DVertexBuf if(SizeToLock) This->dirtyend = OffsetToLock + SizeToLock; else - This->dirtyend = OffsetToLock + This->resource.size; + This->dirtyend = This->resource.size; } if(This->resource.allocatedMemory) {

1 0

Alexandre Julliard : make_makefiles: Properly skip dlls marked with MKDLL_SKIP.
by Alexandre Julliard Jan. 2, 2007

Jan. 2, 2007

Module: wine Branch: master Commit: d44ed08d8ac320e84c4b22a7208594cbc313e39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d44ed08d8ac320e84c4b22a72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 17:09:23 2007 +0100 make_makefiles: Properly skip dlls marked with MKDLL_SKIP. --- tools/make_makefiles | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index d44632f..74b8946 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -342,6 +342,7 @@ sub update_dlls(@) foreach my $make (@_) { my %makefile = %{$makefiles{$make}}; + next if defined $makefile{"=skip"}; if ($make =~ /dlls\/(.*)\/tests\/Makefile/) {

1 0

Alexandre Julliard : gdi32: Avoid leaking a handle in MFDRV_ExtSelectClipRgn.
by Alexandre Julliard Jan. 2, 2007

Jan. 2, 2007

Module: wine Branch: master Commit: 0bd3d8e68ef82f0a739d29994ee69f62397f6627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd3d8e68ef82f0a739d29994… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 17:09:10 2007 +0100 gdi32: Avoid leaking a handle in MFDRV_ExtSelectClipRgn. --- dlls/gdi32/mfdrv/graphics.c | 1 + dlls/gdi32/mfdrv/metafiledrv.h | 1 + dlls/gdi32/mfdrv/objects.c | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index c0c922c..316ee78 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -420,6 +420,7 @@ INT MFDRV_ExtSelectClipRgn( PHYSDEV dev, if(iRgn == -1) return ERROR; ret = MFDRV_MetaParam1( dev, META_SELECTCLIPREGION, iRgn ) ? NULLREGION : ERROR; MFDRV_MetaParam1( dev, META_DELETEOBJECT, iRgn ); + MFDRV_RemoveHandle( dev, iRgn ); return ret; } diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 98d9e15..00cb8d4 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -56,6 +56,7 @@ extern BOOL MFDRV_MetaParam8(PHYSDEV dev short param6, short param7, short param8); extern BOOL MFDRV_WriteRecord(PHYSDEV dev, METARECORD *mr, DWORD rlen); extern UINT MFDRV_AddHandle( PHYSDEV dev, HGDIOBJ obj ); +extern BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index ); extern INT16 MFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ); /* Metafile driver functions */ diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 4dc809a..a43598b 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -59,6 +59,23 @@ UINT MFDRV_AddHandle( PHYSDEV dev, HGDIO } /****************************************************************** + * MFDRV_RemoveHandle + */ +BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index ) +{ + METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; + BOOL ret = FALSE; + + if (index < physDev->handles_size && physDev->handles[index]) + { + physDev->handles[index] = 0; + physDev->cur_handles--; + ret = TRUE; + } + return ret; +} + +/****************************************************************** * MFDRV_FindObject */ static INT16 MFDRV_FindObject( PHYSDEV dev, HGDIOBJ obj )

1 0

Andrew Talbot : comdlg32: Declare function static.
by Alexandre Julliard Jan. 2, 2007

Jan. 2, 2007

Module: wine Branch: master Commit: 2159f2bce8ae436f318dfa162484197fd75e0c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2159f2bce8ae436f318dfa162… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jan 1 14:59:58 2007 +0000 comdlg32: Declare function static. --- dlls/comdlg32/filedlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 4d1eb84..2addb9c 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -186,7 +186,7 @@ static const char LookInInfosStr[] = "Lo static LRESULT FILEDLG95_FillControls(HWND hwnd, WPARAM wParam, LPARAM lParam); static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam); static LRESULT FILEDLG95_OnWMGetIShellBrowser(HWND hwnd); - BOOL FILEDLG95_OnOpen(HWND hwnd); +static BOOL FILEDLG95_OnOpen(HWND hwnd); static LRESULT FILEDLG95_InitControls(HWND hwnd); static void FILEDLG95_Clean(HWND hwnd);

1 0

Andrew Talbot : wrc: Declare some variables static const.
by Alexandre Julliard Jan. 2, 2007

Jan. 2, 2007

Module: wine Branch: master Commit: 782e28afb622d6c32c24ee9eaf474df33d6e823e URL: http://source.winehq.org/git/wine.git/?a=commit;h=782e28afb622d6c32c24ee9ea… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jan 1 13:22:46 2007 +0000 wrc: Declare some variables static const. --- tools/wrc/readres.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/readres.c b/tools/wrc/readres.c index 84dd08a..0f948cb 100644 --- a/tools/wrc/readres.c +++ b/tools/wrc/readres.c @@ -32,7 +32,7 @@ #include "utils.h" #include "genres.h" -struct resheader32 { +static const struct resheader32 { DWORD ressize; /* 0 */ DWORD hdrsize; /* 0x20 */ WORD restype1; /* 0xffff */

1 0